diff --git a/niucloud/addon/hello_world/admin/src/views/diy/components/edit-hello-info.vue b/niucloud/addon/hello_world/admin/src/views/diy/components/edit-hello-info.vue deleted file mode 100644 index 430823048..000000000 --- a/niucloud/addon/hello_world/admin/src/views/diy/components/edit-hello-info.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/niucloud/addon/hello_world/admin/src/views/diy/components/edit-hello-text.vue b/niucloud/addon/hello_world/admin/src/views/diy/components/edit-hello-text.vue index fd0f02e60..24c95da0b 100644 --- a/niucloud/addon/hello_world/admin/src/views/diy/components/edit-hello-text.vue +++ b/niucloud/addon/hello_world/admin/src/views/diy/components/edit-hello-text.vue @@ -1,12 +1,20 @@ @@ -16,6 +24,7 @@ import useDiyStore from '@/stores/modules/diy' const diyStore = useDiyStore() + diyStore.editComponent.ignore = []; // 忽略公共属性 defineExpose({}) diff --git a/niucloud/addon/hello_world/app/adminapi/controller/Index.php b/niucloud/addon/hello_world/app/adminapi/controller/Index.php index faba9182e..c36ec5e8b 100644 --- a/niucloud/addon/hello_world/app/adminapi/controller/Index.php +++ b/niucloud/addon/hello_world/app/adminapi/controller/Index.php @@ -11,9 +11,8 @@ namespace addon\hello_world\app\adminapi\controller; -use app\adminapi\controller\BaseAdminController; -use app\service\core\addon\CoreInstallService; +use core\base\BaseAdminController; class Index extends BaseAdminController { diff --git a/niucloud/addon/hello_world/app/dict/diy/components.php b/niucloud/addon/hello_world/app/dict/diy/components.php new file mode 100644 index 000000000..d692c14d9 --- /dev/null +++ b/niucloud/addon/hello_world/app/dict/diy/components.php @@ -0,0 +1,21 @@ + [ + 'title' => get_lang('dict_diy.component_type_basic'), + 'list' => [ + 'HelloText' => [ + 'title' => 'hello文本', + 'icon' => 'iconfont-iconhuiyuanzhongxin', + 'path' => 'edit-hello-text', + 'support_page' => [], + 'uses' => 0, + 'sort' => 10007, + 'value' => [ + 'height' => 20 + ], + ], + ], + ], + +]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/dict/diy/links.php b/niucloud/addon/hello_world/app/dict/diy/links.php new file mode 100644 index 000000000..b263522fe --- /dev/null +++ b/niucloud/addon/hello_world/app/dict/diy/links.php @@ -0,0 +1,26 @@ + [ + 'title' => get_lang('dict_diy.system_link'), + 'child_list' => [ + [ + 'name' => 'HELLO_WORLD_INFO', + 'title' => get_lang('dict_diy.hello_world_info'), + 'url' => '/pages/hello_world/info', + 'is_share' => 1 + ], + ] + ], + 'HELLO_WORLD_LINK' => [ + 'title' => get_lang('dict_diy.hello_world_link'), + 'child_list' => [ + [ + 'name' => 'HELLO_WORLD_INDEX', + 'title' => get_lang('dict_diy.hello_world_index'), + 'url' => '/pages/hello_world/index', + 'is_share' => 1 + ], + ] + ], +]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/dict/diy/pages.php b/niucloud/addon/hello_world/app/dict/diy/pages.php new file mode 100644 index 000000000..1492ee40f --- /dev/null +++ b/niucloud/addon/hello_world/app/dict/diy/pages.php @@ -0,0 +1,89 @@ + [ + 'hello_world_index' => [ // 页面标识 + "title" => "hello world 首页", // 页面名称 + 'cover' => '', // 页面封面图 + 'preview' => '', // 页面预览图 + 'desc' => '', // 页面描述 + // 页面数据源 + "data" => [ + "global" => [ + "title" => "hello world首页页面", + "pageBgColor" => "#F8F8F8", + 'bgUrl' => '', + 'imgWidth' => '', + 'imgHeight' => '', + "bottomTabBarSwitch" => true, + "template" => [ + 'textColor' => "#303133", + "pageBgColor" => "", + "componentBgColor" => "", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ] + ], + 'topStatusBar' => [ + 'bgColor' => "#ffffff", + 'isTransparent' => false, + 'isShow' => true, + 'style' => 'style-1', + 'textColor' => "#333333", + 'textAlign' => 'center', + ], + 'popWindow' => [ + 'imgUrl' => "", + 'imgWidth' => '', + 'imgHeight' => '', + 'count' => -1, + 'show' => 0, + 'link' => [ + 'name' => "" + ], + ] + ], + "value" => [ + [ + "path" => "edit-image-ads", + "id" => "4640ld4k1pu0", + "componentName" => "ImageAds", + "componentTitle" => "图片广告", + "uses" => 0, + "list" => [ + [ + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/banner.png", + "imgWidth" => 750, + "imgHeight" => 320, + "id" => "2xuytp7622w0" + ] + ], + "ignore" => [], + "pageBgColor" => "", + "componentBgColor" => "", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ] + ] + ] + ] + ] + ] +]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/dict/diy/template.php b/niucloud/addon/hello_world/app/dict/diy/template.php new file mode 100644 index 000000000..98a006df6 --- /dev/null +++ b/niucloud/addon/hello_world/app/dict/diy/template.php @@ -0,0 +1,12 @@ + [ + 'title' => get_lang('dict_diy.page_hello_world_index'), + 'page' => 'pages/hello_world/index', + ], + 'DIY_HELLO_WORLD_INFO' => [ + 'title' => get_lang('dict_diy.page_hello_world_info'), + 'page' => 'pages/hello_world/info', + ], +]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/dict/member/account_change_type.php b/niucloud/addon/hello_world/app/dict/member/account_change_type.php new file mode 100644 index 000000000..6898597fb --- /dev/null +++ b/niucloud/addon/hello_world/app/dict/member/account_change_type.php @@ -0,0 +1,18 @@ + [ + //调整 + 'hello_world_test' => [ + //名称 + 'name' => "hello_world账户变化", + //是否增加 + 'inc' => 1, + //是否减少 + 'dec' => 1, + ], + + ], +]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/enum/menu/admin.php b/niucloud/addon/hello_world/app/dict/menu/admin.php similarity index 92% rename from niucloud/addon/hello_world/app/enum/menu/admin.php rename to niucloud/addon/hello_world/app/dict/menu/admin.php index 046772870..0bd05e0ce 100644 --- a/niucloud/addon/hello_world/app/enum/menu/admin.php +++ b/niucloud/addon/hello_world/app/dict/menu/admin.php @@ -13,6 +13,5 @@ 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/dict/menu/site.php b/niucloud/addon/hello_world/app/dict/menu/site.php new file mode 100644 index 000000000..23fe8c50c --- /dev/null +++ b/niucloud/addon/hello_world/app/dict/menu/site.php @@ -0,0 +1,36 @@ + '插件站点菜单', + 'menu_key' => 'niucloud_site_hello', + 'menu_type' => 1, + 'icon' => 'iconfont-iconyingyongshichang', + 'api_url' => '', + 'router_path' => 'hello_world', + 'view_path' => 'hello_world/site', + 'methods' => '', + 'sort' => 90, + 'status' => 1, + 'is_show' => 1, + ], +/* [ + 'menu_name' => '会员列表', + 'menu_key' => 'member_list', + 'parent_key' => 'member', + 'menu_type' => 1, + 'icon' => 'iconfont-iconhuiyuanliebiao', + 'api_url' => 'member/member', + 'router_path' => 'hello_world_member_list', + 'view_path' => 'hello_world/member', + 'methods' => 'get', + 'sort' => 100, + 'status' => 1, + 'is_show' => 1, + 'children' => [ + + ] + ], + "delete" => "member" //针对修改系统菜单处理方式，可以删除系统菜单，设置对应key值，也可删除不需要的菜单处理 +*/ + ]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/enum/notice/notice.php b/niucloud/addon/hello_world/app/dict/notice/notice.php similarity index 100% rename from niucloud/addon/hello_world/app/enum/notice/notice.php rename to niucloud/addon/hello_world/app/dict/notice/notice.php diff --git a/niucloud/addon/hello_world/app/enum/notice/sms.php b/niucloud/addon/hello_world/app/dict/notice/sms.php similarity index 100% rename from niucloud/addon/hello_world/app/enum/notice/sms.php rename to niucloud/addon/hello_world/app/dict/notice/sms.php diff --git a/niucloud/addon/hello_world/app/enum/notice/weapp.php b/niucloud/addon/hello_world/app/dict/notice/weapp.php similarity index 100% rename from niucloud/addon/hello_world/app/enum/notice/weapp.php rename to niucloud/addon/hello_world/app/dict/notice/weapp.php diff --git a/niucloud/addon/hello_world/app/enum/notice/wechat.php b/niucloud/addon/hello_world/app/dict/notice/wechat.php similarity index 100% rename from niucloud/addon/hello_world/app/enum/notice/wechat.php rename to niucloud/addon/hello_world/app/dict/notice/wechat.php diff --git a/niucloud/addon/hello_world/app/enum/diy/components.php b/niucloud/addon/hello_world/app/enum/diy/components.php deleted file mode 100644 index 8a6eb19c7..000000000 --- a/niucloud/addon/hello_world/app/enum/diy/components.php +++ /dev/null @@ -1,32 +0,0 @@ - [ - 'title' => get_lang('enum_diy.component_type_basics'), - 'list' => [ - 'TestInfo' => [ - 'title' => '测试信息', - 'icon' => 'iconfont-iconhuiyuanzhongxin', - 'path' => 'edit-hello-info', - 'support_page' => [], - 'max_count' => 0, - 'sort' => 10007, - 'value' => [ - 'height' => 20 - ], - ], - 'TestText' => [ - 'title' => '测试文本', - 'icon' => 'iconfont-iconhuiyuanzhongxin', - 'path' => 'edit-hello-text', - 'support_page' => [], - 'max_count' => 0, - 'sort' => 10007, - 'value' => [ - 'height' => 20 - ], - ], - ], - ], - -]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/enum/diy/links.php b/niucloud/addon/hello_world/app/enum/diy/links.php deleted file mode 100644 index fc96d30db..000000000 --- a/niucloud/addon/hello_world/app/enum/diy/links.php +++ /dev/null @@ -1,8 +0,0 @@ - 'HELLO_WORLD_INDEX', - 'title' => get_lang('enum_hello_world.links_hello_world_index'), - ], -]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/enum/diy/pages.php b/niucloud/addon/hello_world/app/enum/diy/pages.php deleted file mode 100644 index 6dd355233..000000000 --- a/niucloud/addon/hello_world/app/enum/diy/pages.php +++ /dev/null @@ -1,4 +0,0 @@ - '插件站点菜单', - 'menu_key' => 'niucloud_site_hello', - 'menu_type' => 1, - 'icon' => 'iconfont-iconyingyongshichang', - 'api_url' => '', - 'router_path' => 'hello_world', - 'view_path' => 'hello_world/site', - 'methods' => '', - 'sort' => 90, - 'status' => 1, - 'is_show' => 1, - 'en_menu_name' => '', - ], - ]; \ No newline at end of file diff --git a/niucloud/addon/hello_world/app/lang/zh-cn/enum.php b/niucloud/addon/hello_world/app/lang/zh-cn/dict.php similarity index 67% rename from niucloud/addon/hello_world/app/lang/zh-cn/enum.php rename to niucloud/addon/hello_world/app/lang/zh-cn/dict.php index 63dcc4b3d..b05f981a5 100644 --- a/niucloud/addon/hello_world/app/lang/zh-cn/enum.php +++ b/niucloud/addon/hello_world/app/lang/zh-cn/dict.php @@ -13,8 +13,11 @@ * 插件枚举语言 */ return [ - 'enum_hello_world' => [ - //菜单类型 - 'links_hello_world_index' => 'hello world 插件', - ], + 'dict_diy' => [ + 'page_hello_world_index' => 'hello 首页', + 'page_hello_world_info' => 'hello 信息', + 'hello_world_link' => 'hello world链接', + 'hello_world_index' => 'hello world index 插件', + 'hello_world_info' => 'hello world info 插件' + ] ]; diff --git a/niucloud/addon/hello_world/config/uni-app-pages.json b/niucloud/addon/hello_world/config/uni-app-pages.json deleted file mode 100644 index fca712b6e..000000000 --- a/niucloud/addon/hello_world/config/uni-app-pages.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pages": [ // pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/hello_world/index", - "style": { - // #ifdef H5 - "navigationStyle": "custom", - // #endif - "navigationBarTitleText": "%pages.index.index%" - } - } - ] - -} \ No newline at end of file diff --git a/niucloud/addon/hello_world/config/admin-package.json b/niucloud/addon/hello_world/package/admin-package.json similarity index 100% rename from niucloud/addon/hello_world/config/admin-package.json rename to niucloud/addon/hello_world/package/admin-package.json diff --git a/niucloud/addon/hello_world/config/composer.json b/niucloud/addon/hello_world/package/composer.json similarity index 100% rename from niucloud/addon/hello_world/config/composer.json rename to niucloud/addon/hello_world/package/composer.json diff --git a/niucloud/addon/hello_world/config/uni-app-package.json b/niucloud/addon/hello_world/package/uni-app-package.json similarity index 100% rename from niucloud/addon/hello_world/config/uni-app-package.json rename to niucloud/addon/hello_world/package/uni-app-package.json diff --git a/niucloud/addon/hello_world/package/uni-app-pages.php b/niucloud/addon/hello_world/package/uni-app-pages.php new file mode 100644 index 000000000..c7c079162 --- /dev/null +++ b/niucloud/addon/hello_world/package/uni-app-pages.php @@ -0,0 +1,25 @@ + << - - 演示插件信息——自定义组件 - - - - - - \ No newline at end of file diff --git a/niucloud/addon/hello_world/uni-app/components/diy/comp-extend/hello-text/index.vue b/niucloud/addon/hello_world/uni-app/components/diy/comp-extend/hello-text/index.vue deleted file mode 100644 index 675230e9e..000000000 --- a/niucloud/addon/hello_world/uni-app/components/diy/comp-extend/hello-text/index.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/niucloud/addon/hello_world/uni-app/components/diy/comp-extend/index.vue b/niucloud/addon/hello_world/uni-app/components/diy/comp-extend/index.vue deleted file mode 100644 index c123926f4..000000000 --- a/niucloud/addon/hello_world/uni-app/components/diy/comp-extend/index.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/niucloud/addon/hello_world/uni-app/components/diy/hello-text/index.vue b/niucloud/addon/hello_world/uni-app/components/diy/hello-text/index.vue new file mode 100644 index 000000000..687e82f7c --- /dev/null +++ b/niucloud/addon/hello_world/uni-app/components/diy/hello-text/index.vue @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/niucloud/addon/hello_world/uni-app/pages.json b/niucloud/addon/hello_world/uni-app/pages.json deleted file mode 100644 index 75f858400..000000000 --- a/niucloud/addon/hello_world/uni-app/pages.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "pages" : [ // pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/hello_world/index", - "style": { - // #ifdef H5 - "navigationStyle": "custom", - // #endif - "navigationBarTitleText": "%pages.hello_world.index%" - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#ffffff", - "backgroundColor": "#F8F8F8", - "backgroundColorTop": "#F8F8F8", - "backgroundColorBottom": "#F8F8F8" - }, - "tabBar": { - "list": [ - { - "pagePath": "pages/index/index" - }, - { - "pagePath": "pages/article/list" - }, - { - "pagePath": "pages/member/index" - } - ] - }, - "uniIdRouter": {}, - "easycom": { - "custom": { - "^u-(.*)": "uview-plus/components/u-$1/u-$1.vue", - "diy-system-(\W.*)": "@/components/diy/system/$1/index.vue", - "diy-core-(\W.*)": "@/components/diy/core/$1/index.vue", - "diy-(\W.*)": "@/components/diy/$1/index.vue" - } - } -} diff --git a/niucloud/addon/hello_world/uni-app/pages/hello_world/info.vue b/niucloud/addon/hello_world/uni-app/pages/hello_world/info.vue new file mode 100644 index 000000000..85165f697 --- /dev/null +++ b/niucloud/addon/hello_world/uni-app/pages/hello_world/info.vue @@ -0,0 +1,166 @@ + + + + + \ No newline at end of file diff --git a/niucloud/app/ExceptionHandle.php b/niucloud/app/ExceptionHandle.php index a7a9337db..d27b4dc29 100644 --- a/niucloud/app/ExceptionHandle.php +++ b/niucloud/app/ExceptionHandle.php @@ -1,9 +1,10 @@ rootUrl()) : $app_type; //写入日志内容 $log = [ - '服务主体：'.($app_type == AppTypeEnum::ADMIN ? request()->uid() : request()->memberId()),//服务发起者 //用户ID + '服务主体：'.($app_type == AppTypeDict::ADMIN ? request()->uid() : request()->memberId()),//服务发起者 //用户ID 'IP：'.request()->ip(),//ip '耗时（毫秒）：'.ceil((microtime(true) * 1000) - (request()->time(true) * 1000)),//耗时（毫秒） '请求类型：'.request()->method(),//请求类型 @@ -102,8 +103,9 @@ class ExceptionHandle extends Handle } else if($e instanceof UnexpectedValueException){ return fail($e->getMessage(), [], 401); }else if($e instanceof AuthException || $e instanceof AdminException){ - return fail($e->getMessage(), [], $e->getCode() ?: 400); + }else if($e instanceof ServerException){ + return fail($e->getMessage(), [], http_code:$e->getCode()); }else { return fail($e->getMessage(), $massageData); } diff --git a/niucloud/app/Request.php b/niucloud/app/Request.php index e6fd28691..4670f5e45 100644 --- a/niucloud/app/Request.php +++ b/niucloud/app/Request.php @@ -1,7 +1,7 @@ 0) { static::$site_id = (int)$site_id; } else { - return static::$site_id ?? $this->getDefaultSiteId(); + return static::$site_id ?? $this->defaultSiteId(); } } @@ -165,7 +165,7 @@ class Request extends \think\Request * @return array|string */ public function getChannel(){ - return $this->header(system_name('channel_name'), ChannelEnum::H5); + return $this->header(system_name('channel_name'), ChannelDict::H5); } /** @@ -173,7 +173,7 @@ class Request extends \think\Request * @return int */ public function defaultSiteId(){ - return 1; + return 0; } /** diff --git a/niucloud/app/adminapi/controller/addon/Addon.php b/niucloud/app/adminapi/controller/addon/Addon.php index 48a61b8dc..621a8dbb7 100644 --- a/niucloud/app/adminapi/controller/addon/Addon.php +++ b/niucloud/app/adminapi/controller/addon/Addon.php @@ -13,7 +13,6 @@ namespace app\adminapi\controller\addon; use app\service\admin\addon\AddonService; use app\service\core\addon\CoreAddonService; -use app\service\core\addon\CoreInstallService; use core\base\BaseAdminController; use think\Response; @@ -34,17 +33,34 @@ class Addon extends BaseAdminController */ public function install($addon) { - ( new AddonService() )->install($addon); - return success('ADDON_INSTALL_SUCCESS'); + return ( new AddonService() )->install($addon); + } + + /** + * 执行安装 + * @param $addon + * @return void + */ + public function execute($addon) { + return ( new AddonService() )->executeInstall($addon); + } + + /** + * 插件安装环境检测 + * @param $addon + * @return mixed + */ + public function installCheck($addon){ + return ( new AddonService() )->installCheck($addon); } /** * 查询插件安装状态 * @param $addon */ - public function getInstallState($addon) + public function getInstallState($addon, $key) { - return success(( new AddonService() )->getInstallState($addon)); + return success(( new AddonService() )->getInstallState($addon, $key)); } /** diff --git a/niucloud/app/adminapi/controller/addon/App.php b/niucloud/app/adminapi/controller/addon/App.php index 6e98f6190..2a9402d53 100644 --- a/niucloud/app/adminapi/controller/addon/App.php +++ b/niucloud/app/adminapi/controller/addon/App.php @@ -12,7 +12,6 @@ namespace app\adminapi\controller\addon; use app\service\core\addon\CoreAddonService; -use app\service\core\addon\CoreInstallService; use core\base\BaseAdminController; diff --git a/niucloud/app/adminapi/controller/diy/Diy.php b/niucloud/app/adminapi/controller/diy/Diy.php index dd2597776..bcdbce201 100644 --- a/niucloud/app/adminapi/controller/diy/Diy.php +++ b/niucloud/app/adminapi/controller/diy/Diy.php @@ -11,7 +11,6 @@ namespace app\adminapi\controller\diy; -use app\enum\diy\PageEnum; use app\service\admin\diy\DiyService; use core\base\BaseAdminController; @@ -67,7 +66,7 @@ class Diy extends BaseAdminController /** * 自定义页面编辑 - * @param $id 自定义页面id + * @param $id * @return \think\Response */ public function edit($id) @@ -84,7 +83,7 @@ class Diy extends BaseAdminController /** * 自定义页面删除 - * @param $id 自定义页面id + * @param $id * @return \think\Response */ public function del(int $id) @@ -114,7 +113,8 @@ class Diy extends BaseAdminController $params = $this->request->params([ [ 'id', "" ], [ "name", "" ], - [ "type", "" ], + [ "template", "" ], + [ 'template_name', '' ], [ "title", "" ], ]); @@ -132,16 +132,16 @@ class Diy extends BaseAdminController } /** - * 获取页面类型 + * 获取页面模板 * @return \think\Response */ - public function getPageType() + public function getTemplate() { $params = $this->request->params([ [ 'type', "" ], ]); - $page_type = PageEnum::getPageType($params[ 'type' ]); - return success($page_type); + $diy_service = new DiyService(); + return success($diy_service->getTemplate($params[ 'type' ])); } /** diff --git a/niucloud/app/adminapi/controller/diy/DiyRoute.php b/niucloud/app/adminapi/controller/diy/DiyRoute.php index c718f4cf4..f3cd0cb4e 100644 --- a/niucloud/app/adminapi/controller/diy/DiyRoute.php +++ b/niucloud/app/adminapi/controller/diy/DiyRoute.php @@ -73,7 +73,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表编辑 - * @param $id 自定义路由表id + * @param $id * @return \think\Response */ public function edit($id) @@ -92,7 +92,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表删除 - * @param $id 自定义路由表id + * @param $id * @return \think\Response */ public function del(int $id) diff --git a/niucloud/app/adminapi/controller/generator/Generator.php b/niucloud/app/adminapi/controller/generator/Generator.php index de406e92a..b378720ac 100644 --- a/niucloud/app/adminapi/controller/generator/Generator.php +++ b/niucloud/app/adminapi/controller/generator/Generator.php @@ -55,7 +55,7 @@ class Generator extends BaseController $data = $this->request->params([ [ "table_name", "" ], ], false); - $this->validate($data, 'app\validate\generator\generator.add'); + $this->validate($data, 'app\validate\generator\Generator.add'); $id = ( new GenerateService() )->add($data); return success('ADD_SUCCESS', [ 'id' => $id ]); } @@ -75,7 +75,7 @@ class Generator extends BaseController [ "edit_type", "1" ], [ "table_column", "" ], ], false); - $this->validate($data, 'app\validate\generator\generator.edit'); + $this->validate($data, 'app\validate\generator\Generator.edit'); ( new GenerateService() )->edit($id, $data); return success('MODIFY_SUCCESS'); } diff --git a/niucloud/app/adminapi/controller/login/Config.php b/niucloud/app/adminapi/controller/login/Config.php index 615a461d2..9e238a55a 100644 --- a/niucloud/app/adminapi/controller/login/Config.php +++ b/niucloud/app/adminapi/controller/login/Config.php @@ -15,6 +15,7 @@ use app\service\admin\auth\ConfigService; use core\base\BaseAdminController; use think\Response; + class Config extends BaseAdminController { diff --git a/niucloud/app/adminapi/controller/login/Login.php b/niucloud/app/adminapi/controller/login/Login.php index 1aa47a756..e6d41cd0e 100644 --- a/niucloud/app/adminapi/controller/login/Login.php +++ b/niucloud/app/adminapi/controller/login/Login.php @@ -13,6 +13,7 @@ namespace app\adminapi\controller\login; use app\service\admin\auth\ConfigService; use app\service\admin\auth\LoginService; +use app\service\core\addon\CoreAddonInstallService; use core\base\BaseAdminController; use think\Response; diff --git a/niucloud/app/adminapi/controller/member/Account.php b/niucloud/app/adminapi/controller/member/Account.php index bff428abd..a92806efd 100644 --- a/niucloud/app/adminapi/controller/member/Account.php +++ b/niucloud/app/adminapi/controller/member/Account.php @@ -11,9 +11,12 @@ namespace app\adminapi\controller\member; -use app\enum\member\MemberAccountEnum; +use app\dict\member\MemberAccountTypeDict; use app\service\admin\member\MemberAccountService; +use app\service\admin\member\MemberCashOutService; +use app\service\admin\member\MemberService; use core\base\BaseAdminController; +use PhpOffice\PhpSpreadsheet\Style\NumberFormat; use think\Response; class Account extends BaseAdminController @@ -28,11 +31,40 @@ class Account extends BaseAdminController [ 'member_id', '' ], [ 'from_type', '' ], [ 'create_time', [] ], + [ 'keywords', '' ], ]); $data[ 'account_type' ] = 'point'; return success(( new MemberAccountService() )->getPage($data)); } + /** + * 会员积分统计（用于会员积分统计窗口） + */ + public function sumPoint() + { + $data = $this->request->params([ + [ 'member_id', '' ], + ]); + $member_account_service = new MemberAccountService(); + $member_service = new MemberService(); + + if(empty($data['member_id'])) + { + $commission_data = [ + 'point_get' => $member_service->getSum('point_get'),//累计 + 'point_use' => abs($member_account_service->getExpensesSumAccount(MemberAccountTypeDict::POINT)), + ]; + return success($commission_data); + }else{ + $info = $member_account_service->getMemberAccountInfo($data['member_id']); + $commission_data = [ + 'point_get' => $info['point_get'], + 'point_use' => abs($member_account_service->getExpensesSumAccount(MemberAccountTypeDict::POINT,$data['member_id'])), + ]; + return success($commission_data); + } + } + /** * 余额流水 * @return Response @@ -43,6 +75,7 @@ class Account extends BaseAdminController [ 'member_id', '' ], [ 'from_type', '' ], [ 'create_time', [] ], + [ 'keywords', '' ], ]); $data[ 'account_type' ] = 'balance'; return success(( new MemberAccountService() )->getPage($data)); @@ -58,6 +91,7 @@ class Account extends BaseAdminController [ 'member_id', '' ], [ 'from_type', '' ], [ 'create_time', [] ], + [ 'keywords', '' ], ]); $data[ 'account_type' ] = 'money'; return success(( new MemberAccountService() )->getPage($data)); @@ -74,7 +108,7 @@ class Account extends BaseAdminController [ 'memo', '' ], ]); $res = ( new MemberAccountService() )->adjustPoint($data); - return success('ADD_SUCCESS', [ 'id' => $res ]); + return success('SUCCESS', [ 'id' => $res ]); } /** @@ -88,7 +122,7 @@ class Account extends BaseAdminController [ 'memo', '' ], ]); $res = ( new MemberAccountService() )->adjustBalance($data); - return success('ADD_SUCCESS', [ 'id' => $res ]); + return success('SUCCESS', [ 'id' => $res ]); } /** @@ -103,7 +137,7 @@ class Account extends BaseAdminController [ 'memo', '' ], ]); $res = ( new MemberAccountService() )->adjustMoney($data); - return success('ADD_SUCCESS', [ 'id' => $res ]); + return success('SUCCESS', [ 'id' => $res ]); } /** @@ -116,11 +150,44 @@ class Account extends BaseAdminController [ 'member_id', '' ], [ 'from_type', '' ], [ 'create_time', [] ], + [ 'keywords', '' ], ]); $data[ 'account_type' ] = 'commission'; return success(( new MemberAccountService() )->getPage($data)); } + /** + * 会员佣金统计（用于会员账户统计窗口） + */ + public function sumCommission() + { + $data = $this->request->params([ + [ 'member_id', '' ], + ]); + $member_account_service = new MemberAccountService(); + $member_service = new MemberService(); + + if(empty($data['member_id'])) + { + $commission_data = [ + 'total_commission' => $member_service->getSum('commission_get'),//累计 + 'commission' => $member_service->getSum('commission'),//未提现 + 'withdrawn_commission' => $member_account_service->getWithdrawnCommission(),//已提现 + 'commission_cash_outing' => $member_service->getSum('commission_cash_outing'),//提现中 + ]; + return success($commission_data); + }else{ + $info = $member_account_service->getMemberAccountInfo($data['member_id']); + $commission_data = [ + 'commission' => $info['commission'], + 'commission_cash_outing' => $info['commission_cash_outing'], + 'withdrawn_commission' => $member_account_service->getWithdrawnCommission($data['member_id']),//已提现 + 'total_commission' => $info['commission_get'], + ]; + return success($commission_data); + } + } + /** * 会员余额统计（用于会员账户统计窗口） */ @@ -134,8 +201,8 @@ class Account extends BaseAdminController { $balance_data = [ - MemberAccountEnum::BALANCE => $member_account_service->getSumAccount(MemberAccountEnum::BALANCE), - MemberAccountEnum::MONEY => $member_account_service->getSumAccount(MemberAccountEnum::MONEY), + MemberAccountTypeDict::BALANCE => number_format($member_account_service->getSumAccount(MemberAccountTypeDict::BALANCE), 2), + MemberAccountTypeDict::MONEY => number_format($member_account_service->getSumAccount(MemberAccountTypeDict::MONEY), 2), ]; return success($balance_data); }else{ @@ -158,7 +225,7 @@ class Account extends BaseAdminController */ public function accountType() { - return success(MemberAccountEnum::getType()); + return success(MemberAccountTypeDict::getType()); } diff --git a/niucloud/app/adminapi/controller/member/CashOut.php b/niucloud/app/adminapi/controller/member/CashOut.php index c0272185e..f7b0ccd96 100644 --- a/niucloud/app/adminapi/controller/member/CashOut.php +++ b/niucloud/app/adminapi/controller/member/CashOut.php @@ -11,8 +11,8 @@ namespace app\adminapi\controller\member; -use app\enum\member\MemberCashOutEnum; -use app\enum\pay\TransferEnum; +use app\dict\member\MemberCashOutDict; +use app\dict\pay\TransferDict; use app\service\admin\member\MemberCashOutService; use core\base\BaseAdminController; use think\Response; @@ -28,7 +28,12 @@ class CashOut extends BaseAdminController $data = $this->request->params([ ['member_id', ''], ['status', ''], + ['transfer_type', ''], ['create_time', []], + ['audit_time', []], + ['transfer_time', []], + ['cash_out_no', ''], + ['keywords', ''] ]); return success((new MemberCashOutService())->getPage($data)); } @@ -58,7 +63,7 @@ class CashOut extends BaseAdminController */ public function getTransferType() { - return success(TransferEnum::getTransferType([], false)); + return success(TransferDict::getTransferType([], false)); } /** @@ -82,6 +87,14 @@ class CashOut extends BaseAdminController * @return Response */ public function getStatusList(){ - return success(MemberCashOutEnum::getStatus()); + return success(MemberCashOutDict::getStatus()); + } + + /** + * 统计数据 + */ + public function stat() + { + return success((new MemberCashOutService())->stat()); } } diff --git a/niucloud/app/adminapi/controller/member/Config.php b/niucloud/app/adminapi/controller/member/Config.php index 736d660c1..50f8cfa18 100644 --- a/niucloud/app/adminapi/controller/member/Config.php +++ b/niucloud/app/adminapi/controller/member/Config.php @@ -37,6 +37,7 @@ class Config extends BaseAdminController [ 'is_mobile', 0 ], [ 'is_auth_register', 1 ], [ 'is_bind_mobile', 0 ], + [ 'agreement_show', 0 ] ]); $this->validate($data, 'app\validate\member\LoginConfig.set'); ( new MemberConfigService() )->setLoginConfig($data); @@ -71,4 +72,25 @@ class Config extends BaseAdminController return success('SET_SUCCESS'); } + /** + * 获取会员配置 + * @return Response + */ + public function getMemberConfig(){ + return success(( new MemberConfigService() )->getMemberConfig()); + } + + /** + * 设置会员配置 + * @return Response + */ + public function setMemberConfig(){ + $data = $this->request->params([ + [ 'prefix', '' ], + [ 'length', 10 ] + ]); + $this->validate($data, 'app\validate\member\MemberConfig.set'); + ( new MemberConfigService() )->setMemberConfig($data); + return success('MODIFY_SUCCESS'); + } } diff --git a/niucloud/app/adminapi/controller/member/Member.php b/niucloud/app/adminapi/controller/member/Member.php index fd3bca923..7a6ce885f 100644 --- a/niucloud/app/adminapi/controller/member/Member.php +++ b/niucloud/app/adminapi/controller/member/Member.php @@ -11,9 +11,9 @@ namespace app\adminapi\controller\member; -use app\enum\member\MemberEnum; -use app\enum\member\MemberRegisterChannelEnum; -use app\enum\member\MemberRegisterTypeEnum; +use app\dict\member\MemberDict; +use app\dict\member\MemberRegisterChannelDict; +use app\dict\member\MemberRegisterTypeDict; use app\service\admin\member\MemberService; use core\base\BaseAdminController; use think\Response; @@ -55,7 +55,8 @@ class Member extends BaseAdminController $data = $this->request->params([ ['nickname', ''], ['mobile', ''], - ['username', ''], + ['member_no', ''], + ['init_member_no', ''], ['password', ''], ['headimg', ''], ['member_label', []], @@ -104,13 +105,19 @@ class Member extends BaseAdminController return success('EDIT_SUCCESS'); } + public function del($member_id) + { + $res = (new MemberService())->deleteMember($member_id); + return success('DELETE_SUCCESS'); + } + /** * 会员使用场景 * @return array|mixed|string */ public function getMemberRegisterType() { - return success(MemberRegisterTypeEnum::getType()); + return success(MemberRegisterTypeDict::getType()); } /** @@ -131,7 +138,7 @@ class Member extends BaseAdminController */ public function getMemberRegisterChannelType() { - return success(MemberRegisterChannelEnum::getType()); + return success(MemberRegisterChannelDict::getType()); } /** @@ -154,6 +161,17 @@ class Member extends BaseAdminController * @return Response */ public function getStatusList(){ - return success(MemberEnum::getStatus()); + return success(MemberDict::getStatus()); } + + /** + * 获取会员编码 + * @return Response + */ + public function getMemberNo(){ + $member_no = (new MemberService())->getMemberNo(); + return success('SUCCESS', $member_no); + } + + } diff --git a/niucloud/app/adminapi/controller/notice/Notice.php b/niucloud/app/adminapi/controller/notice/Notice.php index 57810a25c..d3d5dae3e 100644 --- a/niucloud/app/adminapi/controller/notice/Notice.php +++ b/niucloud/app/adminapi/controller/notice/Notice.php @@ -11,7 +11,7 @@ namespace app\adminapi\controller\notice; -use app\enum\sys\SmsEnum; +use app\dict\sys\SmsDict; use app\service\admin\notice\NoticeService; use app\service\admin\notice\SmsService; use core\base\BaseAdminController; @@ -78,7 +78,7 @@ class Notice extends BaseAdminController public function editSms($sms_type) { //参数获取 - $sms_type_list = SmsEnum::getType(); + $sms_type_list = SmsDict::getType(); if(!array_key_exists($sms_type, $sms_type_list)) throw new AdminException('SMS_TYPE_NOT_EXIST'); //数据验证 $data = [ diff --git a/niucloud/app/adminapi/controller/order/Recharge.php b/niucloud/app/adminapi/controller/order/Recharge.php index feda40cb8..4ae5b09bb 100644 --- a/niucloud/app/adminapi/controller/order/Recharge.php +++ b/niucloud/app/adminapi/controller/order/Recharge.php @@ -25,10 +25,14 @@ class Recharge extends BaseAdminController public function lists() { $data = $this->request->params([ + ['order_no', ''], ['order_status', ''], ['order_from', ''], ['create_time', []], - ['member_id', ''] + ['pay_time', []], + ['member_id', ''], + ['start_money', 0], + ['end_money', 0] ]); return success((new RechargeOrderService())->getPage($data)); } @@ -55,4 +59,18 @@ class Recharge extends BaseAdminController return fail($res); } + + /** + * 充值统计 + */ + public function stat() + { + $data = $this->request->params([ + [ 'member_id', '' ], + ]); + $res = (new RechargeOrderService())->stat($data); + return success($res); + } + + } diff --git a/niucloud/app/adminapi/controller/order/Refund.php b/niucloud/app/adminapi/controller/order/Refund.php index 2d5ed8650..42e755e3d 100644 --- a/niucloud/app/adminapi/controller/order/Refund.php +++ b/niucloud/app/adminapi/controller/order/Refund.php @@ -27,7 +27,9 @@ class Refund extends BaseAdminController ['create_time', []], ['member_id', ''], ['refund_no', ''], - ['status', ''] + ['status', ''], + ['keywords', ''], + ['order_no', ''], ]); return success((new RefundService())->getPage($data)); } @@ -54,4 +56,12 @@ class Refund extends BaseAdminController ]); return success((new RefundService())->getStatus($data['type'])); } + + /** + * 退款统计 + */ + public function stat() + { + return success((new RefundService())->stat()); + } } diff --git a/niucloud/app/adminapi/controller/pay/PayChannel.php b/niucloud/app/adminapi/controller/pay/PayChannel.php index 12a48c458..288529d49 100644 --- a/niucloud/app/adminapi/controller/pay/PayChannel.php +++ b/niucloud/app/adminapi/controller/pay/PayChannel.php @@ -11,7 +11,7 @@ namespace app\adminapi\controller\pay; -use app\enum\pay\PayEnum; +use app\dict\pay\PayDict; use app\model\pay\PayConfigTemplate; use app\service\admin\pay\PayChannelService; use app\service\admin\pay\PayConfigTemplateService; @@ -68,8 +68,8 @@ class PayChannel extends BaseAdminController ['wechatpay_config', []], ['alipay_config', []], ]); - $this->validate(array_merge($data['wechatpay_config'], ['type' => PayEnum::WECHATPAY]), 'app\validate\pay\Pay.set'); - $this->validate(array_merge($data['alipay_config'], ['type' => PayEnum::ALIPAY]), 'app\validate\pay\Pay.set'); + $this->validate(array_merge($data['wechatpay_config'], ['type' => PayDict::WECHATPAY]), 'app\validate\pay\Pay.set'); + $this->validate(array_merge($data['alipay_config'], ['type' => PayDict::ALIPAY]), 'app\validate\pay\Pay.set'); (new PayChannelService())->setTransfer($data); return success('SET_SUCCESS'); } @@ -82,8 +82,8 @@ class PayChannel extends BaseAdminController $data = $this->request->params([ ['config', []], ]); -// $this->validate(array_merge($data['wechatpay_config'], ['type' => PayEnum::WECHATPAY]), 'app\validate\pay\Pay.set'); -// $this->validate(array_merge($data['alipay_config'], ['type' => PayEnum::ALIPAY]), 'app\validate\pay\Pay.set'); +// $this->validate(array_merge($data['wechatpay_config'], ['type' => PayDict::WECHATPAY]), 'app\validate\pay\Pay.set'); +// $this->validate(array_merge($data['alipay_config'], ['type' => PayDict::ALIPAY]), 'app\validate\pay\Pay.set'); (new PayChannelService())->setAll($data['config']); return success('SET_SUCCESS'); } diff --git a/niucloud/app/adminapi/controller/site/Site.php b/niucloud/app/adminapi/controller/site/Site.php index 54cf399bc..8c41c6594 100644 --- a/niucloud/app/adminapi/controller/site/Site.php +++ b/niucloud/app/adminapi/controller/site/Site.php @@ -11,7 +11,7 @@ namespace app\adminapi\controller\site; -use app\enum\site\SiteEnum; +use app\dict\site\SiteDict; use app\service\admin\auth\AuthSiteService; use app\service\admin\site\SiteService; use core\base\BaseAdminController; @@ -27,8 +27,10 @@ class Site extends BaseAdminController { $data = $this->request->params([ ['keywords', ''], - ['status', 1], + ['status', ""], ['group_id', 0], + ['create_time', []], + ['expire_time', []], ]); return success((new SiteService())->getPage($data)); } @@ -84,7 +86,7 @@ class Site extends BaseAdminController */ public function getStatuList() { - return success(SiteEnum::getStatus()); + return success(SiteDict::getStatus()); } /** @@ -94,4 +96,28 @@ class Site extends BaseAdminController public function menu(){ return success((new AuthSiteService())->getMenuList(1, 'all')); } + + /** + * 关闭站点 + */ + public function closeSite($id) + { + $data = $this->request->params([ + ['status', SiteDict::CLOSE], + ]); + (new SiteService())->edit($id, $data); + return success('SUCCESS'); + } + + /** + * 开启站点 + */ + public function openSite($id) + { + $data = $this->request->params([ + ['status', SiteDict::ON], + ]); + (new SiteService())->edit($id, $data); + return success('SUCCESS'); + } } diff --git a/niucloud/app/adminapi/controller/site/User.php b/niucloud/app/adminapi/controller/site/User.php index 30576fffd..d01e3c812 100644 --- a/niucloud/app/adminapi/controller/site/User.php +++ b/niucloud/app/adminapi/controller/site/User.php @@ -11,7 +11,7 @@ namespace app\adminapi\controller\site; -use app\enum\sys\UserEnum; +use app\dict\sys\UserDict; use app\service\admin\site\SiteUserService; use app\service\admin\user\UserService; use core\base\BaseAdminController; @@ -55,7 +55,7 @@ class User extends BaseAdminController ['password', ''], ['real_name', ''], ['head_img', ''], - ['status', UserEnum::ON], + ['status', UserDict::ON], ['role_ids', []] ]); $this->validate($data, 'app\validate\sys\User.add'); @@ -71,7 +71,7 @@ class User extends BaseAdminController $data = $this->request->params([ ['real_name', ''], ['head_img', ''], - ['status', UserEnum::ON], + ['status', UserDict::ON], ['role_ids', []], ['password', ''] ]); diff --git a/niucloud/app/adminapi/controller/sys/Attachment.php b/niucloud/app/adminapi/controller/sys/Attachment.php index 95055648a..ca51b1f63 100644 --- a/niucloud/app/adminapi/controller/sys/Attachment.php +++ b/niucloud/app/adminapi/controller/sys/Attachment.php @@ -11,7 +11,7 @@ namespace app\adminapi\controller\sys; -use app\enum\sys\FileEnum; +use app\dict\sys\FileDict; use app\service\admin\sys\AttachmentService; use core\base\BaseAdminController; use think\Response; @@ -63,7 +63,7 @@ class Attachment extends BaseAdminController public function addCategory() { $data = $this->request->params([ - ['type', FileEnum::IMAGE], + ['type', FileDict::IMAGE], ['name', ''] ]); $this->validate($data, 'app\validate\sys\AttachmentCategory.add'); diff --git a/niucloud/app/adminapi/controller/sys/Channel.php b/niucloud/app/adminapi/controller/sys/Channel.php index b9a8bae82..f1479e124 100644 --- a/niucloud/app/adminapi/controller/sys/Channel.php +++ b/niucloud/app/adminapi/controller/sys/Channel.php @@ -11,7 +11,7 @@ namespace app\adminapi\controller\sys; -use app\enum\common\ChannelEnum; +use app\dict\common\ChannelDict; use core\base\BaseAdminController; class Channel extends BaseAdminController @@ -24,6 +24,6 @@ class Channel extends BaseAdminController */ public function getChannelType() { - return success(ChannelEnum::getType()); + return success(ChannelDict::getType()); } } diff --git a/niucloud/app/adminapi/controller/sys/Config.php b/niucloud/app/adminapi/controller/sys/Config.php index 07a5dfa29..7e027f947 100644 --- a/niucloud/app/adminapi/controller/sys/Config.php +++ b/niucloud/app/adminapi/controller/sys/Config.php @@ -44,9 +44,22 @@ class Config extends BaseAdminController ["full_address",""], ["phone",""], ["business_hours",""], + ["site_name",""], + ["logo",""], + ["front_end_name", ""], + ["front_end_logo", ""], + ["icon", ""] ]); - $this->validate($data, 'app\validate\site\site.edit'); + $this->validate($data, 'app\validate\site\Site.edit'); (new ConfigService())->setWebSite($data); + + $service_data = $this->request->params([ + ["wechat_code",""], + ["enterprise_wechat",""], + ["tel",""], + ]); + (new ConfigService())->setService($service_data); + return success(); } @@ -83,4 +96,12 @@ class Config extends BaseAdminController public function getSceneDomain(){ return success((new ConfigService())->getSceneDomain()); } + + /** + * 获取服务信息 + * @return Response + */ + public function getServiceInfo(){ + return success((new ConfigService())->getService()); + } } diff --git a/niucloud/app/adminapi/controller/sys/Cron.php b/niucloud/app/adminapi/controller/sys/Cron.php index 345f8d4bc..cf20b7552 100644 --- a/niucloud/app/adminapi/controller/sys/Cron.php +++ b/niucloud/app/adminapi/controller/sys/Cron.php @@ -11,7 +11,7 @@ namespace app\adminapi\controller\sys; -use app\enum\sys\CronEnum; +use app\dict\sys\CronDict; use app\service\admin\cron\CronService; use core\base\BaseAdminController; @@ -51,6 +51,6 @@ class Cron extends BaseAdminController * @return \think\Response */ public function getType(){ - return success((new CronEnum())->getType()); + return success((new CronDict())->getType()); } } diff --git a/niucloud/app/adminapi/controller/sys/Menu.php b/niucloud/app/adminapi/controller/sys/Menu.php index a58d6c863..5f3b668e2 100644 --- a/niucloud/app/adminapi/controller/sys/Menu.php +++ b/niucloud/app/adminapi/controller/sys/Menu.php @@ -11,9 +11,9 @@ namespace app\adminapi\controller\sys; -use app\enum\sys\MenuEnum; -use app\enum\sys\MenuTypeEnum; -use app\enum\sys\MethodEnum; +use app\dict\sys\MenuDict; +use app\dict\sys\MenuTypeDict; +use app\dict\sys\MethodDict; use app\service\admin\install\InstallSystemService; use app\service\admin\sys\MenuService; use core\base\BaseAdminController; @@ -60,7 +60,7 @@ class Menu extends BaseAdminController ['methods', ''], ['sort', 0], - ['status', MenuEnum::ON], + ['status', MenuDict::ON], ['is_show', 0], ]); $this->validate($data, 'app\validate\sys\Menu.add'); @@ -85,7 +85,7 @@ class Menu extends BaseAdminController ['methods', ''], ['sort', 0], - ['status', MenuEnum::ON], + ['status', MenuDict::ON], ['is_show', 0], ]); $this->validate($data, 'app\validate\sys\Menu.edit'); @@ -99,7 +99,7 @@ class Menu extends BaseAdminController * @return Response */ public function getMenuType(){ - return success(MenuTypeEnum::getMenuType()); + return success(MenuTypeDict::getMenuType()); } /** @@ -107,7 +107,7 @@ class Menu extends BaseAdminController * @return Response */ public function getMethodType(){ - return success(MethodEnum::getMethodType()); + return success(MethodDict::getMethodType()); } /** diff --git a/niucloud/app/adminapi/controller/sys/Role.php b/niucloud/app/adminapi/controller/sys/Role.php index 7561c997b..ca925d440 100644 --- a/niucloud/app/adminapi/controller/sys/Role.php +++ b/niucloud/app/adminapi/controller/sys/Role.php @@ -11,7 +11,7 @@ namespace app\adminapi\controller\sys; -use app\enum\sys\RoleStatusEnum; +use app\dict\sys\RoleStatusDict; use app\service\admin\sys\RoleService; use core\base\BaseAdminController; use think\Response; @@ -51,7 +51,7 @@ class Role extends BaseAdminController $data = $this->request->params([ ['role_name', ''], ['rules', []], - ['status', RoleStatusEnum::ON], + ['status', RoleStatusDict::ON], ]); $this->validate($data, 'app\validate\sys\Role.add'); (new RoleService())->add($data); @@ -66,7 +66,7 @@ class Role extends BaseAdminController $data = $this->request->params([ ['role_name', ''], ['rules', []], - ['status', RoleStatusEnum::ON], + ['status', RoleStatusDict::ON], ]); $this->validate($data, 'app\validate\sys\Role.edit'); (new RoleService())->edit($role_id, $data); diff --git a/niucloud/app/adminapi/controller/sys/System.php b/niucloud/app/adminapi/controller/sys/System.php index 563393b03..377ff5cf8 100644 --- a/niucloud/app/adminapi/controller/sys/System.php +++ b/niucloud/app/adminapi/controller/sys/System.php @@ -47,4 +47,27 @@ class System extends BaseAdminController return success((new SystemService())->getSystemInfo()); } + /** + * 清理缓存，更新菜单 + */ + public function schemaCache(){ + + return success((new SystemService())->schemaCache()); + } + + /** + * 校验消息队列是否正常运行 + * @return \think\Response + */ + public function checkJob(){ + return success(data:(new SystemService())->checkJob()); + } + + /** + * 校验计划任务是否正常运行 + * @return \think\Response + */ + public function checkSchedule(){ + return success(data:(new SystemService())->checkSchedule()); + } } diff --git a/niucloud/app/adminapi/controller/upload/Storage.php b/niucloud/app/adminapi/controller/upload/Storage.php index 7d26bff6a..9a6432fc9 100644 --- a/niucloud/app/adminapi/controller/upload/Storage.php +++ b/niucloud/app/adminapi/controller/upload/Storage.php @@ -12,7 +12,7 @@ namespace app\adminapi\controller\upload; use app\adminapi\controller\sys\AdminException; -use app\enum\sys\StorageEnum; +use app\dict\sys\StorageDict; use app\service\admin\file\StorageConfigService; use core\base\BaseAdminController; use think\Response; @@ -47,7 +47,7 @@ class Storage extends BaseAdminController public function editStorage($storage_type) { //参数获取 - $storage_type_list = StorageEnum::getType(); + $storage_type_list = StorageDict::getType(); if (!array_key_exists($storage_type, $storage_type_list)) throw new AdminException('OSS_TYPE_NOT_EXIST'); //数据验证 $data = [ diff --git a/niucloud/app/adminapi/middleware/AllowCrossDomain.php b/niucloud/app/adminapi/middleware/AllowCrossDomain.php index 5a0cb96d1..769ebf9cf 100644 --- a/niucloud/app/adminapi/middleware/AllowCrossDomain.php +++ b/niucloud/app/adminapi/middleware/AllowCrossDomain.php @@ -14,6 +14,7 @@ namespace app\adminapi\middleware; use app\Request; use Closure; use core\exception\AdminException; +use core\exception\ServerException; /** * http跨域请求中间件 @@ -54,7 +55,7 @@ class AllowCrossDomain header('Access-Control-Allow-Origin: *'); }else{ header('Access-Control-Allow-Origin: *'); - throw new AdminException('SERVER_CROSS_REQUEST_FAIL'); + throw new ServerException('SERVER_CROSS_REQUEST_FAIL', 409); } return $next($request); diff --git a/niucloud/app/adminapi/route/addon.php b/niucloud/app/adminapi/route/addon.php index 770cebf7f..74f64b886 100644 --- a/niucloud/app/adminapi/route/addon.php +++ b/niucloud/app/adminapi/route/addon.php @@ -15,7 +15,7 @@ use app\adminapi\middleware\AdminLog; use think\facade\Route; /** - * 路由 + * 应用插件相关路由 */ Route::group(function () { //获取本地插件 @@ -28,19 +28,21 @@ Route::group(function () { Route::put('addon/status/:id/:status', 'addon.Addon/setStatus'); //安装插件 Route::post('addon/install/:addon', 'addon.Addon/install'); + //插件安装检测安装环境 + Route::get('addon/install/check/:addon', 'addon.Addon/installCheck'); + // 执行安装 + Route::post('addon/install/execute/:addon', 'addon.Addon/execute'); + //插件安装状态 + Route::get('addon/install/:addon/status/:key', 'addon.Addon/getInstallState'); //卸载插件 Route::post('addon/uninstall/:addon', 'addon.Addon/uninstall'); - //插件状态 - Route::get('addon/install/status/:addon', 'addon.Addon/uninstall'); //卸载插件 Route::post('addon/edit/:addon', 'addon.Addon/edit'); - - //应用列表(...) Route::get('app/list', 'addon.App/getAppList'); })->middleware([ AdminCheckToken::class, AdminCheckRole::class, AdminLog::class -]);; +]); diff --git a/niucloud/app/adminapi/route/diy.php b/niucloud/app/adminapi/route/diy.php index 3cb0f8e2d..5e6e8068e 100644 --- a/niucloud/app/adminapi/route/diy.php +++ b/niucloud/app/adminapi/route/diy.php @@ -1,12 +1,12 @@ +// | Author: Niucloud Team // +---------------------------------------------------------------------- use app\adminapi\middleware\AdminCheckRole; @@ -45,8 +45,8 @@ Route::group('diy', function() { // 设为使用 Route::put('use', 'diy.Diy/setUse'); - // 获取页面类型 - Route::get('type', 'diy.Diy/getPageType'); + // 获取页面模板 + Route::get('template', 'diy.Diy/getTemplate'); // 自定义路由列表 Route::get('route', 'diy.DiyRoute/lists'); diff --git a/niucloud/app/adminapi/route/member.php b/niucloud/app/adminapi/route/member.php index 2b2fee8f3..6538683c9 100644 --- a/niucloud/app/adminapi/route/member.php +++ b/niucloud/app/adminapi/route/member.php @@ -26,8 +26,13 @@ Route::group('member', function () { Route::get('member/:id', 'member.Member/info'); //会员添加 Route::post('member', 'member.Member/add'); + //会员删除 + Route::delete('member/:member_id', 'member.Member/del'); + //会员编码 + Route::get('memberno', 'member.Member/getMemberNo'); //会员添加 Route::put('member/:member_id', 'member.Member/edit');//会员添加 + Route::put('member/modify/:member_id/:field', 'member.Member/modify'); //会员注册方式 Route::get('registertype', 'member.Member/getMemberRegisterType'); @@ -63,6 +68,10 @@ Route::group('member', function () { Route::get('account/money', 'member.Account/money'); //会员佣金流水 Route::get('account/commission', 'member.Account/commission'); + //会员佣金统计 + Route::get('account/sum_commission', 'member.Account/sumCommission'); + //会员积分统计 + Route::get('account/sum_point', 'member.Account/sumPoint'); //会员积分调整 Route::post('account/point', 'member.Account/adjustPoint'); //会员余额调整 @@ -95,7 +104,12 @@ Route::group('member', function () { Route::put('cash_out/transfer/:id', 'member.CashOut/transfer'); //提现状态 Route::get('cash_out/status', 'member.CashOut/getStatusList'); - + //提现统计信息 + Route::get('cash_out/stat', 'member.CashOut/stat'); + //获取注册与登录设置 + Route::get('config/member', 'member.Config/getMemberConfig'); + //更新注册与登录设置 + Route::post('config/member', 'member.Config/setMemberConfig'); })->middleware([ AdminCheckToken::class, AdminCheckRole::class, diff --git a/niucloud/app/adminapi/route/order.php b/niucloud/app/adminapi/route/order.php index e8cba6220..62890e121 100644 --- a/niucloud/app/adminapi/route/order.php +++ b/niucloud/app/adminapi/route/order.php @@ -26,8 +26,10 @@ Route::group('order', function () { Route::get('recharge/:order_id', 'order.Recharge/detail'); //订单状态 Route::get('recharge/status', 'order.Recharge/status'); + //订单统计 + Route::get('recharge/stat', 'order.Recharge/stat'); // 订单发起退款 - Route::get('recharge/refund/:order_id', 'order.Recharge/refund'); + Route::put('recharge/refund/:order_id', 'order.Recharge/refund'); })->middleware([ AdminCheckToken::class, AdminCheckRole::class, diff --git a/niucloud/app/adminapi/route/refund.php b/niucloud/app/adminapi/route/refund.php index dd207231d..bca923e51 100644 --- a/niucloud/app/adminapi/route/refund.php +++ b/niucloud/app/adminapi/route/refund.php @@ -26,6 +26,8 @@ Route::group('refund', function () { Route::get('refund/:refund_id', 'order.Refund/detail'); //退款状态 Route::get('status', 'order.Refund/status'); + //退款状态 + Route::get('stat', 'order.Refund/stat'); })->middleware([ AdminCheckToken::class, AdminCheckRole::class, diff --git a/niucloud/app/adminapi/route/route.php b/niucloud/app/adminapi/route/route.php index 50fc4333d..67bafcfe0 100644 --- a/niucloud/app/adminapi/route/route.php +++ b/niucloud/app/adminapi/route/route.php @@ -27,7 +27,9 @@ Route::group(function () { Route::get('captcha/check', 'login.Captcha/check'); Route::get('terminal', 'sys.Terminal/exec'); + + Route::get('test', 'login.Login/test'); }); //加载插件路由 -(new \core\addon\AddonLoader("Route"))->load(['app_type' => 'adminapi']); \ No newline at end of file +(new \core\dict\DictLoader("Route"))->load(['app_type' => 'adminapi']); \ No newline at end of file diff --git a/niucloud/app/adminapi/route/site.php b/niucloud/app/adminapi/route/site.php index 7d66dbaf0..0e7ba889c 100644 --- a/niucloud/app/adminapi/route/site.php +++ b/niucloud/app/adminapi/route/site.php @@ -29,6 +29,10 @@ Route::group('site', function () { Route::post('site', 'site.Site/add'); //更新站点 Route::put('site/:id', 'site.Site/edit'); + //关闭站点 + Route::put('closesite/:id', 'site.Site/closeSite'); + //开启站点 + Route::put('opensite/:id', 'site.Site/openSite'); //站点状态 Route::get('statuslist', 'site.Site/getStatuList'); /***************************************************** 站点分组 *************************************************/ diff --git a/niucloud/app/adminapi/route/sys.php b/niucloud/app/adminapi/route/sys.php index 640ffbb1c..d76d5f2fd 100644 --- a/niucloud/app/adminapi/route/sys.php +++ b/niucloud/app/adminapi/route/sys.php @@ -52,7 +52,7 @@ Route::group('sys', function () { // 获取菜单信息 Route::get('menu/info/:menu_key', 'sys.Menu/info'); // 初始化菜单 - Route::get('menu/refresh', 'sys.Menu/refreshMenu'); + Route::post('menu/refresh', 'sys.Menu/refreshMenu'); Route::get('menu/mothod', 'sys.Menu/getMethodType'); /***************************************************** 设置 ****************************************************/ @@ -60,6 +60,8 @@ Route::group('sys', function () { Route::get('config/website', 'sys.Config/getWebsite'); //网站设置 Route::put('config/website', 'sys.Config/setWebsite'); + //服务信息设置 + Route::get('config/service', 'sys.Config/getServiceInfo'); //版权设置 Route::get('config/copyright', 'sys.Config/getCopyright'); //版权设置 @@ -133,11 +135,23 @@ Route::group('sys', function () { Route::get('scene_domain', 'sys.Config/getSceneDomain'); /***************************************************** 系统环境 ****************************************************/ Route::get('system', 'sys.System/getSystemInfo'); + //校验消息队列 + Route::get('job', 'sys.System/checkJob'); + //校验计划任务 + Route::get('schedule', 'sys.System/checkSchedule'); /***************************************************** 应用管理 ****************************************************/ Route::get('applist', 'sys.App/getAppList'); + /***************************************************** 清理缓存-刷新菜单 ****************************************************/ + Route::post('schema/clear', 'sys.System/schemaCache'); + })->middleware([ AdminCheckToken::class, AdminCheckRole::class, AdminLog::class -]); \ No newline at end of file +]); + +//系统环境（不效验登录状态） +Route::group('sys', function () { + Route::get('web/website', 'sys.Config/getWebsite'); +}); \ No newline at end of file diff --git a/niucloud/app/api/controller/member/Account.php b/niucloud/app/api/controller/member/Account.php index aea6a477a..8c7034f63 100644 --- a/niucloud/app/api/controller/member/Account.php +++ b/niucloud/app/api/controller/member/Account.php @@ -11,7 +11,8 @@ namespace app\api\controller\member; -use app\enum\member\MemberAccountEnum; +use app\dict\member\MemberAccountChangeTypeDict; +use app\dict\member\MemberAccountTypeDict; use app\service\api\member\MemberAccountService; use core\base\BaseApiController; use think\Response; @@ -31,7 +32,7 @@ class Account extends BaseApiController $data = $this->request->params([ ['from_type', ''] ]); - $data['account_type'] = MemberAccountEnum::POINT; + $data['account_type'] = MemberAccountTypeDict::POINT; return success((new MemberAccountService())->getPage($data)); } @@ -43,7 +44,7 @@ class Account extends BaseApiController $data = $this->request->params([ ['from_type', ''] ]); - $data['account_type'] = MemberAccountEnum::BALANCE; + $data['account_type'] = MemberAccountTypeDict::BALANCE; return success((new MemberAccountService())->getPage($data)); } @@ -55,7 +56,7 @@ class Account extends BaseApiController $data = $this->request->params([ ['from_type', ''] ]); - $data['account_type'] = MemberAccountEnum::MONEY; + $data['account_type'] = MemberAccountTypeDict::MONEY; return success((new MemberAccountService())->getPage($data)); } @@ -79,7 +80,7 @@ class Account extends BaseApiController $data = $this->request->params([ ['from_type', ''] ]); - $data['account_type'] = MemberAccountEnum::COMMISSION; + $data['account_type'] = MemberAccountTypeDict::COMMISSION; return success((new MemberAccountService())->getPage($data)); } @@ -90,7 +91,7 @@ class Account extends BaseApiController */ public function getFromType($account_type){ - return success(MemberAccountEnum::getFromType($account_type)); + return success(MemberAccountChangeTypeDict::getType($account_type)); } } diff --git a/niucloud/app/api/controller/member/MemberCashOut.php b/niucloud/app/api/controller/member/MemberCashOut.php index 5cd2dd872..805f05281 100644 --- a/niucloud/app/api/controller/member/MemberCashOut.php +++ b/niucloud/app/api/controller/member/MemberCashOut.php @@ -11,8 +11,8 @@ namespace app\api\controller\member; -use app\enum\member\MemberAccountEnum; -use app\enum\pay\TransferEnum; +use app\dict\member\MemberAccountTypeDict; +use app\dict\pay\TransferDict; use app\service\api\member\MemberCashOutService; use core\base\BaseApiController; use think\Response; @@ -59,7 +59,7 @@ class MemberCashOut extends BaseApiController */ public function getTransferType() { - return success(TransferEnum::getTransferType([], false)); + return success(TransferDict::getTransferType([], false)); } /** @@ -70,7 +70,7 @@ class MemberCashOut extends BaseApiController { $data = $this->request->params([ [ 'apply_money', 0 ], - [ 'account_type', MemberAccountEnum::MONEY ], + [ 'account_type', MemberAccountTypeDict::MONEY ], [ 'transfer_type', '' ], [ 'account_id', 0 ] ]); diff --git a/niucloud/app/api/controller/sys/Config.php b/niucloud/app/api/controller/sys/Config.php index 8f7ff49d7..8054d76e8 100644 --- a/niucloud/app/api/controller/sys/Config.php +++ b/niucloud/app/api/controller/sys/Config.php @@ -11,6 +11,7 @@ namespace app\api\controller\sys; +use app\service\api\site\SiteService; use app\service\api\sys\ConfigService; use core\base\BaseApiController; use think\Response; @@ -33,4 +34,11 @@ class Config extends BaseApiController return success((new ConfigService())->getSceneDomain()); } + /** + * 获取站点信息 + * @return Response + */ + public function site(){ + return success((new SiteService())->getSiteCache()); + } } diff --git a/niucloud/app/api/middleware/AllowCrossDomain.php b/niucloud/app/api/middleware/AllowCrossDomain.php index 9bae35909..449a07085 100644 --- a/niucloud/app/api/middleware/AllowCrossDomain.php +++ b/niucloud/app/api/middleware/AllowCrossDomain.php @@ -14,6 +14,7 @@ namespace app\api\middleware; use app\Request; use Closure; use core\exception\ApiException; +use core\exception\ServerException; /** * http跨域请求中间件 @@ -58,7 +59,7 @@ class AllowCrossDomain // header('Access-Control-Allow-Origin: ' . $origin); }else{ header('Access-Control-Allow-Origin: *'); - throw new ApiException('SERVER_CROSS_REQUEST_FAIL'); + throw new ServerException('SERVER_CROSS_REQUEST_FAIL', 409); } return $next($request); } diff --git a/niucloud/app/api/middleware/ApiCheckToken.php b/niucloud/app/api/middleware/ApiCheckToken.php index ff785fd2b..090839dbb 100644 --- a/niucloud/app/api/middleware/ApiCheckToken.php +++ b/niucloud/app/api/middleware/ApiCheckToken.php @@ -11,7 +11,7 @@ namespace app\api\middleware; -use app\enum\sys\AppTypeEnum; +use app\dict\sys\AppTypeDict; use app\Request; use app\service\api\login\AuthService; use app\service\api\login\LoginService; @@ -36,7 +36,9 @@ class ApiCheckToken */ public function handle(Request $request, Closure $next, bool $exception = false) { - $request->appType(AppTypeEnum::API); + $request->appType(AppTypeDict::API); + //检测站点 + ( new AuthService() )->checkSite($request); //通过配置来设置系统header参数 try { $token = $request->apiToken(); diff --git a/niucloud/app/api/route/dispatch/BindDispatch.php b/niucloud/app/api/route/dispatch/BindDispatch.php index 82fd6eee3..f8c31041a 100644 --- a/niucloud/app/api/route/dispatch/BindDispatch.php +++ b/niucloud/app/api/route/dispatch/BindDispatch.php @@ -2,7 +2,7 @@ namespace app\api\route\dispatch; -use app\enum\member\MemberLoginTypeEnum; +use app\dict\member\MemberLoginTypeDict; use think\App; use think\route\dispatch\Controller; @@ -24,11 +24,11 @@ class BindDispatch extends Controller } switch ($channel) { - case MemberLoginTypeEnum::WECHAT: + case MemberLoginTypeDict::WECHAT: $controller = 'wechat.Wechat'; $action = 'register'; break; - case MemberLoginTypeEnum::WEAPP: + case MemberLoginTypeDict::WEAPP: $controller = 'weapp.Weapp'; $action = 'register'; break; diff --git a/niucloud/app/api/route/route.php b/niucloud/app/api/route/route.php index 08f5e2ca1..378217eff 100644 --- a/niucloud/app/api/route/route.php +++ b/niucloud/app/api/route/route.php @@ -70,11 +70,12 @@ Route::group(function () { Route::get('wechat/jssdkconfig', 'wechat.Wechat/jssdkConfig'); /***************************************************** 版权相关设置**************************************************/ Route::get('copyright', 'sys.Config/getCopyright'); - + // 站点信息 + Route::get('site', 'sys.Config/site'); //场景域名 Route::get('scene_domain', 'sys.Config/getSceneDomain'); })->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class) ->middleware(ApiLog::class); //加载插件路由 -(new \core\addon\AddonLoader("Route"))->load(['app_type' => 'api']); \ No newline at end of file +(new \core\dict\DictLoader("Route"))->load(['app_type' => 'api']); \ No newline at end of file diff --git a/niucloud/app/command/Addon/Install.php b/niucloud/app/command/Addon/Install.php new file mode 100644 index 000000000..73767d2cc --- /dev/null +++ b/niucloud/app/command/Addon/Install.php @@ -0,0 +1,35 @@ +setName('addon:install') + ->addArgument('addon', Option::VALUE_REQUIRED) + ->addOption('step', 's', Option::VALUE_REQUIRED) + ->setDescription('the addon install command'); + } + + protected function execute(Input $input, Output $output) + { + $instance = CoreAddonInstallService::instance($input->getArgument('addon')); + $step = $input->getOption('step'); + + try { + $instance->$step(); + $output->writeln("Command executed successfully"); + } catch (\Exception $e) { + $output->writeln("Command failed " . $e->getMessage()); + } + } +} diff --git a/niucloud/app/command/Addon/Uninstall.php b/niucloud/app/command/Addon/Uninstall.php new file mode 100644 index 000000000..b8b8a053c --- /dev/null +++ b/niucloud/app/command/Addon/Uninstall.php @@ -0,0 +1,24 @@ +setName('addon') + ->setDescription('the addon uninstall command'); + } + + protected function execute(Input $input, Output $output) + { + // 指令输出 + $output->writeln('uninstall'); + } +} diff --git a/niucloud/app/command/Schedule.php b/niucloud/app/command/Schedule.php new file mode 100644 index 000000000..80d7e49bf --- /dev/null +++ b/niucloud/app/command/Schedule.php @@ -0,0 +1,94 @@ +setName('schedule:run'); + } + + protected function execute(Input $input, Output $output) + { + //写入计划任务最后一次执行事件,用于环境监测 + $file = root_path('runtime').'.schedule'; + file_put_contents($file, time()); + $schedules = (new CoreScheduleService())->getList(); + foreach($schedules as $v){ + $class = $v['class'] ?: 'app\\job\\schedule\\'.Str::studly($v['key']); + $function = $v['function'] ?: 'doJob'; + $call_back = [ + $class, + $function + ]; + + $event = $this->call($call_back); + switch($v['time']['type']){ + case 'min': + $event->everyMinute(); + break; + case 'hour': + $event->hourly(); + break; + case 'day': + $event->daily(); + break; + case 'week': + $event->weekly(); + break; + case 'month': + $event->monthly(); + break; + } + + } + + parent::execute($input, $output); + } + + /** + * 获取计划事件默认使用的时区 + */ + protected function scheduleTimezone(): DateTimeZone|string|null + { + return 'Asia/Shanghai'; + } + +// protected function getCrontab($data): string +// { +// $crontab = ''; +// switch ($data['type']) { +// case 'sec':// 每隔几秒 +// $crontab = '*/' . $data['sec'] . ' * * * * *'; +// break; +// case 'min':// 每隔几分 +// $crontab = '0 */' . $data['min'] . ' * * * *'; +// break; +// case 'hour':// 每隔几时第几分钟执行 +// $crontab = '0 ' . $data['min'] . ' * * * *'; +// break; +// case 'day':// 每日几时几分几秒 +// $crontab = $data['sec'] . ' ' . $data['min'] . ' ' . $data['hour'] . ' * * *'; +// break; +// case 'week':// 每周一次,周几具体时间执行 +// $crontab = $data['sec'] . ' ' . $data['min'] . ' ' . $data['hour'] . ' * * ' . $data['week']; +// break; +// case 'month':// 每月一次,某日具体时间执行 +// $crontab = $data['sec'] . ' ' . $data['min'] . ' ' . $data['hour'] . ' ' . $data['day'] . ' * *'; +// break; +// } +// return $crontab; +// } + +} \ No newline at end of file diff --git a/niucloud/app/common.php b/niucloud/app/common.php index 33543a618..9382f7ddf 100644 --- a/niucloud/app/common.php +++ b/niucloud/app/common.php @@ -1,5 +1,6 @@ read()) { if ($file != '.' && $file != '..') { - search_dir($path . '/' . $file, $data, $search); + search_dir($path . $file, $data, $search); } } $fp->close(); @@ -652,4 +673,36 @@ function getFileMap($path, $arr = []) } return $arr; } +} + +/** + * 如果不存在则写入缓存 + * @param string|null $name + * @param $value + * @param $options + * @param $tag + * @return mixed|string + */ +function cache_remember(string $name = null, $value = '', $tag = null, $options = null){ + if(!empty($hit = Cache::get($name)))//可以用has + return $hit; + if ($value instanceof Closure) { + // 获取缓存数据 + $value = Container::getInstance()->invokeFunction($value); + } + if (is_null($tag)) { + Cache::set($name, $value, $options['expire'] ?? null); + } else { + Cache::tag($tag)->set($name, $value, $options['expire'] ?? null); + } + return $value; + +} + +/** + * 项目目录 + * @return void + */ +function project_path() { + return dirname(root_path()) . DIRECTORY_SEPARATOR; } \ No newline at end of file diff --git a/niucloud/app/enum/addon/AddonEnum.php b/niucloud/app/dict/addon/AddonDict.php similarity index 65% rename from niucloud/app/enum/addon/AddonEnum.php rename to niucloud/app/dict/addon/AddonDict.php index b16a9f8eb..cfed0d706 100644 --- a/niucloud/app/enum/addon/AddonEnum.php +++ b/niucloud/app/dict/addon/AddonDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\addon; +namespace app\dict\addon; -class AddonEnum +class AddonDict { /************************************************* 证书 *****************************************/ @@ -25,6 +25,14 @@ class AddonEnum const ON = 1; const OFF = 2; + // 未执行 + const INSTALL_UNEXECUTED = 'unexecuted'; + // 执行中 + const INPROGRESS = 'inprogress'; + // 执行成功 + const INSTALL_SUCCESS = 'success'; + // 执行失败 + CONST INSTALL_FAIL = 'fail'; /** * 插件操作方式 @@ -32,9 +40,9 @@ class AddonEnum */ public static function getActionType(){ return [ - self::INSTALL => get_lang('enum_addon.install'), - self::UNINSTALL => get_lang('enum_addon.uninstall'), - self::UPDATE => get_lang('enum_addon.update'), + self::INSTALL => get_lang('dict_addon.install'), + self::UNINSTALL => get_lang('dict_addon.uninstall'), + self::UPDATE => get_lang('dict_addon.update'), ]; } @@ -44,8 +52,8 @@ class AddonEnum */ public static function getStatus(){ return [ - self::ON => get_lang('enum_addon.status_on'),//展示 - self::OFF => get_lang('enum_addon.status_off'),//隐藏 + self::ON => get_lang('dict_addon.status_on'),//展示 + self::OFF => get_lang('dict_addon.status_off'),//隐藏 ]; } } \ No newline at end of file diff --git a/niucloud/app/enum/cash_out/CashOutTypeEnum.php b/niucloud/app/dict/cash_out/CashOutTypeDict.php similarity index 93% rename from niucloud/app/enum/cash_out/CashOutTypeEnum.php rename to niucloud/app/dict/cash_out/CashOutTypeDict.php index c1846d5db..8ed6275a4 100644 --- a/niucloud/app/enum/cash_out/CashOutTypeEnum.php +++ b/niucloud/app/dict/cash_out/CashOutTypeDict.php @@ -9,13 +9,13 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\cash_out; +namespace app\dict\cash_out; /** * 提现类型 */ -class CashOutTypeEnum +class CashOutTypeDict { //会员零钱提现 const MEMBER_CASH_OUT = 'member_cash_out'; diff --git a/niucloud/app/enum/channel/CertEnum.php b/niucloud/app/dict/channel/CertDict.php similarity index 96% rename from niucloud/app/enum/channel/CertEnum.php rename to niucloud/app/dict/channel/CertDict.php index 0b8a17809..bca7a6553 100644 --- a/niucloud/app/enum/channel/CertEnum.php +++ b/niucloud/app/dict/channel/CertDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\channel; +namespace app\dict\channel; -class CertEnum +class CertDict { /************************************************* 证书 *****************************************/ diff --git a/niucloud/app/enum/channel/ReplyEnum.php b/niucloud/app/dict/channel/ReplyDict.php similarity index 88% rename from niucloud/app/enum/channel/ReplyEnum.php rename to niucloud/app/dict/channel/ReplyDict.php index 1faa162c6..8defb9dd8 100644 --- a/niucloud/app/enum/channel/ReplyEnum.php +++ b/niucloud/app/dict/channel/ReplyDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\channel; +namespace app\dict\channel; -class ReplyEnum +class ReplyDict { /************************************************* 请求消息的属性 *****************************************/ @@ -35,8 +35,8 @@ class ReplyEnum public static function getStatus(){ return [ - self::STATUS_ON => get_lang('enum_wechat_reply.status_on'),//启用 - self::STATUS_OFF => get_lang('enum_wechat_reply.status_off'),//关闭 + self::STATUS_ON => get_lang('dict_wechat_reply.status_on'),//启用 + self::STATUS_OFF => get_lang('dict_wechat_reply.status_off'),//关闭 ]; } } \ No newline at end of file diff --git a/niucloud/app/enum/channel/WechatEnum.php b/niucloud/app/dict/channel/WechatDict.php similarity index 90% rename from niucloud/app/enum/channel/WechatEnum.php rename to niucloud/app/dict/channel/WechatDict.php index 2d9efa7b3..4a04c4f98 100644 --- a/niucloud/app/enum/channel/WechatEnum.php +++ b/niucloud/app/dict/channel/WechatDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\channel; +namespace app\dict\channel; -class WechatEnum +class WechatDict { /************************************************* 请求消息的属性 *****************************************/ @@ -54,9 +54,9 @@ class WechatEnum */ public static function getEncryptionType(){ return [ - self::NOT_ENCRYPT => get_lang('enum_wechat_config.not_encrypt'),//明文 - self::COMPATIBLE => get_lang('enum_wechat_config.compatible'),//兼容 - self::SAFE => get_lang('enum_wechat_config.safe'),//安全 + self::NOT_ENCRYPT => get_lang('dict_wechat_config.not_encrypt'),//明文 + self::COMPATIBLE => get_lang('dict_wechat_config.compatible'),//兼容 + self::SAFE => get_lang('dict_wechat_config.safe'),//安全 ]; } diff --git a/niucloud/app/enum/common/ChannelEnum.php b/niucloud/app/dict/common/ChannelDict.php similarity index 72% rename from niucloud/app/enum/common/ChannelEnum.php rename to niucloud/app/dict/common/ChannelDict.php index 4e5bba7ee..8b2c0fc74 100644 --- a/niucloud/app/enum/common/ChannelEnum.php +++ b/niucloud/app/dict/common/ChannelDict.php @@ -9,17 +9,17 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\common; +namespace app\dict\common; -use app\enum\pay\PayEnum; +use app\dict\pay\PayDict; use core\exception\PayException; /** * 渠道枚举类 - * Class ChannelEnum - * @package app\enum\member + * Class ChannelDict + * @package app\dict\common */ -class ChannelEnum +class ChannelDict { //微信小程序 const WEAPP = 'weapp'; @@ -35,11 +35,11 @@ class ChannelEnum public static function getType($type = ''){ $data = [ - self::WEAPP => get_lang('enum_channel.channel_weapp'),//微信小程序 - self::WECHAT => get_lang('enum_channel.channel_wechat'),//'微信公众号', - self::H5 => get_lang('enum_channel.channel_h5'),//'手机H5', - self::PC => get_lang('enum_channel.channel_pc'),//'电脑PC', - self::APP => get_lang('enum_channel.channel_app'),//'手机app', + self::WEAPP => get_lang('dict_channel.channel_weapp'),//微信小程序 + self::WECHAT => get_lang('dict_channel.channel_wechat'),//'微信公众号', + self::H5 => get_lang('dict_channel.channel_h5'),//'手机H5', + self::PC => get_lang('dict_channel.channel_pc'),//'电脑PC', + self::APP => get_lang('dict_channel.channel_app'),//'手机app', ]; if(empty($type)){ return $data; diff --git a/niucloud/app/dict/common/CommonDict.php b/niucloud/app/dict/common/CommonDict.php new file mode 100644 index 000000000..eda77f614 --- /dev/null +++ b/niucloud/app/dict/common/CommonDict.php @@ -0,0 +1,28 @@ + get_lang('dict_sex.unknown'),//未知 + self::MAN => get_lang('dict_sex.man'),//男 + self::WOMAN => get_lang('dict_sex.woman'),//女 + ]; + } +} \ No newline at end of file diff --git a/niucloud/app/enum/diy/ComponentEnum.php b/niucloud/app/dict/diy/ComponentDict.php similarity index 91% rename from niucloud/app/enum/diy/ComponentEnum.php rename to niucloud/app/dict/diy/ComponentDict.php index 43c756081..4cd3d0235 100644 --- a/niucloud/app/enum/diy/ComponentEnum.php +++ b/niucloud/app/dict/diy/ComponentDict.php @@ -9,34 +9,34 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\diy; +namespace app\dict\diy; -use core\addon\AddonLoader; +use core\dict\DictLoader; /** * 基础组件 - * Class Page - * @package app\enum\sys + * Class ComponentDict + * @package app\dict\diy */ -class ComponentEnum +class ComponentDict { /** - * 获取页面类型 - * @return array + * 获取组件 + * @return array|null */ public static function getComponent() { $system_components = [ - 'BASICS' => [ - 'title' => get_lang('enum_diy.component_type_basics'), + 'BASIC' => [ + 'title' => get_lang('dict_diy.component_type_basic'), 'list' => [ 'Text' => [ 'title' => '标题', 'icon' => 'iconfont-iconbiaoti', - 'path' => 'edit-text', // 编辑组件属性 + 'path' => 'edit-text', // 编辑组件属性名称 'support_page' => [], // 支持页面 - 'max_count' => 0, // 最大添加数量 + 'uses' => 0, // 最大添加数量 'sort' => 10001, 'value' => [ "style" => "style-1", @@ -72,7 +72,7 @@ class ComponentEnum 'icon' => 'iconfont-icontupianguanggao1', 'path' => 'edit-image-ads', // 编辑组件属性 'support_page' => [], // 支持页面 - 'max_count' => 0, // 最大添加数量 + 'uses' => 0, // 最大添加数量 'sort' => 10002, 'value' => [ "list" => [ @@ -92,7 +92,7 @@ class ComponentEnum 'icon' => 'iconfont-icontuwendaohang2', 'path' => 'edit-graphic-nav', 'support_page' => [], - 'max_count' => 0, + 'uses' => 0, 'sort' => 10003, 'value' => [ "layout" => "horizontal", @@ -178,7 +178,7 @@ class ComponentEnum 'icon' => 'iconfont-iconwenzhang', 'path' => 'edit-article', 'support_page' => [], - 'max_count' => 0, + 'uses' => 0, 'sort' => 10004, 'value' => [ 'sources' => 'initial', @@ -191,7 +191,7 @@ class ComponentEnum 'icon' => 'iconfont-iconfuzhukongbai1', 'path' => 'edit-horz-blank', 'support_page' => [], - 'max_count' => 0, + 'uses' => 0, 'sort' => 10005, 'value' => [ 'height' => 20 @@ -202,16 +202,20 @@ class ComponentEnum 'icon' => 'iconfont-iconhuiyuanzhongxin', 'path' => 'edit-member-info', 'support_page' => [ 'DIY_MEMBER_INDEX' ], - 'max_count' => 0, + 'uses' => 1, 'sort' => 10006, 'value' => [ - 'height' => 20 + "style" => "style-1", + "styleName" => "风格1", + 'bgUrl' => '', + 'bgColorStart' => '', + 'bgColorEnd' => '' ], ], ], ], ]; - return (new AddonLoader("UniappComponent"))->load($system_components); + return ( new DictLoader("UniappComponent") )->load($system_components); } } \ No newline at end of file diff --git a/niucloud/app/enum/diy/LinkEnum.php b/niucloud/app/dict/diy/LinkDict.php similarity index 66% rename from niucloud/app/enum/diy/LinkEnum.php rename to niucloud/app/dict/diy/LinkDict.php index dca6371a6..f8a82d21c 100644 --- a/niucloud/app/enum/diy/LinkEnum.php +++ b/niucloud/app/dict/diy/LinkDict.php @@ -9,93 +9,86 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\diy; +namespace app\dict\diy; -use core\addon\AddonLoader; +use core\dict\DictLoader; /** * 自定义链接 - * Class PageEnum - * @package app\enum\sys + * Class LinkDict + * @package app\dict\diy */ -class LinkEnum +class LinkDict { /** - * 获取页面类型 + * 获取链接 * @return array */ public static function getLink() { $system_links = [ - [ - 'name' => 'SYSTEM_LINK', - 'title' => get_lang('enum_diy.system_link'), - 'url' => '', + 'SYSTEM_LINK' => [ + 'title' => get_lang('dict_diy.system_link'), 'child_list' => [ [ 'name' => 'INDEX', - 'title' => get_lang('enum_diy.system_link_index'), + 'title' => get_lang('dict_diy.system_link_index'), 'url' => '/pages/index/index', 'is_share' => 1 ], [ 'name' => 'ARTICLE_LIST', - 'title' => get_lang('enum_diy.system_link_article_list'), + 'title' => get_lang('dict_diy.system_link_article_list'), 'url' => '/pages/article/list', 'is_share' => 1 ], ] ], - [ - 'name' => 'MEMBER_LINK', - 'title' => get_lang('enum_diy.member_link'), + 'MEMBER_LINK' => [ + 'title' => get_lang('dict_diy.member_link'), 'child_list' => [ [ 'name' => 'MEMBER_CENTER', - 'title' => get_lang('enum_diy.member_index'), + 'title' => get_lang('dict_diy.member_index'), 'url' => '/pages/member/index', 'is_share' => 0 ], [ 'name' => 'MEMBER_PERSONAL', - 'title' => get_lang('enum_diy.member_my_personal'), + 'title' => get_lang('dict_diy.member_my_personal'), 'url' => '/pages/member/personal', 'is_share' => 0 ], [ 'name' => 'MEMBER_BALANCE', - 'title' => get_lang('enum_diy.member_my_balance'), + 'title' => get_lang('dict_diy.member_my_balance'), 'url' => '/pages/member/balance', 'is_share' => 0 ], [ 'name' => 'MEMBER_POINT', - 'title' => get_lang('enum_diy.member_my_point'), + 'title' => get_lang('dict_diy.member_my_point'), 'url' => '/pages/member/point', 'is_share' => 0 ], [ 'name' => 'MEMBER_COMMISSION', - 'title' => get_lang('enum_diy.member_my_commission'), + 'title' => get_lang('dict_diy.member_my_commission'), 'url' => '/pages/member/commission', 'is_share' => 0 ] ] ], - [ - 'name' => 'DIY_PAGE', - 'title' => get_lang('enum_diy.diy_page'), - 'url' => '', + 'DIY_PAGE' => [ + 'title' => get_lang('dict_diy.diy_page'), 'child_list' => [] ], - [ - 'name' => 'DIY_LINK', - 'title' => get_lang('enum_diy.diy_link'), - 'url' => '', + 'DIY_LINK' => [ + 'title' => get_lang('dict_diy.diy_link'), 'child_list' => [] ] ]; - return (new AddonLoader("UniappLink"))->load($system_links);; + return ( new DictLoader("UniappLink") )->load($system_links); } } \ No newline at end of file diff --git a/niucloud/app/dict/diy/PagesDict.php b/niucloud/app/dict/diy/PagesDict.php new file mode 100644 index 000000000..f657c45fa --- /dev/null +++ b/niucloud/app/dict/diy/PagesDict.php @@ -0,0 +1,898 @@ + [ + 'default_index' => [ // 页面标识 + "title" => "首页", // 页面名称 + 'cover' => '', // 页面封面图 + 'preview' => '', // 页面预览图 + 'desc' => '', // 页面描述 + // 页面数据源 + "data" => [ + "global" => [ + "title" => "首页", + "pageBgColor" => "#F8F8F8", + 'bgUrl' => '', + 'imgWidth' => '', + 'imgHeight' => '', + "bottomTabBarSwitch" => true, + "template" => [ + 'textColor' => "#303133", + "pageBgColor" => "", + "componentBgColor" => "", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ] + ], + 'topStatusBar' => [ + 'bgColor' => "#ffffff", + 'isTransparent' => false, + 'isShow' => true, + 'style' => 'style-1', + 'textColor' => "#333333", + 'textAlign' => 'center', + ], + 'popWindow' => [ + 'imgUrl' => "", + 'imgWidth' => '', + 'imgHeight' => '', + 'count' => -1, + 'show' => 0, + 'link' => [ + 'name' => "" + ], + ] + ], + "value" => [ + [ + "path" => "edit-image-ads", + "id" => "4640ld4k1pu0", + "componentName" => "ImageAds", + "componentTitle" => "图片广告", + "uses" => 0, + "list" => [ + [ + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/banner.png", + "imgWidth" => 750, + "imgHeight" => 320, + "id" => "2xuytp7622w0" + ] + ], + "ignore" => [], + "pageBgColor" => "", + "componentBgColor" => "", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ] + ], + [ + "path" => "edit-graphic-nav", + "id" => "282cpxba4534", + "componentName" => "GraphicNav", + "componentTitle" => "图文导航", + "uses" => 0, + "layout" => "horizontal", + "navTitle" => "", + "mode" => "graphic", + "showStyle" => "fixed", + "rowCount" => 4, + "pageCount" => 2, + "carousel" => [ + "type" => "circle", + "color" => "#FFFFFF" + ], + "imageSize" => 40, + "aroundRadius" => 25, + "font" => [ + "size" => 14, + "weight" => "normal", + "color" => "#303133" + ], + "ignore" => [], + "pageBgColor" => "", + "componentBgColor" => "rgba(255, 255, 255, 1)", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ], + "list" => [ + [ + "title" => "文章资讯", + "link" => [ + "parent" => "SYSTEM_LINK", + "name" => "ARTICLE_LIST", + "title" => "文章资讯", + "url" => "/pages/article/list" + ], + "imageUrl" => "static/resource/images/diy/article_list.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "66rwqy8vxog0", + "imgWidth" => 176, + "imgHeight" => 176 + ], + [ + "title" => "个人资料", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_PERSONAL", + "title" => "个人资料", + "url" => "/pages/member/personal" + ], + "imageUrl" => "static/resource/images/diy/my_personal.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "30cdezm3f6e0", + "imgWidth" => 176, + "imgHeight" => 176 + ], + [ + "title" => "我的余额", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_BALANCE", + "title" => "我的余额", + "url" => "/pages/member/balance" + ], + "imageUrl" => "static/resource/images/diy/my_balance.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "20l5hypbzvfk", + "imgWidth" => 176, + "imgHeight" => 176 + ], + [ + "title" => "我的积分", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_POINT", + "title" => "我的积分", + "url" => "/pages/member/point" + ], + "imageUrl" => "static/resource/images/diy/my_point.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "7bdb8wyt3g00", + "imgWidth" => 176, + "imgHeight" => 176 + ] + ] + ], + [ + "path" => "edit-article", + "id" => "524jcssmp8c0", + "componentName" => "Article", + "componentTitle" => "文章", + "uses" => 0, + "sources" => "initial", + "count" => 8, + "articleIds" => [], + "ignore" => [], + "pageBgColor" => "", + "componentBgColor" => "rgba(255, 255, 255, 1)", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ] + ] + ] + ] + ] + ], + 'DIY_MEMBER_INDEX' => [ + 'default_member_index_one' => [ + "title" => "个人中心（风格一）", // 页面名称 + 'cover' => '', // 页面封面图 + 'preview' => '', // 页面预览图 + 'desc' => '', // 页面描述 + // 页面数据源 + "data" => [ + "global" => [ + "title" => "个人中心（风格一）", + "pageBgColor" => "#F8F8F8", + 'bgUrl' => '', + 'imgWidth' => '', + 'imgHeight' => '', + "bottomTabBarSwitch" => true, + "template" => [ + 'textColor' => "#303133", + "pageBgColor" => "", + "componentBgColor" => "", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 12 + ] + ], + 'topStatusBar' => [ + 'bgColor' => "#ffffff", + 'isTransparent' => false, + 'isShow' => true, + 'style' => 'style-1', + 'textColor' => "#333333", + 'textAlign' => 'center', + ], + 'popWindow' => [ + 'imgUrl' => "", + 'imgWidth' => '', + 'imgHeight' => '', + 'count' => -1, + 'show' => 0, + 'link' => [ + 'name' => "" + ], + ] + ], + "value" => [ + [ + "path" => "edit-member-info", + "id" => "67qv49qgxp00", + "componentName" => "MemberInfo", + "componentTitle" => "会员信息", + "uses" => 0, + "ignore" => [], + "pageBgColor" => "", + "componentBgColor" => "", + "topRounded" => 9, + "bottomRounded" => 9, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 12, + "bottom" => 6, + "both" => 16 + ], + "textColor" => "#FFFFFF", + "bgUrl" => "static/resource/images/diy/member_style1_bg.png" + ], + [ + "path" => "edit-graphic-nav", + "id" => "62b7d7hl4ok", + "componentName" => "GraphicNav", + "componentTitle" => "图文导航", + "uses" => 0, + "layout" => "horizontal", + "navTitle" => "我的服务", + "mode" => "graphic", + "showStyle" => "fixed", + "rowCount" => 4, + "pageCount" => 2, + "carousel" => [ + "type" => "circle", + "color" => "#FFFFFF" + ], + "imageSize" => 25, + "aroundRadius" => 25, + "font" => [ + "size" => 12, + "weight" => "bold", + "color" => "#303133" + ], + "pageBgColor" => "", + "componentBgColor" => "rgba(255, 255, 255, 1)", + "topRounded" => 9, + "bottomRounded" => 9, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 6, + "bottom" => 6, + "both" => 16 + ], + "ignore" => [], + "list" => [ + [ + "title" => "个人资料", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_PERSONAL", + "title" => "个人资料", + "url" => "/pages/member/personal" + ], + "imageUrl" => "static/resource/images/diy/horz_m_personal.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "xvlauaflc6o", + "imgWidth" => 100, + "imgHeight" => 100 + ], + [ + "title" => "我的余额", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_BALANCE", + "title" => "我的余额", + "url" => "/pages/member/balance" + ], + "imageUrl" => "static/resource/images/diy/horz_m_balance.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "63bjscck5n40", + "imgWidth" => 100, + "imgHeight" => 100 + ], + [ + "title" => "我的积分", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_POINT", + "title" => "我的积分", + "url" => "/pages/member/point" + ], + "imageUrl" => "static/resource/images/diy/horz_m_point.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "4qiczw54t8g0", + "imgWidth" => 100, + "imgHeight" => 100 + ], + [ + "title" => "联系客服", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/horz_m_service.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "2eqwfkdphpgk", + "imgWidth" => 100, + "imgHeight" => 100 + ] + ] + ], + [ + "path" => "edit-graphic-nav", + "uses" => 0, + "id" => "33yn28534fs0", + "componentName" => "GraphicNav", + "componentTitle" => "图文导航", + "ignore" => [], + "layout" => "vertical", + "navTitle" => "", + "mode" => "graphic", + "showStyle" => "fixed", + "rowCount" => 4, + "pageCount" => 2, + "carousel" => [ + "type" => "circle", + "color" => "#FFFFFF" + ], + "imageSize" => 25, + "aroundRadius" => 25, + "font" => [ + "size" => 13, + "weight" => "normal", + "color" => "rgba(0, 0, 0, 1)" + ], + "list" => [ + [ + "title" => "个人资料", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/vert_m_personal.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "4xc4kw9xlqu0", + "imgWidth" => 88, + "imgHeight" => 88 + ], + [ + "title" => "我的余额", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/vert_m_balance.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "4555rq0cc1q0", + "imgWidth" => 88, + "imgHeight" => 88 + ], + [ + "title" => "我的积分", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/vert_m_point.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "1gq3uxox0fk0", + "imgWidth" => 88, + "imgHeight" => 88 + ], + [ + "title" => "联系客服", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/vert_m_service.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "6gqbh1tvyr00", + "imgWidth" => 88, + "imgHeight" => 88 + ], + [ + "id" => "6xhwid2el5c0", + "title" => "开发者联盟", + "imageUrl" => "static/resource/images/diy/vert_m_develop.png", + "imgWidth" => 88, + "imgHeight" => 88, + "link" => [ + "name" => "" + ], + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ] + ] + ], + "pageBgColor" => "", + "componentBgColor" => "rgba(255, 255, 255, 1)", + "topRounded" => 9, + "bottomRounded" => 9, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 6, + "bottom" => 12, + "both" => 16 + ] + ] + ] + ] + ], + 'default_member_index_two' => [ + "title" => "个人中心（风格二）", // 页面名称 + 'cover' => '', // 页面封面图 + 'preview' => '', // 页面预览图 + 'desc' => '', // 页面描述 + // 页面数据源 + "data" => [ + "global" => [ + "title" => "个人中心（风格二）", + "pageBgColor" => "#F8F8F8", + "bgUrl" => "static/resource/images/diy/member_style2_bg.png", + 'imgWidth' => 750, + 'imgHeight' => 403, + "bottomTabBarSwitch" => true, + "template" => [ + 'textColor' => "#303133", + "pageBgColor" => "", + "componentBgColor" => "", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 12 + ] + ], + 'topStatusBar' => [ + 'bgColor' => "#ffffff", + 'isTransparent' => false, + 'isShow' => true, + 'style' => 'style-1', + 'textColor' => "#333333", + 'textAlign' => 'center', + ], + 'popWindow' => [ + 'imgUrl' => "", + 'imgWidth' => '', + 'imgHeight' => '', + 'count' => -1, + 'show' => 0, + 'link' => [ + 'name' => "" + ], + ] + ], + "value" => [ + [ + "path" => "edit-member-info", + "id" => "67qv49qgxp00", + "componentName" => "MemberInfo", + "componentTitle" => "会员信息", + "uses" => 0, + "ignore" => [], + "pageBgColor" => "", + "componentBgColor" => "", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ], + "textColor" => "#FFFFFF", + "bgUrl" => "" + ], + [ + "path" => "edit-graphic-nav", + "id" => "62b7d7hl4ok", + "componentName" => "GraphicNav", + "componentTitle" => "图文导航", + "uses" => 0, + "layout" => "horizontal", + "navTitle" => "我的服务", + "mode" => "graphic", + "showStyle" => "fixed", + "rowCount" => 4, + "pageCount" => 2, + "carousel" => [ + "type" => "circle", + "color" => "#FFFFFF" + ], + "imageSize" => 25, + "aroundRadius" => 25, + "font" => [ + "size" => 12, + "weight" => "bold", + "color" => "#303133" + ], + "pageBgColor" => "", + "componentBgColor" => "rgba(255, 255, 255, 1)", + "topRounded" => 9, + "bottomRounded" => 9, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 6, + "both" => 16 + ], + "ignore" => [], + "list" => [ + [ + "title" => "个人资料", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_PERSONAL", + "title" => "个人资料", + "url" => "/pages/member/personal" + ], + "imageUrl" => "static/resource/images/diy/horz_m_personal.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "xvlauaflc6o", + "imgWidth" => 100, + "imgHeight" => 100 + ], + [ + "title" => "我的余额", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_BALANCE", + "title" => "我的余额", + "url" => "/pages/member/balance" + ], + "imageUrl" => "static/resource/images/diy/horz_m_balance.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "63bjscck5n40", + "imgWidth" => 100, + "imgHeight" => 100 + ], + [ + "title" => "我的积分", + "link" => [ + "parent" => "MEMBER_LINK", + "name" => "MEMBER_POINT", + "title" => "我的积分", + "url" => "/pages/member/point" + ], + "imageUrl" => "static/resource/images/diy/horz_m_point.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "4qiczw54t8g0", + "imgWidth" => 100, + "imgHeight" => 100 + ], + [ + "title" => "联系客服", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/horz_m_service.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "2eqwfkdphpgk", + "imgWidth" => 100, + "imgHeight" => 100 + ] + ] + ], + [ + "path" => "edit-graphic-nav", + "uses" => 0, + "id" => "33yn28534fs0", + "componentName" => "GraphicNav", + "componentTitle" => "图文导航", + "ignore" => [], + "layout" => "vertical", + "navTitle" => "", + "mode" => "graphic", + "showStyle" => "fixed", + "rowCount" => 4, + "pageCount" => 2, + "carousel" => [ + "type" => "circle", + "color" => "#FFFFFF" + ], + "imageSize" => 25, + "aroundRadius" => 25, + "font" => [ + "size" => 13, + "weight" => "normal", + "color" => "rgba(0, 0, 0, 1)" + ], + "list" => [ + [ + "title" => "个人资料", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/vert_m_personal.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "4xc4kw9xlqu0", + "imgWidth" => 88, + "imgHeight" => 88 + ], + [ + "title" => "我的余额", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/vert_m_balance.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "4555rq0cc1q0", + "imgWidth" => 88, + "imgHeight" => 88 + ], + [ + "title" => "我的积分", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/vert_m_point.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "1gq3uxox0fk0", + "imgWidth" => 88, + "imgHeight" => 88 + ], + [ + "title" => "联系客服", + "link" => [ + "name" => "" + ], + "imageUrl" => "static/resource/images/diy/vert_m_service.png", + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ], + "id" => "6gqbh1tvyr00", + "imgWidth" => 88, + "imgHeight" => 88 + ], + [ + "id" => "777g7jxbtfc0", + "title" => "开发者联盟", + "imageUrl" => "static/resource/images/diy/vert_m_develop.png", + "imgWidth" => 96, + "imgHeight" => 96, + "link" => [ + "name" => "" + ], + "label" => [ + "control" => false, + "text" => "热门", + "textColor" => "#FFFFFF", + "bgColorStart" => "#F83287", + "bgColorEnd" => "#FE3423" + ] + ] + ], + "pageBgColor" => "", + "componentBgColor" => "rgba(255, 255, 255, 1)", + "topRounded" => 9, + "bottomRounded" => 9, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 6, + "bottom" => 12, + "both" => 16 + ] + ] + + ] + ] + ] + ] + ]; + $pages = ( new DictLoader("UniappPages") )->load($system_pages); + if (empty($type)) { + return $pages; + } + return $pages[ $type ] ?? ''; + } + +} \ No newline at end of file diff --git a/niucloud/app/enum/diy/PageEnum.php b/niucloud/app/dict/diy/TemplateDict.php similarity index 70% rename from niucloud/app/enum/diy/PageEnum.php rename to niucloud/app/dict/diy/TemplateDict.php index 43702bc59..573533422 100644 --- a/niucloud/app/enum/diy/PageEnum.php +++ b/niucloud/app/dict/diy/TemplateDict.php @@ -9,40 +9,40 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\diy; +namespace app\dict\diy; -use core\addon\AddonLoader; +use core\dict\DictLoader; /** - * 自定义页面类型 - * Class PageEnum - * @package app\enum\sys + * 页面模板 + * Class TemplateDict + * @package app\dict\diy */ -class PageEnum +class TemplateDict { /** - * 获取页面类型 + * 获取页面模板 * @param string $type * @return array|string */ - public static function getPageType($type = '') + public static function getTemplate($type = '') { $system_pages = [ 'DIY_INDEX' => [ - 'title' => get_lang('enum_diy.page_index'), + 'title' => get_lang('dict_diy.page_index'), 'page' => 'pages/index/index', ], 'DIY_MEMBER_INDEX' => [ - 'title' => get_lang('enum_diy.page_member_index'), + 'title' => get_lang('dict_diy.page_member_index'), 'page' => 'pages/member/index', ], 'DIY_PAGE' => [ - 'title' => get_lang('enum_diy.page_diy'), + 'title' => get_lang('dict_diy.page_diy'), 'page' => 'pages/index/diy', ] ]; - $pages = (new AddonLoader("UniappPages"))->load($system_pages); + $pages = (new DictLoader("UniappTemplate"))->load($system_pages); if (empty($type)) { return $pages; } diff --git a/niucloud/app/dict/member/MemberAccountChangeTypeDict.php b/niucloud/app/dict/member/MemberAccountChangeTypeDict.php new file mode 100644 index 000000000..f0a56c609 --- /dev/null +++ b/niucloud/app/dict/member/MemberAccountChangeTypeDict.php @@ -0,0 +1,38 @@ +load(); + if (empty($type)) { + return $account_change_type; + } + return $account_change_type[ $type ] ?? ''; + } + +} \ No newline at end of file diff --git a/niucloud/app/dict/member/MemberAccountTypeDict.php b/niucloud/app/dict/member/MemberAccountTypeDict.php new file mode 100644 index 000000000..b0c32c2e3 --- /dev/null +++ b/niucloud/app/dict/member/MemberAccountTypeDict.php @@ -0,0 +1,48 @@ + get_lang('dict_member.account_point'), + self::BALANCE => get_lang('dict_member.account_balance'), + self::MONEY => get_lang('dict_member.account_money'), + self::COMMISSION => get_lang('dict_member.account_commission'), + ]; + if (empty($type)) { + return $data; + } + return $data[ $type ] ?? ''; + } + +} \ No newline at end of file diff --git a/niucloud/app/enum/member/MemberCashOutEnum.php b/niucloud/app/dict/member/MemberCashOutDict.php similarity index 71% rename from niucloud/app/enum/member/MemberCashOutEnum.php rename to niucloud/app/dict/member/MemberCashOutDict.php index 1274cd179..857b0f361 100644 --- a/niucloud/app/enum/member/MemberCashOutEnum.php +++ b/niucloud/app/dict/member/MemberCashOutDict.php @@ -9,14 +9,14 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\member; +namespace app\dict\member; /** * 会员提现 - * Class MemberAccountEnum - * @package app\enum\member + * Class MemberCashOutDict + * @package app\dict\member */ -class MemberCashOutEnum +class MemberCashOutDict { const WAIT_AUDIT = 1;//待审核 const WAIT_TRANSFER = 2;//待转账 @@ -30,11 +30,11 @@ class MemberCashOutEnum */ public static function getStatus(){ return [ - self::WAIT_AUDIT => get_lang('enum_member_cash_out.status_wait_audit'),//待审核 - self::WAIT_TRANSFER => get_lang('enum_member_cash_out.status_wait_transfer'),//待转账 - self::TRANSFERED => get_lang('enum_member_cash_out.status_transfered'),//已转账 - self::REFUSE => get_lang('enum_member_cash_out.status_refuse'),//已拒绝 - self::CANCEL => get_lang('enum_member_cash_out.status_cancel'),//已取消 + self::WAIT_AUDIT => get_lang('dict_member_cash_out.status_wait_audit'),//待审核 + self::WAIT_TRANSFER => get_lang('dict_member_cash_out.status_wait_transfer'),//待转账 + self::TRANSFERED => get_lang('dict_member_cash_out.status_transfered'),//已转账 + self::REFUSE => get_lang('dict_member_cash_out.status_refuse'),//已拒绝 + self::CANCEL => get_lang('dict_member_cash_out.status_cancel'),//已取消 ]; } diff --git a/niucloud/app/enum/member/MemberEnum.php b/niucloud/app/dict/member/MemberDict.php similarity index 76% rename from niucloud/app/enum/member/MemberEnum.php rename to niucloud/app/dict/member/MemberDict.php index a658cdbdb..45d9a5372 100644 --- a/niucloud/app/enum/member/MemberEnum.php +++ b/niucloud/app/dict/member/MemberDict.php @@ -9,15 +9,15 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\member; +namespace app\dict\member; -use app\enum\common\ChannelEnum; +use app\dict\common\ChannelDict; /** * 会员信息枚举类 - * Class MemberEnum + * Class MemberDict */ -class MemberEnum extends ChannelEnum +class MemberDict extends ChannelDict { const ON = 1; @@ -29,8 +29,8 @@ class MemberEnum extends ChannelEnum */ public static function getStatus(){ return [ - self::ON => get_lang('enum_member.status_on'),//正常 - self::OFF => get_lang('enum_member.status_off'),//无效 + self::ON => get_lang('dict_member.status_on'),//正常 + self::OFF => get_lang('dict_member.status_off'),//无效 ]; } } \ No newline at end of file diff --git a/niucloud/app/enum/member/MemberLoginTypeEnum.php b/niucloud/app/dict/member/MemberLoginTypeDict.php similarity index 76% rename from niucloud/app/enum/member/MemberLoginTypeEnum.php rename to niucloud/app/dict/member/MemberLoginTypeDict.php index 3dd706ab8..934255a01 100644 --- a/niucloud/app/enum/member/MemberLoginTypeEnum.php +++ b/niucloud/app/dict/member/MemberLoginTypeDict.php @@ -9,14 +9,14 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\member; +namespace app\dict\member; /** * 会员登录方式 - * Class MemberLoginTypeEnum - * @package app\enum\member + * Class MemberLoginTypeDict + * @package app\dict\member */ -class MemberLoginTypeEnum +class MemberLoginTypeDict { //用户名密码注册登录 const USERNAME = 'username'; @@ -29,10 +29,10 @@ class MemberLoginTypeEnum public static function getType($type = ''){ $data = [ - self::USERNAME => get_lang('enum_member.login_username'),//用户名密码登录 - self::MOBILE => get_lang('enum_member.login_mobile'),//手机号验证码登录, - self::WECHAT => get_lang('enum_member.login_wechat'),//'微信公众号授权登录', - self::WEAPP => get_lang('enum_member.login_weapp'),//'微信小程序授权登录', + self::USERNAME => get_lang('dict_member.login_username'),//用户名密码登录 + self::MOBILE => get_lang('dict_member.login_mobile'),//手机号验证码登录, + self::WECHAT => get_lang('dict_member.login_wechat'),//'微信公众号授权登录', + self::WEAPP => get_lang('dict_member.login_weapp'),//'微信小程序授权登录', ]; if(empty($type)){ return $data; diff --git a/niucloud/app/enum/member/MemberRegisterChannelEnum.php b/niucloud/app/dict/member/MemberRegisterChannelDict.php similarity index 76% rename from niucloud/app/enum/member/MemberRegisterChannelEnum.php rename to niucloud/app/dict/member/MemberRegisterChannelDict.php index 40612f96e..d95491e29 100644 --- a/niucloud/app/enum/member/MemberRegisterChannelEnum.php +++ b/niucloud/app/dict/member/MemberRegisterChannelDict.php @@ -9,23 +9,23 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\member; +namespace app\dict\member; -use app\enum\common\ChannelEnum; +use app\dict\common\ChannelDict; /** * 会员注册渠道枚举类 - * Class MemberRegisterChannelEnum + * Class MemberRegisterChannelDict */ -class MemberRegisterChannelEnum extends ChannelEnum +class MemberRegisterChannelDict extends ChannelDict { //手动添加 const MANUAL = 'manual'; public static function getType($type = ''){ - $data = ChannelEnum::getType($type); - $data[self::MANUAL] = get_lang('enum_member.register_manual');//手动添加 + $data = ChannelDict::getType($type); + $data[self::MANUAL] = get_lang('dict_member.register_manual');//手动添加 if(empty($type)){ return $data; } diff --git a/niucloud/app/enum/member/MemberRegisterTypeEnum.php b/niucloud/app/dict/member/MemberRegisterTypeDict.php similarity index 73% rename from niucloud/app/enum/member/MemberRegisterTypeEnum.php rename to niucloud/app/dict/member/MemberRegisterTypeDict.php index d8ad32741..0a5439225 100644 --- a/niucloud/app/enum/member/MemberRegisterTypeEnum.php +++ b/niucloud/app/dict/member/MemberRegisterTypeDict.php @@ -9,14 +9,14 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\member; +namespace app\dict\member; /** * 会员端口枚举类 - * Class MemberRegisterTypeEnum - * @package app\enum\member + * Class MemberRegisterTypeDict + * @package app\dict\member */ -class MemberRegisterTypeEnum +class MemberRegisterTypeDict { //微信小程序 const WEAPP = 'weapp'; @@ -32,11 +32,11 @@ class MemberRegisterTypeEnum public static function getType($type = ''){ $data = [ - self::WEAPP => get_lang('enum_member.register_weapp'),//微信小程序 - self::WECHAT => get_lang('enum_member.register_wechat'),//'微信公众号', - self::MANUAL => get_lang('enum_member.register_manual'),//'手动添加', - self::USERNAME => get_lang('enum_member.register_username'),//用户名密码登录 - self::MOBILE => get_lang('enum_member.register_mobile'),//手机号验证码登录, + self::WEAPP => get_lang('dict_member.register_weapp'),//微信小程序 + self::WECHAT => get_lang('dict_member.register_wechat'),//'微信公众号', + self::MANUAL => get_lang('dict_member.register_manual'),//'手动添加', + self::USERNAME => get_lang('dict_member.register_username'),//用户名密码登录 + self::MOBILE => get_lang('dict_member.register_mobile'),//手机号验证码登录, ]; if(empty($type)){ return $data; diff --git a/niucloud/app/dict/member/account_change_type.php b/niucloud/app/dict/member/account_change_type.php new file mode 100644 index 000000000..1b56aa6cd --- /dev/null +++ b/niucloud/app/dict/member/account_change_type.php @@ -0,0 +1,116 @@ + [ + //调整 + 'adjust' => [ + //名称 + 'name' => get_lang('dict_member.account_point_adjust'), + //是否增加 + 'inc' => 1, + //是否减少 + 'dec' => 1, + ], + //充值赠送 + 'recharge_give' => [ + //名称 + 'name' => get_lang('dict_member.account_point_recharge_give'), + //是否增加 + 'inc' => 1, + //是否减少 + 'dec' => 0, + ], + + ], + MemberAccountTypeDict::BALANCE => [ + //调整 + 'adjust' => [ + //名称 + 'name' => get_lang('dict_member.account_balance_adjust'), + //是否增加 + 'inc' => 1, + //是否减少 + 'dec' => 1, + ], + //充值 + 'recharge' => [ + //名称 + 'name' => get_lang('dict_member.account_balance_recharge'), + //是否增加 + 'inc' => 1, + //是否减少 + 'dec' => 0, + ], + 'recharge_refund' => [ + //名称 + 'name' => get_lang('dict_member.account_balance_recharge_refund'), + //是否增加 + 'inc' => 0, + //是否减少 + 'dec' => 1, + ], + //订单消费扣除余额 + 'order' => [ + //名称 + 'name' => get_lang('dict_member.account_balance_order'), + //是否增加 + 'inc' => 0, + //是否减少 + 'dec' => 1, + ], + //订单退款返还余额 + 'order_refund' => [ + //名称 + 'name' => get_lang('dict_member.account_balance_order_refund'), + //是否增加 + 'inc' => 1, + //是否减少 + 'dec' => 0, + ], + ], + MemberAccountTypeDict::MONEY => [ + + //活动奖励 + 'award' => [ + //名称 + 'name' => get_lang('dict_member.account_money_award'), + //是否增加 + 'inc' => 1, + //是否减少 + 'dec' => 0, + ], + //提现 + 'cash_out' => [ + //名称 + 'name' => get_lang('dict_member.account_money_cash_out'), + //是否增加 + 'inc' => 0, + //是否减少 + 'dec' => 1, + ], + ], + //会员佣金 + MemberAccountTypeDict::COMMISSION => [ + + //活动奖励 + 'award' => [ + //名称 + 'name' => get_lang('dict_member.account_commission_award'), + //是否增加 + 'inc' => 1, + //是否减少 + 'dec' => 0, + ], + //提现 + 'cash_out' => [ + //名称 + 'name' => get_lang('dict_member.account_commission_cash_out'), + //是否增加 + 'inc' => 0, + //是否减少 + 'dec' => 1, + ], + ] +]; \ No newline at end of file diff --git a/niucloud/app/enum/menu/admin.php b/niucloud/app/dict/menu/admin.php similarity index 88% rename from niucloud/app/enum/menu/admin.php rename to niucloud/app/dict/menu/admin.php index 75efab6f2..a213c01a3 100644 --- a/niucloud/app/enum/menu/admin.php +++ b/niucloud/app/dict/menu/admin.php @@ -14,7 +14,6 @@ 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '站点管理', @@ -28,7 +27,6 @@ 'sort' => 50, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '站点列表', @@ -42,7 +40,6 @@ 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '站点详情', @@ -56,7 +53,6 @@ 'sort' => 90, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', ], [ 'menu_name' => '站点套餐', @@ -70,7 +66,6 @@ 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '站点用户', @@ -84,7 +79,6 @@ 'sort' => 70, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ] ] ], @@ -100,7 +94,6 @@ 'sort' => 40, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '菜单管理', @@ -114,7 +107,6 @@ 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '平台菜单', @@ -128,7 +120,6 @@ 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '新增', @@ -142,7 +133,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '编辑', @@ -156,7 +146,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '删除', @@ -170,7 +159,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '详情', @@ -184,7 +172,6 @@ 'sort' => 0, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ], ], @@ -200,7 +187,6 @@ 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '新增', @@ -214,7 +200,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '编辑', @@ -228,7 +213,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '删除', @@ -242,7 +226,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '详情', @@ -256,7 +239,6 @@ 'sort' => 0, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ], ] @@ -275,7 +257,6 @@ 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '新增', @@ -289,7 +270,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '编辑', @@ -303,7 +283,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '删除', @@ -317,7 +296,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '详情', @@ -331,7 +309,6 @@ 'sort' => 0, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ], ], @@ -347,7 +324,6 @@ 'sort' => 70, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '新增', @@ -361,7 +337,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '编辑', @@ -375,7 +350,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '删除', @@ -389,7 +363,6 @@ 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -405,7 +378,6 @@ 'sort' => 60, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -422,7 +394,6 @@ 'sort' => 20, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '网站设置', @@ -436,7 +407,6 @@ 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '版权设置', @@ -450,7 +420,6 @@ 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '登录设置', @@ -464,7 +433,6 @@ 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '存储设置', @@ -478,7 +446,19 @@ 'sort' => 30, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', + ], + [ + 'menu_name' => '微信开放平台', + 'menu_key' => 'setting_oplatform', + 'menu_type' => 1, + 'icon' => 'iconfont-iconweixin', + 'api_url' => 'sys/wxoplatform', + 'router_path' => 'oplatform', + 'view_path' => 'setting/wxoplatform', + 'methods' => 'get', + 'sort' => 20, + 'status' => 1, + 'is_show' => 1, ] ] ], @@ -494,7 +474,6 @@ 'sort' => 10, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '代码生成', @@ -508,21 +487,6 @@ 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', - ], - [ - 'menu_name' => '应用市场', - 'menu_key' => 'app_store', - 'menu_type' => 1, - 'icon' => 'iconfont-iconyingyongshichang', - 'api_url' => 'addon/local', - 'router_path' => 'app_store', - 'view_path' => 'tools/app/index', - 'methods' => 'get', - 'sort' => 90, - 'status' => 1, - 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '数据表编辑', @@ -536,21 +500,6 @@ 'sort' => 80, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', - ], - [ - 'menu_name' => '定时任务', - 'menu_key' => 'system_cron', - 'menu_type' => 1, - 'icon' => 'element-SetUp', - 'api_url' => 'sys/cron', - 'router_path' => 'cron', - 'view_path' => 'tools/cron', - 'methods' => 'get', - 'sort' => 70, - 'status' => 1, - 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '更新缓存', @@ -564,7 +513,6 @@ 'sort' => 60, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '环境检测', @@ -578,8 +526,20 @@ 'sort' => 50, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ] ] - ] + ], + [ + 'menu_name' => '应用市场', + 'menu_key' => 'app_store', + 'menu_type' => 1, + 'icon' => 'element-ShoppingBag', + 'api_url' => 'addon/local', + 'router_path' => 'app_store', + 'view_path' => 'app/store', + 'methods' => 'get', + 'sort' => 0, + 'status' => 1, + 'is_show' => 1, + ], ]; \ No newline at end of file diff --git a/niucloud/app/enum/menu/site.php b/niucloud/app/dict/menu/site.php similarity index 92% rename from niucloud/app/enum/menu/site.php rename to niucloud/app/dict/menu/site.php index 8e68c669b..f2f295041 100644 --- a/niucloud/app/enum/menu/site.php +++ b/niucloud/app/dict/menu/site.php @@ -13,7 +13,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '装修管理', @@ -27,7 +26,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '首页装修', @@ -41,7 +39,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '个人中心', @@ -55,7 +52,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '保存', @@ -69,7 +65,6 @@ return 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '页面管理', @@ -83,7 +78,6 @@ return 'sort' => 70, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '底部导航', @@ -97,7 +91,6 @@ return 'sort' => 60, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ @@ -112,7 +105,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ], ], @@ -128,7 +120,6 @@ return 'sort' => 50, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ] ] ], @@ -144,7 +135,6 @@ return 'sort' => 21, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '装修', @@ -158,7 +148,6 @@ return 'sort' => 0, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', ] ] ], @@ -175,7 +164,6 @@ return 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '文章列表', @@ -189,7 +177,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '文章添加/编辑', @@ -203,7 +190,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', ], [ 'menu_name' => '文章栏目', @@ -217,7 +203,6 @@ return 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -233,7 +218,6 @@ return 'sort' => 70, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ @@ -248,7 +232,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ @@ -263,7 +246,6 @@ return 'sort' => 0, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -279,7 +261,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', ], [ 'menu_name' => '会员标签', @@ -293,7 +274,6 @@ return 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ @@ -308,7 +288,6 @@ return 'sort' => 0, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ @@ -323,12 +302,11 @@ return 'sort' => 0, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '删除标签', - 'menu_key' => 'member_label_add', + 'menu_key' => 'member_label_delete', 'menu_type' => 2, 'icon' => '', 'api_url' => 'member/label/', @@ -338,7 +316,6 @@ return 'sort' => 0, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -354,7 +331,6 @@ return 'sort' => 70, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '会员余额', @@ -368,7 +344,6 @@ return 'sort' => 60, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '会员佣金', @@ -382,7 +357,6 @@ return 'sort' => 59, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ], ], @@ -398,7 +372,6 @@ return 'sort' => 60, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '会员充值', @@ -412,7 +385,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '退款', @@ -426,7 +398,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', ], ] ], @@ -442,7 +413,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', ], [ 'menu_name' => '会员提现', @@ -456,7 +426,6 @@ return 'sort' => 99, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '退款记录', @@ -470,11 +439,10 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '退款详情', - 'menu_key' => 'refund', + 'menu_key' => 'refund_detail', 'menu_type' => 2, 'icon' => '', 'api_url' => 'order/refund/', @@ -484,7 +452,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', ], ] @@ -495,17 +462,30 @@ return 'menu_name' => '应用管理', 'menu_key' => 'addon', - 'menu_type' => 1, + 'menu_type' => 0, 'icon' => 'iconfont-iconmanage-apply', - 'api_url' => 'addon/list', + 'api_url' => '', 'router_path' => 'app', - 'view_path' => 'app/index', - 'methods' => 'get', + 'view_path' => '', + 'methods' => '', 'sort' => 55, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', - 'children' => [] + 'children' => [ + [ + 'menu_name' => '应用管理', + 'menu_key' => 'addon_list', + 'menu_type' => 1, + 'icon' => 'iconfont-iconmanage-apply', + 'api_url' => 'addon/list', + 'router_path' => 'index', + 'view_path' => 'app/index', + 'methods' => 'get', + 'sort' => 50, + 'status' => 1, + 'is_show' => 1, + ] + ] ], [ @@ -520,7 +500,6 @@ return 'sort' => 50, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '电脑端', @@ -534,7 +513,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '电脑端配置', @@ -548,7 +526,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -564,7 +541,6 @@ return 'sort' => 110, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => 'H5端配置', @@ -578,7 +554,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -594,7 +569,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '公众号配置', @@ -608,7 +582,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '自定义菜单', @@ -622,7 +595,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '模板消息', @@ -636,7 +608,6 @@ return 'sort' => 70, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ] ] ], @@ -652,7 +623,6 @@ return 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '小程序配置', @@ -666,7 +636,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '订阅消息', @@ -680,7 +649,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ] ] ], @@ -696,7 +664,6 @@ return 'sort' => 70, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '支付宝配置', @@ -710,7 +677,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -728,7 +694,6 @@ return 'sort' => 40, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ @@ -743,7 +708,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '新增', @@ -757,7 +721,6 @@ return 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '编辑', @@ -771,7 +734,6 @@ return 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '删除', @@ -785,7 +747,6 @@ return 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '详情', @@ -799,7 +760,6 @@ return 'sort' => 0, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ], ], @@ -815,7 +775,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '新增', @@ -829,7 +788,6 @@ return 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '编辑', @@ -843,7 +801,6 @@ return 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '删除', @@ -857,7 +814,6 @@ return 'sort' => 1, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -873,7 +829,6 @@ return 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -890,7 +845,6 @@ return 'sort' => 30, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '网站设置', @@ -904,7 +858,7 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', + ], [ 'menu_name' => '协议管理', @@ -918,7 +872,6 @@ return 'sort' => 80, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ ] @@ -935,7 +888,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 0, - 'en_menu_name' => '', ], [ 'menu_name' => '注册登录', @@ -949,7 +901,19 @@ return 'sort' => 70, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', + ], + [ + 'menu_name' => '会员设置', + 'menu_key' => 'setting_member', + 'menu_type' => 1, + 'icon' => 'iconfont-iconjiaoseyonghu', + 'api_url' => 'member/config/member', + 'router_path' => 'member', + 'view_path' => 'setting/member', + 'methods' => 'get', + 'sort' => 71, + 'status' => 1, + 'is_show' => 1, ], [ 'menu_name' => '支付管理', @@ -963,7 +927,6 @@ return 'sort' => 60, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '支付设置', @@ -977,7 +940,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '设置', @@ -991,7 +953,6 @@ return 'sort' => 100, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], ] ], @@ -1007,7 +968,6 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '设置', @@ -1021,7 +981,7 @@ return 'sort' => 90, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', + ], ] ], @@ -1037,7 +997,7 @@ return // 'sort' => 0, // 'status' => 1, // 'is_show' => 0, -// 'en_menu_name' => '', +// // ], // [ // 'menu_name' => '支付宝支付', @@ -1051,7 +1011,7 @@ return // 'sort' => 0, // 'status' => 1, // 'is_show' => 0, -// 'en_menu_name' => '', +// // ], // [ // 'menu_name' => '获取支付配置', @@ -1065,7 +1025,7 @@ return // 'sort' => 0, // 'status' => 1, // 'is_show' => 0, -// 'en_menu_name' => '', +// // ], // [ // 'menu_name' => '配置支付', @@ -1079,7 +1039,7 @@ return // 'sort' => 0, // 'status' => 1, // 'is_show' => 0, -// 'en_menu_name' => '', +// // ], ] ], @@ -1095,7 +1055,6 @@ return 'sort' => 59, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '消息管理', @@ -1109,7 +1068,6 @@ return 'sort' => 50, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '消息模板', @@ -1123,7 +1081,6 @@ return 'sort' => 10, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ], [ 'menu_name' => '发送记录', @@ -1137,7 +1094,6 @@ return 'sort' => 9, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', ] ] ], @@ -1153,7 +1109,6 @@ return 'sort' => 40, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', 'children' => [ [ 'menu_name' => '短信设置', @@ -1167,7 +1122,7 @@ return 'sort' => 12, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', + ], [ 'menu_name' => '发送记录', @@ -1181,7 +1136,7 @@ return 'sort' => 11, 'status' => 1, 'is_show' => 1, - 'en_menu_name' => '', + ] ] ], diff --git a/niucloud/app/enum/notice/NoticeEnum.php b/niucloud/app/dict/notice/NoticeDict.php similarity index 60% rename from niucloud/app/enum/notice/NoticeEnum.php rename to niucloud/app/dict/notice/NoticeDict.php index 331ac3cc8..88f30c237 100644 --- a/niucloud/app/enum/notice/NoticeEnum.php +++ b/niucloud/app/dict/notice/NoticeDict.php @@ -9,26 +9,23 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\notice; -use core\addon\AddonLoader; +namespace app\dict\notice; +use core\dict\DictLoader; /** * 消息类 - * Class MessageEnum - * @package app\enum\sys + * Class NoticeDict + * @package app\dict\sys */ -class NoticeEnum +class NoticeDict { /** * 获取消息 * @return array */ public static function getNotice(string $key = ''){ - $addon_load = new AddonLoader('Notice'); + $addon_load = new DictLoader('Notice'); $notice = $addon_load->load(['type' => 'notice']); -// $wechat_notice = $addon_load->load(['type' => NoticeTypeEnum::WECHAT]); -// $weapp_notice = $addon_load->load(['type' => NoticeTypeEnum::WEAPP]); -// $sms_notice = $addon_load->load(['type' => NoticeTypeEnum::SMS]); - $notice_type = NoticeTypeEnum::getType(); + $notice_type = NoticeTypeDict::getType(); foreach($notice_type as $k => $v){ $var_name = $k.'_notice'; $$var_name = $addon_load->load(['type' => $k]); @@ -37,22 +34,6 @@ class NoticeEnum foreach ($notice as $k => $v) { $support_type = []; -// if(array_key_exists($k, $wechat_notice)) -// { -// $notice[$k]['wechat'] = $wechat_notice[$k]; -// $support_type[] = 'wechat'; -// } -// if(array_key_exists($k, $weapp_notice)) -// { -// $notice[$k]['weapp'] = $weapp_notice[$k]; -// $support_type[] = 'weapp'; -// } -// if(array_key_exists($k, $sms_notice)) -// { -// $notice[$k]['sms'] = $sms_notice[$k]; -// $support_type[] = 'sms'; -// } - foreach($notice_type as $notice_type_k => $notice_type_v){ $var_name = $notice_type_k.'_notice'; if(array_key_exists($k, $$var_name)) diff --git a/niucloud/app/enum/notice/NoticeTypeEnum.php b/niucloud/app/dict/notice/NoticeTypeDict.php similarity index 78% rename from niucloud/app/enum/notice/NoticeTypeEnum.php rename to niucloud/app/dict/notice/NoticeTypeDict.php index 763d6e6ab..e7b5b7abe 100644 --- a/niucloud/app/enum/notice/NoticeTypeEnum.php +++ b/niucloud/app/dict/notice/NoticeTypeDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\notice; +namespace app\dict\notice; -class NoticeTypeEnum +class NoticeTypeDict { //短信 const SMS = 'sms'; @@ -27,9 +27,9 @@ class NoticeTypeEnum */ public static function getType(){ return [ - self::SMS => get_lang('enum_notice.type_sms'),//短信 - self::WECHAT => get_lang('enum_notice.type_wechat'),//微信公众号 - self::WEAPP => get_lang('enum_notice.type_weapp'),//微信小程序 + self::SMS => get_lang('dict_notice.type_sms'),//短信 + self::WECHAT => get_lang('dict_notice.type_wechat'),//微信公众号 + self::WEAPP => get_lang('dict_notice.type_weapp'),//微信小程序 ]; } diff --git a/niucloud/app/enum/notice/notice.php b/niucloud/app/dict/notice/notice.php similarity index 99% rename from niucloud/app/enum/notice/notice.php rename to niucloud/app/dict/notice/notice.php index be602baee..b8b4e910c 100644 --- a/niucloud/app/enum/notice/notice.php +++ b/niucloud/app/dict/notice/notice.php @@ -22,6 +22,7 @@ return [ ], ], //充值成功通知，站点端发送 + 'recharge_success' => [ 'key' => 'recharge_success', 'receiver_type' => 2, diff --git a/niucloud/app/enum/notice/sms.php b/niucloud/app/dict/notice/sms.php similarity index 100% rename from niucloud/app/enum/notice/sms.php rename to niucloud/app/dict/notice/sms.php diff --git a/niucloud/app/enum/notice/weapp.php b/niucloud/app/dict/notice/weapp.php similarity index 100% rename from niucloud/app/enum/notice/weapp.php rename to niucloud/app/dict/notice/weapp.php diff --git a/niucloud/app/enum/notice/wechat.php b/niucloud/app/dict/notice/wechat.php similarity index 100% rename from niucloud/app/enum/notice/wechat.php rename to niucloud/app/dict/notice/wechat.php diff --git a/niucloud/app/enum/order/OrderRefundEnum.php b/niucloud/app/dict/order/OrderRefundDict.php similarity index 74% rename from niucloud/app/enum/order/OrderRefundEnum.php rename to niucloud/app/dict/order/OrderRefundDict.php index 8f1c21b1b..0bf00a240 100644 --- a/niucloud/app/enum/order/OrderRefundEnum.php +++ b/niucloud/app/dict/order/OrderRefundDict.php @@ -9,18 +9,19 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\order; +namespace app\dict\order; /** * 订单类型整体功能 - * Class OrderTypeEnum - * @package app\enum\member + * Class OrderRefundDict + * @package app\dict\order */ -class OrderRefundEnum +class OrderRefundDict { const WAIT = '1';//待审核 const WAIT_TRANSFER = '2';//待退款 const SUCCESS = '3';//退款成功 + const FAIL = '-1';//退款失败 /** * 退款状态 @@ -30,17 +31,21 @@ class OrderRefundEnum public static function getStatus($status = []){ $list = [ self::WAIT => [ - 'name' => get_lang('enum_refund.wait'), + 'name' => get_lang('dict_refund.wait'), 'key' => self::WAIT, ], self::WAIT_TRANSFER => [ - 'name' => get_lang('enum_refund.wait_transfer'), + 'name' => get_lang('dict_refund.wait_transfer'), 'key' => self::WAIT, ], self::SUCCESS => [ - 'name' => get_lang('enum_refund.success'), + 'name' => get_lang('dict_refund.success'), 'key' => self::WAIT, ], + self::FAIL => [ + 'name' => get_lang('dict_refund.fail'), + 'key' => self::FAIL, + ] ]; foreach($list as $k => $v){ if(!empty($status) && !in_array($k, $status)) unset($list[$k]); diff --git a/niucloud/app/enum/order/OrderTypeEnum.php b/niucloud/app/dict/order/OrderTypeDict.php similarity index 84% rename from niucloud/app/enum/order/OrderTypeEnum.php rename to niucloud/app/dict/order/OrderTypeDict.php index 6b23dbf6d..d9d380e05 100644 --- a/niucloud/app/enum/order/OrderTypeEnum.php +++ b/niucloud/app/dict/order/OrderTypeDict.php @@ -9,14 +9,14 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\order; +namespace app\dict\order; /** * 订单类型整体功能 - * Class OrderTypeEnum - * @package app\enum\member + * Class OrderTypeDict + * @package app\dict\member */ -class OrderTypeEnum +class OrderTypeDict { /** @@ -25,8 +25,8 @@ class OrderTypeEnum * @return void */ public static function getAllowPayType($type){ - /** @var RechargeOrderEnum $class */ - $class = __NAMESPACE__ . '\\' . ucfirst(strtolower($type)).'OrderEnum'; + /** @var RechargeOrderDict $class */ + $class = __NAMESPACE__ . '\\' . ucfirst(strtolower($type)).'OrderDict'; return $class::ALLOW_PAY; } } \ No newline at end of file diff --git a/niucloud/app/enum/order/RechargeOrderEnum.php b/niucloud/app/dict/order/RechargeOrderDict.php similarity index 87% rename from niucloud/app/enum/order/RechargeOrderEnum.php rename to niucloud/app/dict/order/RechargeOrderDict.php index 6a5b34eb4..4848ea87e 100644 --- a/niucloud/app/enum/order/RechargeOrderEnum.php +++ b/niucloud/app/dict/order/RechargeOrderDict.php @@ -9,16 +9,16 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\order; +namespace app\dict\order; -use app\enum\pay\PayEnum; +use app\dict\pay\PayDict; /** *充值订单相关枚举类 - * Class RechargeOrderEnum - * @package app\enum\order + * Class RechargeOrderDict + * @package app\dict\order */ -class RechargeOrderEnum +class RechargeOrderDict { //订单状态 //待支付 @@ -44,9 +44,9 @@ class RechargeOrderEnum * 当前订单支持的支付方式 */ const ALLOW_PAY = [ - PayEnum::WECHATPAY, - PayEnum::ALIPAY, - PayEnum::OFFLINEPAY, + PayDict::WECHATPAY, + PayDict::ALIPAY, + PayDict::OFFLINEPAY, ]; /** @@ -57,7 +57,7 @@ class RechargeOrderEnum { return [ 'type' => 'recharge', - 'name' => get_lang('enum_order.order_type_recharge') + 'name' => get_lang('dict_order.order_type_recharge') ]; } @@ -119,15 +119,15 @@ class RechargeOrderEnum public static function getRefundStatus(int|string $status = '') { $data = [ self::REFUNDING => [ - 'name' => get_lang('enum_order_refund.refunding'), + 'name' => get_lang('dict_order_refund.refunding'), 'status' => self::REFUNDING ], self::REFUND_COMPLETED => [ - 'name' => get_lang('enum_order_refund.refund_complete'), + 'name' => get_lang('dict_order_refund.refund_complete'), 'status' => self::REFUND_COMPLETED ], self::REFUND_FAIL => [ - 'name' => get_lang('enum_order_refund.refund_fail'), + 'name' => get_lang('dict_order_refund.refund_fail'), 'status' => self::REFUND_FAIL ] ]; diff --git a/niucloud/app/enum/pay/OnlinePayEnum.php b/niucloud/app/dict/pay/OnlinePayDict.php similarity index 97% rename from niucloud/app/enum/pay/OnlinePayEnum.php rename to niucloud/app/dict/pay/OnlinePayDict.php index c49e83a0c..e783f3d3d 100644 --- a/niucloud/app/enum/pay/OnlinePayEnum.php +++ b/niucloud/app/dict/pay/OnlinePayDict.php @@ -9,24 +9,19 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\pay; +namespace app\dict\pay; -class OnlinePayEnum +class OnlinePayDict { //上传方式 图片 const SUCCESS = 'SUCCESS';//支付成功 //上传方式 视频 const REFUND = 'REFUND';//转入退款 - const NOTPAY = 'NOTPAY';//未支付 const CLOSED = 'CLOSED';//已关闭 - const REVOKED = 'REVOKED';//已撤销（仅付款码支付会返回） - const USERPAYING = 'USERPAYING';//用户支付中（仅付款码支付会返回） - const PAYERROR = 'PAYERROR';//支付失败（仅付款码支付会返回） - const TRADE_FINISHED = 'TRADE_FINISHED'; diff --git a/niucloud/app/enum/pay/OnlineRefundEnum.php b/niucloud/app/dict/pay/OnlineRefundDict.php similarity index 97% rename from niucloud/app/enum/pay/OnlineRefundEnum.php rename to niucloud/app/dict/pay/OnlineRefundDict.php index 31bb72607..09c26b755 100644 --- a/niucloud/app/enum/pay/OnlineRefundEnum.php +++ b/niucloud/app/dict/pay/OnlineRefundDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\pay; +namespace app\dict\pay; -class OnlineRefundEnum +class OnlineRefundDict { const SUCCESS = 'SUCCESS';//退款成功 diff --git a/niucloud/app/enum/pay/PayChannelEnum.php b/niucloud/app/dict/pay/PayChannelDict.php similarity index 84% rename from niucloud/app/enum/pay/PayChannelEnum.php rename to niucloud/app/dict/pay/PayChannelDict.php index a46772f62..7af1d98b7 100644 --- a/niucloud/app/enum/pay/PayChannelEnum.php +++ b/niucloud/app/dict/pay/PayChannelDict.php @@ -9,11 +9,11 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\pay; +namespace app\dict\pay; -use app\enum\common\ChannelEnum; +use app\dict\common\ChannelDict; -class PayChannelEnum +class PayChannelDict { @@ -22,11 +22,11 @@ class PayChannelEnum * @return array */ public static function getPayChannel(array $types = []){ - $channel = ChannelEnum::getType(); + $channel = ChannelDict::getType(); $list = []; - $pay_type = PayEnum::getPayType(); + $pay_type = PayDict::getPayType(); // foreach($pay_type as $k => $v){ -// if($k == PayEnum::BALANCEPAY){ +// if($k == PayDict::BALANCEPAY){ // $pay_type[$k]['is_template'] = false; // }else{ // $pay_type[$k]['is_template'] = true; diff --git a/niucloud/app/enum/pay/PayEnum.php b/niucloud/app/dict/pay/PayDict.php similarity index 76% rename from niucloud/app/enum/pay/PayEnum.php rename to niucloud/app/dict/pay/PayDict.php index 54cc55f77..e0c47832f 100644 --- a/niucloud/app/enum/pay/PayEnum.php +++ b/niucloud/app/dict/pay/PayDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\pay; +namespace app\dict\pay; -class PayEnum +class PayDict { //上传方式 图片 const WECHATPAY = 'wechatpay';//微信支付 @@ -48,34 +48,34 @@ class PayEnum public static function getPayType(array $types = []){ $list = [ self::WECHATPAY => [ - 'name' => get_lang('enum_pay.type_wechatpay'), + 'name' => get_lang('dict_pay.type_wechatpay'), 'key' => self::WECHATPAY, 'icon' => self::WECHATPAY_ICON, ],//微信支付 self::ALIPAY => [ - 'name' => get_lang('enum_pay.type_alipay'), + 'name' => get_lang('dict_pay.type_alipay'), 'key' => self::ALIPAY, 'icon' => self::ALIPAY_ICON, ],//支付宝支付 // self::UNIPAY => [ -// 'name' => get_lang('enum_pay.type_unipay'), +// 'name' => get_lang('dict_pay.type_unipay'), // 'key' => self::UNIPAY, // 'icon' => self::UNIPAY_ICON // ],//银联支付 // self::OFFLINEPAY => [ -// 'name' => get_lang('enum_pay.type_offline'), +// 'name' => get_lang('dict_pay.type_offline'), // 'key' => self::OFFLINEPAY, // 'icon' => self::OFFLINEPAY_ICON // ],//线下支付 self::BALANCEPAY => [ - 'name' => get_lang('enum_pay.type_balancepay'), + 'name' => get_lang('dict_pay.type_balancepay'), 'key' => self::BALANCEPAY, 'icon' => self::BALANCEPAY_ICON, ],//微信支付 -// self::ALIPAY => get_lang('enum_pay.type_alipay'),//支付宝支付 -// self::UNIPAY => get_lang('enum_pay.type_unipay'),//银联 -// self::OFFLINEPAY => get_lang('enum_pay.type_offline'),//线下支付 -// self::BALANCEPAY => get_lang('enum_pay.type_balancepay'),//余额支付 +// self::ALIPAY => get_lang('dict_pay.type_alipay'),//支付宝支付 +// self::UNIPAY => get_lang('dict_pay.type_unipay'),//银联 +// self::OFFLINEPAY => get_lang('dict_pay.type_offline'),//线下支付 +// self::BALANCEPAY => get_lang('dict_pay.type_balancepay'),//余额支付 ]; if(!empty($types)){ foreach($list as $k => $v){ @@ -93,10 +93,10 @@ class PayEnum */ public static function getStatus(){ $list = [ - self::STATUS_WAIT => get_lang('enum_pay.status_wait'), - self::STATUS_ING => get_lang('enum_pay.status_ing'), - self::STATUS_ED => get_lang('enum_pay.status_ed'), - self::STATUS_CALCLE => get_lang('enum_pay.status_cancle'), + self::STATUS_WAIT => get_lang('dict_pay.status_wait'), + self::STATUS_ING => get_lang('dict_pay.status_ing'), + self::STATUS_ED => get_lang('dict_pay.status_ed'), + self::STATUS_CALCLE => get_lang('dict_pay.status_cancle'), ]; return $list; } diff --git a/niucloud/app/enum/pay/RefundEnum.php b/niucloud/app/dict/pay/RefundDict.php similarity index 70% rename from niucloud/app/enum/pay/RefundEnum.php rename to niucloud/app/dict/pay/RefundDict.php index 1d3f384e2..2c2545dfa 100644 --- a/niucloud/app/enum/pay/RefundEnum.php +++ b/niucloud/app/dict/pay/RefundDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\pay; +namespace app\dict\pay; -class RefundEnum +class RefundDict { //转账状态 const SUCCESS = 'success';//退款成功 @@ -31,10 +31,10 @@ class RefundEnum */ public static function getStatus(){ $list = [ - self::WAIT => get_lang('enum_pay_refund.status_wait'), - self::DEALING => get_lang('enum_pay_refund.status_dealing'), - self::SUCCESS => get_lang('enum_pay_refund.status_success'), - self::FAIL => get_lang('enum_pay_refund.status_fail'), + self::WAIT => get_lang('dict_pay_refund.status_wait'), + self::DEALING => get_lang('dict_pay_refund.status_dealing'), + self::SUCCESS => get_lang('dict_pay_refund.status_success'), + self::FAIL => get_lang('dict_pay_refund.status_fail'), ]; return $list; } @@ -45,10 +45,10 @@ class RefundEnum */ public static function getType(){ return [ - self::WECHATPAY => get_lang('enum_pay_refund.wechatpay'), - self::ALIPAY => get_lang('enum_pay_refund.alipay'), - self::OFFLINE => get_lang('enum_pay_refund.offline'), - self::BALANCE => get_lang('enum_pay_refund.balance') + self::WECHATPAY => get_lang('dict_pay_refund.wechatpay'), + self::ALIPAY => get_lang('dict_pay_refund.alipay'), + self::OFFLINE => get_lang('dict_pay_refund.offline'), + self::BALANCE => get_lang('dict_pay_refund.balance') ]; } } \ No newline at end of file diff --git a/niucloud/app/enum/pay/TransferEnum.php b/niucloud/app/dict/pay/TransferDict.php similarity index 77% rename from niucloud/app/enum/pay/TransferEnum.php rename to niucloud/app/dict/pay/TransferDict.php index e8f491bdc..421db169e 100644 --- a/niucloud/app/enum/pay/TransferEnum.php +++ b/niucloud/app/dict/pay/TransferDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\pay; +namespace app\dict\pay; -class TransferEnum +class TransferDict { const WECHAT = 'wechat';//微信支付 @@ -34,8 +34,8 @@ class TransferEnum public static function getPayTypeByTransfer(string $type = ''){ $list = array( - self::WECHAT => PayEnum::WECHATPAY, - self::ALIPAY => PayEnum::ALIPAY, + self::WECHAT => PayDict::WECHATPAY, + self::ALIPAY => PayDict::ALIPAY, ); if(empty($type)) return $list; @@ -49,24 +49,24 @@ class TransferEnum public static function getTransferType(array $types = [], $is_all = true){ $list = [ self::WECHAT => [ - 'name' => get_lang('enum_transfer.type_wechat'), + 'name' => get_lang('dict_transfer.type_wechat'), 'key' => self::WECHAT, 'is_online' => true ],//微信 self::ALIPAY => [ - 'name' => get_lang('enum_transfer.type_ali'), + 'name' => get_lang('dict_transfer.type_ali'), 'key' => self::ALIPAY, 'is_online' => false ],//支付宝 self::BANK => [ - 'name' => get_lang('enum_transfer.type_bank'), + 'name' => get_lang('dict_transfer.type_bank'), 'key' => self::BANK, 'is_online' => false ],//银行卡 ]; if($is_all){ $list[self::OFFLINE] = [ - 'name' => get_lang('enum_transfer.type_offline'), + 'name' => get_lang('dict_transfer.type_offline'), 'key' => self::OFFLINE, 'is_online' => false ]; @@ -87,10 +87,10 @@ class TransferEnum */ public static function getStatus(){ $list = [ - self::WAIT => get_lang('enum_transfer.status_wait'), - self::DEALING => get_lang('enum_transfer.status_dealing'), - self::SUCCESS => get_lang('enum_transfer.status_success'), - self::FAIL => get_lang('enum_transfer.status_fail'), + self::WAIT => get_lang('dict_transfer.status_wait'), + self::DEALING => get_lang('dict_transfer.status_dealing'), + self::SUCCESS => get_lang('dict_transfer.status_success'), + self::FAIL => get_lang('dict_transfer.status_fail'), ]; return $list; } diff --git a/niucloud/app/enum/scan/ScanEnum.php b/niucloud/app/dict/scan/ScanDict.php similarity index 95% rename from niucloud/app/enum/scan/ScanEnum.php rename to niucloud/app/dict/scan/ScanDict.php index 463bef160..f6b5e9ba7 100644 --- a/niucloud/app/enum/scan/ScanEnum.php +++ b/niucloud/app/dict/scan/ScanDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\scan; +namespace app\dict\scan; -class ScanEnum +class ScanDict { /************************************************* 请求消息的属性 *****************************************/ diff --git a/niucloud/app/dict/schedule/schedule.php b/niucloud/app/dict/schedule/schedule.php new file mode 100644 index 000000000..2219e0181 --- /dev/null +++ b/niucloud/app/dict/schedule/schedule.php @@ -0,0 +1,22 @@ + 'order_close', + 'name' => '未支付订单自动关闭', + 'time' => [ + 'type' => 'min', + ], + 'class' => '', + 'function' => '' + ], + [ + 'key' => 'site_expire_close', + 'name' => '站点到期自动关闭', + 'time' => [ + 'type' => 'min', + ], + 'class' => '', + 'function' => '' + ] +]; diff --git a/niucloud/app/enum/site/SiteEnum.php b/niucloud/app/dict/site/SiteDict.php similarity index 73% rename from niucloud/app/enum/site/SiteEnum.php rename to niucloud/app/dict/site/SiteDict.php index b0e5d90a4..b6afdcae2 100644 --- a/niucloud/app/enum/site/SiteEnum.php +++ b/niucloud/app/dict/site/SiteDict.php @@ -9,14 +9,14 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\site; +namespace app\dict\site; -class SiteEnum +class SiteDict { const EXPIRE = 2;//过期 const ON = 1;//正常 - const EXPERIENCE = 0;//体验期 + const CLOSE = 3;//停止 /** @@ -25,9 +25,9 @@ class SiteEnum */ public static function getStatus(){ return [ - self::ON => get_lang('enum_site.status_on'),//正常 - self::EXPERIENCE => get_lang('enum_site.status_experience'),//体验期 - self::EXPIRE => get_lang('enum_site.status_expire'),//过期 + self::ON => get_lang('dict_site.status_on'),//正常 + self::EXPIRE => get_lang('dict_site.status_expire'),//过期 + self::CLOSE => get_lang('dict_site.status_close'),//停止 ]; } diff --git a/niucloud/app/enum/sys/AgreementEnum.php b/niucloud/app/dict/sys/AgreementDict.php similarity index 80% rename from niucloud/app/enum/sys/AgreementEnum.php rename to niucloud/app/dict/sys/AgreementDict.php index 1b043a014..1457743fe 100644 --- a/niucloud/app/enum/sys/AgreementEnum.php +++ b/niucloud/app/dict/sys/AgreementDict.php @@ -9,14 +9,14 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; /** * 协议相关枚举类 - * Class AgreementEnum - * @package app\enum\sys + * Class AgreementDict + * @package app\dict\sys */ -class AgreementEnum +class AgreementDict { //服务协议 const SERVICE = 'service'; @@ -29,8 +29,8 @@ class AgreementEnum */ public static function getType(){ return [ - self::SERVICE => get_lang('enum_agreement.service'),//服务协议, - self::PRIVACY => get_lang('enum_agreement.privacy'),//隐私协议 + self::SERVICE => get_lang('dict_agreement.service'),//服务协议, + self::PRIVACY => get_lang('dict_agreement.privacy'),//隐私协议 ]; } diff --git a/niucloud/app/enum/sys/AppTypeEnum.php b/niucloud/app/dict/sys/AppTypeDict.php similarity index 78% rename from niucloud/app/enum/sys/AppTypeEnum.php rename to niucloud/app/dict/sys/AppTypeDict.php index 59f4ef726..538d295cf 100644 --- a/niucloud/app/enum/sys/AppTypeEnum.php +++ b/niucloud/app/dict/sys/AppTypeDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class AppTypeEnum +class AppTypeDict { const ADMIN = 'admin';//平台管理端 @@ -25,9 +25,9 @@ class AppTypeEnum */ public static function getAppType(){ return [ - self::ADMIN => get_lang('enum_app.type_admin'),//平台管理端 - self::SITE => get_lang('enum_app.type_site'),//站点管理端 - self::API => get_lang('enum_app.type_api'),//客户端 + self::ADMIN => get_lang('dict_app.type_admin'),//平台管理端 + self::SITE => get_lang('dict_app.type_site'),//站点管理端 + self::API => get_lang('dict_app.type_api'),//客户端 ]; } diff --git a/niucloud/app/enum/sys/ConfigKeyEnum.php b/niucloud/app/dict/sys/ConfigKeyDict.php similarity index 96% rename from niucloud/app/enum/sys/ConfigKeyEnum.php rename to niucloud/app/dict/sys/ConfigKeyDict.php index bb5aea9f8..a8b433b00 100644 --- a/niucloud/app/enum/sys/ConfigKeyEnum.php +++ b/niucloud/app/dict/sys/ConfigKeyDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class ConfigKeyEnum +class ConfigKeyDict { const WECHAT = 'WECHAT';//微信公众号 diff --git a/niucloud/app/enum/sys/CronEnum.php b/niucloud/app/dict/sys/CronDict.php similarity index 72% rename from niucloud/app/enum/sys/CronEnum.php rename to niucloud/app/dict/sys/CronDict.php index 63bd8275f..dd297b76d 100644 --- a/niucloud/app/enum/sys/CronEnum.php +++ b/niucloud/app/dict/sys/CronDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class CronEnum +class CronDict { const CRON = 'cron';//定时任务 @@ -28,8 +28,8 @@ class CronEnum */ public static function getType(){ return [ - self::CRON => get_lang('enum_cron.type_cron'),//定时任务 - self::CROND => get_lang('enum_cron.type_crond'),//周期任务 + self::CRON => get_lang('dict_cron.type_cron'),//定时任务 + self::CROND => get_lang('dict_cron.type_crond'),//周期任务 ]; } /** @@ -38,10 +38,10 @@ class CronEnum */ public static function getCrondType(){ return [ - self::MINUTE => get_lang('enum_cron.type_minute'),//分钟 - self::DAY => get_lang('enum_cron.type_day'),//天 - self::WEEK => get_lang('enum_cron.type_week'),//星期 - self::MONTH => get_lang('enum_cron.type_month'),//月份 + self::MINUTE => get_lang('dict_cron.type_minute'),//分钟 + self::DAY => get_lang('dict_cron.type_day'),//天 + self::WEEK => get_lang('dict_cron.type_week'),//星期 + self::MONTH => get_lang('dict_cron.type_month'),//月份 ]; } diff --git a/niucloud/app/enum/sys/FileEnum.php b/niucloud/app/dict/sys/FileDict.php similarity index 79% rename from niucloud/app/enum/sys/FileEnum.php rename to niucloud/app/dict/sys/FileDict.php index 4fc692b9e..4cd2f4668 100644 --- a/niucloud/app/enum/sys/FileEnum.php +++ b/niucloud/app/dict/sys/FileDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class FileEnum +class FileDict { //上传方式 图片 const IMAGE = 'image'; @@ -30,8 +30,8 @@ class FileEnum */ public static function getType(){ return [ - self::IMAGE => get_lang('enum_file.type_image'),//图片 - self::VIDEO => get_lang('enum_file.type_video'),//视频 + self::IMAGE => get_lang('dict_file.type_image'),//图片 + self::VIDEO => get_lang('dict_file.type_video'),//视频 ]; } @@ -41,10 +41,10 @@ class FileEnum */ public static function getStorageType(){ return [ - self::LOCAL => get_lang('enum_file.storage_type_local'),//本地存储 - self::QINIU => get_lang('enum_file.storage_type_qiniu'),//七牛云 - self::ALIYUN => get_lang('enum_file.storage_type_image'),//阿里云 - self::QCLOUD => get_lang('enum_file.storage_type_qcloud'),//腾讯云 + self::LOCAL => get_lang('dict_file.storage_type_local'),//本地存储 + self::QINIU => get_lang('dict_file.storage_type_qiniu'),//七牛云 + self::ALIYUN => get_lang('dict_file.storage_type_image'),//阿里云 + self::QCLOUD => get_lang('dict_file.storage_type_qcloud'),//腾讯云 ]; } diff --git a/niucloud/app/enum/sys/MenuEnum.php b/niucloud/app/dict/sys/MenuDict.php similarity index 81% rename from niucloud/app/enum/sys/MenuEnum.php rename to niucloud/app/dict/sys/MenuDict.php index 2faf2d4d2..496655a01 100644 --- a/niucloud/app/enum/sys/MenuEnum.php +++ b/niucloud/app/dict/sys/MenuDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class MenuEnum +class MenuDict { const ON = 1; @@ -24,8 +24,8 @@ class MenuEnum */ public static function getStatus(){ return [ - self::ON => get_lang('enum_menu.status_on'),//展示 - self::OFF => get_lang('enum_menu.status_off'),//隐藏 + self::ON => get_lang('dict_menu.status_on'),//展示 + self::OFF => get_lang('dict_menu.status_off'),//隐藏 ]; } diff --git a/niucloud/app/enum/sys/MenuTypeEnum.php b/niucloud/app/dict/sys/MenuTypeDict.php similarity index 76% rename from niucloud/app/enum/sys/MenuTypeEnum.php rename to niucloud/app/dict/sys/MenuTypeDict.php index 9572b0e0e..bf409ccc1 100644 --- a/niucloud/app/enum/sys/MenuTypeEnum.php +++ b/niucloud/app/dict/sys/MenuTypeDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class MenuTypeEnum +class MenuTypeDict { const LIST = '0'; @@ -20,9 +20,9 @@ class MenuTypeEnum public static function getMenuType(){ return [ - self::LIST => get_lang('enum_menu.type_list'),//目录 - self::MENU => get_lang('enum_menu.type_menu'),//菜单 - self::BUTTON => get_lang('enum_menu.type_button'),//接口 + self::LIST => get_lang('dict_menu.type_list'),//目录 + self::MENU => get_lang('dict_menu.type_menu'),//菜单 + self::BUTTON => get_lang('dict_menu.type_button'),//接口 ]; } diff --git a/niucloud/app/enum/sys/MethodEnum.php b/niucloud/app/dict/sys/MethodDict.php similarity index 95% rename from niucloud/app/enum/sys/MethodEnum.php rename to niucloud/app/dict/sys/MethodDict.php index c91ea18a3..1b901f938 100644 --- a/niucloud/app/enum/sys/MethodEnum.php +++ b/niucloud/app/dict/sys/MethodDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class MethodEnum +class MethodDict { const GET = 'get'; diff --git a/niucloud/app/enum/sys/RoleStatusEnum.php b/niucloud/app/dict/sys/RoleStatusDict.php similarity index 81% rename from niucloud/app/enum/sys/RoleStatusEnum.php rename to niucloud/app/dict/sys/RoleStatusDict.php index 5019c58e9..c2e3e4d09 100644 --- a/niucloud/app/enum/sys/RoleStatusEnum.php +++ b/niucloud/app/dict/sys/RoleStatusDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class RoleStatusEnum +class RoleStatusDict { const ON = 1; @@ -24,8 +24,8 @@ class RoleStatusEnum */ public static function getStatus(){ return [ - self::ON => get_lang('enum_role.status_on'),//启用 - self::OFF => get_lang('enum_role.status_off'),//关闭 + self::ON => get_lang('dict_role.status_on'),//启用 + self::OFF => get_lang('dict_role.status_off'),//关闭 ]; } diff --git a/niucloud/app/enum/sys/SmsEnum.php b/niucloud/app/dict/sys/SmsDict.php similarity index 88% rename from niucloud/app/enum/sys/SmsEnum.php rename to niucloud/app/dict/sys/SmsDict.php index b277e3a64..6b8996a04 100644 --- a/niucloud/app/enum/sys/SmsEnum.php +++ b/niucloud/app/dict/sys/SmsDict.php @@ -9,14 +9,14 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; /** * 短信枚举类 - * Class SmsEnum - * @package app\enum\sys + * Class SmsDict + * @package app\dict\sys */ -class SmsEnum +class SmsDict { //阿里云短信 const ALISMS = 'ali'; @@ -55,9 +55,9 @@ class SmsEnum public function getStatusType(){ return [ - self::SENDING => 'enum_sms.status_sending', - self::SUCCESS => 'enum_sms.status_success', - self::FAIL => 'enum_sms.status_fail', + self::SENDING => 'dict_sms.status_sending', + self::SUCCESS => 'dict_sms.status_success', + self::FAIL => 'dict_sms.status_fail', ]; } diff --git a/niucloud/app/enum/sys/StorageEnum.php b/niucloud/app/dict/sys/StorageDict.php similarity index 96% rename from niucloud/app/enum/sys/StorageEnum.php rename to niucloud/app/dict/sys/StorageDict.php index ccdcde826..ef231054f 100644 --- a/niucloud/app/enum/sys/StorageEnum.php +++ b/niucloud/app/dict/sys/StorageDict.php @@ -9,14 +9,14 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; /** * 云存储枚举类 - * Class UploadEnum - * @package app\enum\sys + * Class StorageDict + * @package app\dict\sys */ -class StorageEnum +class StorageDict { //本地存储 const LOCAL = 'local'; diff --git a/niucloud/app/enum/sys/UserEnum.php b/niucloud/app/dict/sys/UserDict.php similarity index 81% rename from niucloud/app/enum/sys/UserEnum.php rename to niucloud/app/dict/sys/UserDict.php index a8d91051a..876286a93 100644 --- a/niucloud/app/enum/sys/UserEnum.php +++ b/niucloud/app/dict/sys/UserDict.php @@ -9,9 +9,9 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\enum\sys; +namespace app\dict\sys; -class UserEnum +class UserDict { const ON = 1; @@ -23,8 +23,8 @@ class UserEnum */ public static function getStatus(){ return [ - self::ON => get_lang('enum_user.status_on'),//正常 - self::OFF => get_lang('enum_user.status_off'),//无效 + self::ON => get_lang('dict_user.status_on'),//正常 + self::OFF => get_lang('dict_user.status_off'),//无效 ]; } diff --git a/niucloud/app/enum/common/CommonEnum.php b/niucloud/app/enum/common/CommonEnum.php deleted file mode 100644 index 23c776b92..000000000 --- a/niucloud/app/enum/common/CommonEnum.php +++ /dev/null @@ -1,28 +0,0 @@ - get_lang('enum_sex.unknown'),//未知 - self::MAN => get_lang('enum_sex.man'),//男 - self::WOMAN => get_lang('enum_sex.woman'),//女 - ]; - } -} \ No newline at end of file diff --git a/niucloud/app/enum/member/MemberAccountEnum.php b/niucloud/app/enum/member/MemberAccountEnum.php deleted file mode 100644 index 0edb05676..000000000 --- a/niucloud/app/enum/member/MemberAccountEnum.php +++ /dev/null @@ -1,74 +0,0 @@ - get_lang('enum_member.account_point'), - self::BALANCE => get_lang('enum_member.account_balance'), - self::MONEY => get_lang('enum_member.account_money'), - self::COMMISSION => get_lang('enum_member.account_commission'), - ]; - if (empty($type)) { - return $data; - } - return $data[ $type ] ?? ''; - } - - /** - * 获取账户变动方式 - * @param string $type - * @return array|mixed|string - */ - public static function getFromType($type = '') - { - $type_util = new ConfigUtil(root_path() . str_replace('/', DIRECTORY_SEPARATOR, "app/enum/member/fromtypes")); - $file_data = $type_util->loadFiles(); - $types = []; - foreach ($file_data as $data) { - $types = empty($types) ? $data : array_merge2($types, $data); - } - - if (empty($type)) { - return $types; - } - return $types[ $type ] ?? ''; - } - -} \ No newline at end of file diff --git a/niucloud/app/enum/member/fromtypes/system.php b/niucloud/app/enum/member/fromtypes/system.php deleted file mode 100644 index 319a86ce5..000000000 --- a/niucloud/app/enum/member/fromtypes/system.php +++ /dev/null @@ -1,98 +0,0 @@ - [ - //调整 - 'adjust' => [ - //名称 - 'name' => get_lang('enum_member.account_point_adjust'), - //是否增加 - MemberAccountEnum::INC => 1, - //是否减少 - MemberAccountEnum::DEC => 1, - ], - //充值赠送 - 'recharge_give' => [ - //名称 - 'name' => get_lang('enum_member.account_point_recharge_give'), - //是否增加 - MemberAccountEnum::INC => 1, - //是否减少 - MemberAccountEnum::DEC => 0, - ], - - ], - MemberAccountEnum::BALANCE => [ - //调整 - 'adjust' => [ - //名称 - 'name' => get_lang('enum_member.account_balance_adjust'), - //是否增加 - MemberAccountEnum::INC => 1, - //是否减少 - MemberAccountEnum::DEC => 1, - ], - //充值 - 'recharge' => [ - //名称 - 'name' => get_lang('enum_member.account_balance_recharge'), - //是否增加 - MemberAccountEnum::INC => 1, - //是否减少 - MemberAccountEnum::DEC => 0, - ], - 'recharge_refund' => [ - //名称 - 'name' => get_lang('enum_member.account_balance_recharge_refund'), - //是否增加 - MemberAccountEnum::INC => 0, - //是否减少 - MemberAccountEnum::DEC => 1, - ] - ], - MemberAccountEnum::MONEY => [ - - //活动奖励 - 'award' => [ - //名称 - 'name' => get_lang('enum_member.account_money_award'), - //是否增加 - MemberAccountEnum::INC => 1, - //是否减少 - MemberAccountEnum::DEC => 0, - ], - //提现 - 'cash_out' => [ - //名称 - 'name' => get_lang('enum_member.account_money_cash_out'), - //是否增加 - MemberAccountEnum::INC => 0, - //是否减少 - MemberAccountEnum::DEC => 1, - ], - ], - //会员佣金 - MemberAccountEnum::COMMISSION => [ - - //活动奖励 - 'award' => [ - //名称 - 'name' => get_lang('enum_member.account_commission_award'), - //是否增加 - MemberAccountEnum::INC => 1, - //是否减少 - MemberAccountEnum::DEC => 0, - ], - //提现 - 'cash_out' => [ - //名称 - 'name' => get_lang('enum_member.account_commission_cash_out'), - //是否增加 - MemberAccountEnum::INC => 0, - //是否减少 - MemberAccountEnum::DEC => 1, - ], - ] -]; \ No newline at end of file diff --git a/niucloud/app/event.php b/niucloud/app/event.php index 8fb1c1ba6..8fe66ddfd 100644 --- a/niucloud/app/event.php +++ b/niucloud/app/event.php @@ -1,4 +1,5 @@ [ 'app\listener\member\MemberAccountListener' ], //扫码事件 'scan' => [ 'app\listener\scan\ScanListener' ], + 'addSiteAfter' => [ 'app\listener\site\AddSiteAfterListener' ], /** * 消息相关事件 @@ -64,4 +66,4 @@ $system_event = [ 'subscribe' => [ ], ]; -return (new \core\addon\AddonLoader("Event"))->load($system_event); +return (new DictLoader("Event"))->load($system_event); diff --git a/niucloud/app/install/controller/Index.php b/niucloud/app/install/controller/Index.php index 52529906a..45a44429d 100644 --- a/niucloud/app/install/controller/Index.php +++ b/niucloud/app/install/controller/Index.php @@ -5,10 +5,11 @@ namespace app\install\controller; use app\model\site\Site; use app\model\sys\SysUser; -use app\service\admin\install\InstallArticleService; -use app\service\admin\install\InstallDiyService; use app\service\admin\install\InstallSystemService; +use app\service\admin\site\SiteGroupService; +use app\service\admin\site\SiteService; use think\facade\Cache; +use think\facade\Db; use think\facade\View; @@ -206,44 +207,62 @@ class Index extends BaseInstall public function install() { + + set_time_limit(300); Cache::delete('install_data'); Cache::set('install_status', 0);//进行中 $check = $this->testDb()->getData(); - if ($check[ 'code' ] != 200) { + if ($check[ 'code' ] != 1) { $this->setSuccessLog([ $check[ 'data' ][ 'message' ], 'error' ]); return fail($check[ 'data' ][ 'message' ]); } - $site_name = input('site_name', ""); + $admin_name = input('admin_name', ""); $username = input('username', ""); $password = input('password', ""); $password2 = input('password2', ""); - if ($site_name == '' || $username == '' || $password == '') { + $site_name = input('site_name', ""); + $site_username = input('site_username', ""); + $site_password = input('site_password', ""); + $site_password2 = input('site_password2', ""); + + if ($admin_name == '' || $username == '' || $password == '') { $this->setSuccessLog([ '平台信息不能为空', 'error' ]); return fail('平台信息不能为空!'); } if ($password != $password2) { - $this->setSuccessLog([ '两次密码输入不一样，请重新输入', 'error' ]); - return fail('两次密码输入不一样，请重新输入'); + $this->setSuccessLog([ '平台两次密码输入不一样，请重新输入', 'error' ]); + return fail('平台两次密码输入不一样，请重新输入'); + } + + if ($site_name == '' || $site_username == '' || $site_password == '') { + $this->setSuccessLog([ '平台信息不能为空', 'error' ]); + return fail('平台信息不能为空!'); + } + + if ($site_password != $site_password2) { + $this->setSuccessLog([ '站点两次密码输入不一样，请重新输入', 'error' ]); + return fail('站点两次密码输入不一样，请重新输入'); } try { //配置写入 $res = $this->installConfig(input())->getData(); - if ($res[ 'code' ] != 200) { + if ($res[ 'code' ] != 1) { $this->setSuccessLog([ $res[ 'msg' ], 'error' ]); return fail($res[ 'msg' ]); } //数据库 $res = $this->installSql(input())->getData(); - if ($res[ 'code' ] != 200) { + if ($res[ 'code' ] != 1) { $this->setSuccessLog([ $res[ 'msg' ], 'error' ]); return fail($res[ 'msg' ]); } + Cache::set('install_status', 1);//成功 return success(); } catch (\Exception $e) { @@ -255,16 +274,29 @@ class Index extends BaseInstall public function initData() { $this->checkLock(); - $site_name = input('site_name', ""); + $admin_name = input('admin_name', ""); $username = input('username', ""); $password = input('password', ""); $password2 = input('password2', ""); - if ($site_name == '' || $username == '' || $password == '') { + + $site_name = input('site_name', ""); + $site_username = input('site_username', ""); + $site_password = input('site_password', ""); + $site_password2 = input('site_password2', ""); + if ($admin_name == '' || $username == '' || $password == '') { return fail('平台信息不能为空!'); } if ($password != $password2) { - return fail('两次密码输入不一样，请重新输入'); + return fail('平台两次密码输入不一样，请重新输入'); + } + + if ($site_name == '' || $site_username == '' || $site_password == '') { + return fail('平台信息不能为空!'); + } + + if ($site_password != $site_password2) { + return fail('站点两次密码输入不一样，请重新输入'); } try { @@ -282,28 +314,27 @@ class Index extends BaseInstall 'password' => create_password($password), ]); } - - $site = ( new Site() )->where([ [ 'site_id', '=', 1 ] ])->findOrEmpty(); + ( new Site() )->where([ [ 'site_id', '=', 1 ] ])->update(['site_id' => 0]); + $site = ( new Site() )->where([ [ 'site_id', '=', 0 ] ])->findOrEmpty(); if (!$site->isEmpty()) { - $user->save([ - 'site_name' => $site_name, + $site->save([ + 'site_name' => $admin_name, ]); } + //修改自增主键默认值 + Db::execute("alter table ".env('database.prefix', '')."site auto_increment = 1"); + //获取默认套餐 + $group_id = (new SiteGroupService())->addAllMenuGroup(); - // 初始化自定义页面数据 - $res = ( new InstallDiyService() )->install([ 'site_id' => $site->site_id ]); - if (!$res) { - $this->setSuccessLog([ '自定义页面初始化失败', 'error' ]); - return fail('自定义页面初始化失败'); - } - - // 初始化文章数据 - $res = ( new InstallArticleService() )->install([ 'site_id' => $site->site_id ]); - if (!$res) { - $this->setSuccessLog([ '文章初始化失败', 'error' ]); - return fail('文章初始化失败'); - } - + $data = [ + 'site_name' => $site_name, + 'real_name' => '', + 'group_id' => $group_id, + 'expire_time' => 0, + 'username' => $site_username, + 'password' => $site_password, + ]; + (new SiteService())->add($data); $fp = fopen($this->lock_file, "w"); if ($fp == false) { $this->setSuccessLog([ "写入失败，请检查目录" . dirname(dirname(__FILE__)) . "是否可写入！'", 'error' ]); @@ -313,6 +344,7 @@ class Index extends BaseInstall fwrite($fp, '已安装'); fclose($fp); Cache::set('install_status', 2);//成功 +// Cache::tag(MenuService::$cache_tag_name)->clear(); return success(); } catch (\Exception $e) { $this->setSuccessLog([ '安装失败' . $e->getMessage(), 'error' ]); @@ -368,7 +400,7 @@ class Index extends BaseInstall //导入SQL并执行。 $get_sql_data = file_get_contents($file_name); $sql_query = $this->getSqlQuery($get_sql_data); - @mysqli_query($conn, "SET NAMES utf8"); + @mysqli_query($conn, "SET NAMES utf8mb4"); $query_count = count($sql_query); for ($i = 0; $i < $query_count; $i++) { diff --git a/niucloud/app/install/source/database.sql b/niucloud/app/install/source/database.sql index 04fc24658..103663038 100644 --- a/niucloud/app/install/source/database.sql +++ b/niucloud/app/install/source/database.sql @@ -1,5 +1,4 @@ - -SET NAMES 'utf8'; +SET NAMES 'utf8mb4'; DROP TABLE IF EXISTS addon; @@ -35,7 +34,7 @@ DROP TABLE IF EXISTS member_label; DROP TABLE IF EXISTS member_level; -DROP TABLE IF EXISTS order; +DROP TABLE IF EXISTS `order`; DROP TABLE IF EXISTS order_item; @@ -89,31 +88,37 @@ DROP TABLE IF EXISTS wechat_media; DROP TABLE IF EXISTS wechat_reply; - +-- +-- `ns_wechat_reply` +-- CREATE TABLE wechat_reply ( id int(10) UNSIGNED NOT NULL AUTO_INCREMENT, name varchar(64) NOT NULL DEFAULT '' COMMENT '规则名称', site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', keyword varchar(64) NOT NULL DEFAULT '' COMMENT '关键词', reply_type tinyint(4) NOT NULL COMMENT '回复类型 subscribe-关注回复 keyword-关键字回复 default-默认回复', - matching_type tinyint(4) UNSIGNED NOT NULL DEFAULT 1 COMMENT '匹配方式：1-全匹配；2-模糊匹配', - content_type tinyint(4) UNSIGNED NOT NULL DEFAULT 1 COMMENT '内容类型：1-文本', + matching_type tinyint(3) UNSIGNED NOT NULL DEFAULT 1 COMMENT '匹配方式：1-全匹配；2-模糊匹配', + content_type tinyint(3) UNSIGNED NOT NULL DEFAULT 1 COMMENT '内容类型：1-文本', content text NOT NULL COMMENT '回复内容', - status tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '启动状态：1-启动；0-关闭', - sort int(11) UNSIGNED NOT NULL DEFAULT 50 COMMENT '排序', + status tinyint(3) UNSIGNED NOT NULL DEFAULT 0 COMMENT '启动状态：1-启动；0-关闭', + sort int(10) UNSIGNED NOT NULL DEFAULT 50 COMMENT '排序', create_time int(11) NOT NULL COMMENT '创建时间', update_time int(11) NOT NULL COMMENT '更新时间', delete_time int(11) NOT NULL COMMENT '删除时间', PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 16384, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '公众号消息回调表'; -ALTER TABLE wechat_reply ADD INDEX keyword (keyword, reply_type); - +ALTER TABLE wechat_reply +ADD INDEX keyword (keyword, reply_type); +-- +-- `ns_wechat_media` +-- CREATE TABLE wechat_media ( id int(11) NOT NULL AUTO_INCREMENT, site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', @@ -125,13 +130,17 @@ CREATE TABLE wechat_media ( PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 1872, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '微信素材表'; -ALTER TABLE wechat_media ADD INDEX type (type, site_id); - +ALTER TABLE wechat_media +ADD INDEX type (type, site_id); +-- +-- `ns_wechat_fans` +-- CREATE TABLE wechat_fans ( fans_id int(11) NOT NULL AUTO_INCREMENT COMMENT '粉丝ID', site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', @@ -156,15 +165,20 @@ CREATE TABLE wechat_fans ( PRIMARY KEY (fans_id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 5461, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '微信粉丝列表'; -ALTER TABLE wechat_fans ADD INDEX openid (openid, site_id); - -ALTER TABLE wechat_fans ADD INDEX unionid (unionid, site_id); +ALTER TABLE wechat_fans +ADD INDEX openid (openid, site_id); +ALTER TABLE wechat_fans +ADD INDEX unionid (unionid, site_id); +-- +-- `ns_sys_user_role` +-- CREATE TABLE sys_user_role ( id int(11) NOT NULL AUTO_INCREMENT, uid int(11) NOT NULL DEFAULT 0 COMMENT '用户id', @@ -175,177 +189,216 @@ CREATE TABLE sys_user_role ( PRIMARY KEY (id) ) ENGINE = INNODB, -AUTO_INCREMENT = 2, +AVG_ROW_LENGTH = 481, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '用户权限表'; -ALTER TABLE sys_user_role ADD INDEX create_time (create_time); +ALTER TABLE sys_user_role +ADD INDEX create_time (create_time); -ALTER TABLE sys_user_role ADD INDEX site_id (site_id); - -ALTER TABLE sys_user_role ADD INDEX uid (uid); +ALTER TABLE sys_user_role +ADD INDEX site_id (site_id); +ALTER TABLE sys_user_role +ADD INDEX uid (uid); +-- +-- `ns_sys_user_log` +-- CREATE TABLE sys_user_log ( id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '管理员操作记录ID', ip varchar(16) NOT NULL DEFAULT '' COMMENT '登录IP', site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - uid int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '管理员id', + uid int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '管理员id', username varchar(64) NOT NULL DEFAULT '' COMMENT '管理员姓名', url varchar(128) NOT NULL DEFAULT '' COMMENT '链接', params text DEFAULT NULL COMMENT '参数', type varchar(32) NOT NULL DEFAULT '' COMMENT '请求方式', - create_time int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '操作时间', + create_time int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '操作时间', PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 857, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '管理员操作记录表', ROW_FORMAT = COMPACT; -ALTER TABLE sys_user_log ADD INDEX create_time (create_time); +ALTER TABLE sys_user_log +ADD INDEX create_time (create_time); -ALTER TABLE sys_user_log ADD INDEX site_id (site_id); - -ALTER TABLE sys_user_log ADD INDEX uid (uid); +ALTER TABLE sys_user_log +ADD INDEX site_id (site_id); +ALTER TABLE sys_user_log +ADD INDEX uid (uid); +-- +-- `ns_sys_user` +-- CREATE TABLE sys_user ( - uid smallint(6) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '系统用户ID', + uid smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '系统用户ID', username varchar(255) NOT NULL DEFAULT '' COMMENT '用户账号', head_img varchar(255) NOT NULL DEFAULT '', password varchar(100) NOT NULL DEFAULT '' COMMENT '用户密码', real_name varchar(16) NOT NULL DEFAULT '' COMMENT '实际姓名', last_ip varchar(16) NOT NULL DEFAULT '' COMMENT '最后一次登录ip', - last_time int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '最后一次登录时间', - create_time int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '添加时间', - login_count int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '登录次数', - status tinyint(4) UNSIGNED NOT NULL DEFAULT 1 COMMENT '后台管理员状态 1有效0无效', - is_del tinyint(4) UNSIGNED NOT NULL DEFAULT 0, + last_time int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '最后一次登录时间', + create_time int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '添加时间', + login_count int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '登录次数', + status tinyint(3) UNSIGNED NOT NULL DEFAULT 1 COMMENT '后台管理员状态 1有效0无效', + is_del tinyint(3) UNSIGNED NOT NULL DEFAULT 0, delete_time tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除时间', update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', PRIMARY KEY (uid), INDEX uid (uid) ) ENGINE = INNODB, -AUTO_INCREMENT = 2, +AVG_ROW_LENGTH = 372, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '后台管理员表', ROW_FORMAT = COMPACT; -ALTER TABLE sys_user ADD INDEX delete_time (delete_time); +ALTER TABLE sys_user +ADD INDEX delete_time (delete_time); -ALTER TABLE sys_user ADD INDEX is_del (is_del); +ALTER TABLE sys_user +ADD INDEX is_del (is_del); -ALTER TABLE sys_user ADD INDEX password (password); +ALTER TABLE sys_user +ADD INDEX password (password); -ALTER TABLE sys_user ADD INDEX update_time (update_time); - -ALTER TABLE sys_user ADD INDEX username (username (191)); +ALTER TABLE sys_user +ADD INDEX update_time (update_time); +ALTER TABLE sys_user +ADD INDEX username (username (191)); +-- +-- `ns_sys_role` +-- CREATE TABLE sys_role ( - role_id int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '角色id', + role_id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '角色id', site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', role_name varchar(255) NOT NULL DEFAULT '' COMMENT '角色名称', rules text DEFAULT NULL COMMENT '角色权限(menus_id)', - status tinyint(4) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态', + status tinyint(3) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态', create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', update_time int(11) NOT NULL DEFAULT 0 COMMENT '最后修改时间', PRIMARY KEY (role_id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 1638, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '角色表', ROW_FORMAT = COMPACT; -ALTER TABLE sys_role ADD INDEX site_id (site_id); - -ALTER TABLE sys_role ADD INDEX status (status); +ALTER TABLE sys_role +ADD INDEX site_id (site_id); +ALTER TABLE sys_role +ADD INDEX status (status); +-- +-- `ns_sys_notice_sms_log` +-- CREATE TABLE sys_notice_sms_log ( - id INT(11) NOT NULL AUTO_INCREMENT COMMENT 'id', - site_id INT(11) NOT NULL DEFAULT 0, - mobile VARCHAR(11) NOT NULL DEFAULT '' COMMENT '手机号码', - sms_type VARCHAR(32) NOT NULL DEFAULT '' COMMENT '发送关键字（注册、找回密码）', - `key` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '发送关键字（注册、找回密码）', - template_id VARCHAR(50) NOT NULL DEFAULT '', - content VARCHAR(255) NOT NULL DEFAULT '' COMMENT '发送内容', - params VARCHAR(255) NOT NULL DEFAULT '' COMMENT '数据参数', - status VARCHAR(32) NOT NULL DEFAULT 'sending' COMMENT '发送状态：sending-发送中；success-发送成功；fail-发送失败', - result TEXT DEFAULT NULL COMMENT '短信结果', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - send_time INT(11) NOT NULL DEFAULT 0 COMMENT '发送时间', - update_time INT(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - delete_time INT(11) NOT NULL DEFAULT 0 COMMENT '删除时间', + id int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', + site_id int(11) NOT NULL DEFAULT 0, + mobile varchar(11) NOT NULL DEFAULT '' COMMENT '手机号码', + sms_type varchar(32) NOT NULL DEFAULT '' COMMENT '发送关键字（注册、找回密码）', + `key` varchar(32) NOT NULL DEFAULT '' COMMENT '发送关键字（注册、找回密码）', + template_id varchar(50) NOT NULL DEFAULT '', + content varchar(255) NOT NULL DEFAULT '' COMMENT '发送内容', + params varchar(255) NOT NULL DEFAULT '' COMMENT '数据参数', + status varchar(32) NOT NULL DEFAULT 'sending' COMMENT '发送状态：sending-发送中；success-发送成功；fail-发送失败', + result text DEFAULT NULL COMMENT '短信结果', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + send_time int(11) NOT NULL DEFAULT 0 COMMENT '发送时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + delete_time int(11) NOT NULL DEFAULT 0 COMMENT '删除时间', PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 496, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '短信发送表'; - +-- +-- `ns_sys_notice_log` +-- CREATE TABLE sys_notice_log ( - id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '通知记录ID', - site_id INT(11) NOT NULL DEFAULT 0 COMMENT '站点id', - `key` VARCHAR(255) DEFAULT '' COMMENT '消息key', - notice_type VARCHAR(50) DEFAULT 'sms' COMMENT '消息类型（sms,wechat.weapp）', - uid INT(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '通知的用户id', - member_id INT(11) NOT NULL DEFAULT 0 COMMENT '消息的会员id', - nickname VARCHAR(255) NOT NULL DEFAULT '' COMMENT '接收人用户昵称或姓名', - receiver VARCHAR(255) NOT NULL DEFAULT '' COMMENT '接收人（对应手机号，openid）', - content TEXT DEFAULT NULL COMMENT '消息数据', - is_click TINYINT(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '点击次数', - is_visit TINYINT(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '访问次数', - visit_time INT(11) NOT NULL DEFAULT 0 COMMENT '访问时间', - create_time INT(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '消息时间', - result VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '结果', - params TEXT DEFAULT NULL, + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '通知记录ID', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + `key` varchar(255) DEFAULT '' COMMENT '消息key', + notice_type varchar(50) DEFAULT 'sms' COMMENT '消息类型（sms,wechat.weapp）', + uid int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '通知的用户id', + member_id int(11) NOT NULL DEFAULT 0 COMMENT '消息的会员id', + nickname varchar(255) NOT NULL DEFAULT '' COMMENT '接收人用户昵称或姓名', + receiver varchar(255) NOT NULL DEFAULT '' COMMENT '接收人（对应手机号，openid）', + content text DEFAULT NULL COMMENT '消息数据', + is_click tinyint(3) UNSIGNED NOT NULL DEFAULT 0 COMMENT '点击次数', + is_visit tinyint(3) UNSIGNED NOT NULL DEFAULT 0 COMMENT '访问次数', + visit_time int(11) NOT NULL DEFAULT 0 COMMENT '访问时间', + create_time int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '消息时间', + result varchar(1000) NOT NULL DEFAULT '' COMMENT '结果', + params text DEFAULT NULL, PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 712, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, -COMMENT = '通知记录表'; +COMMENT = '通知记录表', +ROW_FORMAT = COMPACT; -ALTER TABLE sys_notice_log ADD INDEX member_id(member_id); +ALTER TABLE sys_notice_log +ADD INDEX member_id (member_id); -ALTER TABLE sys_notice_log ADD INDEX message_key(`key`(191)); - -ALTER TABLE sys_notice_log ADD INDEX uid(uid); +ALTER TABLE sys_notice_log +ADD INDEX message_key (`key` (191)); +ALTER TABLE sys_notice_log +ADD INDEX uid (uid); +-- +-- `ns_sys_notice` +-- CREATE TABLE sys_notice ( - id INT(11) NOT NULL AUTO_INCREMENT, - site_id INT(11) NOT NULL DEFAULT 0 COMMENT '站点ID', - `key` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '标识', - sms_content TEXT DEFAULT NULL COMMENT '短信配置参数', - is_wechat TINYINT(4) NOT NULL DEFAULT 0 COMMENT '公众号模板消息（0：关闭，1：开启）', - is_weapp TINYINT(4) NOT NULL DEFAULT 0 COMMENT '小程序订阅消息（0：关闭，1：开启）', - is_sms TINYINT(4) NOT NULL DEFAULT 0 COMMENT '发送短信（0：关闭，1：开启）', - wechat_template_id VARCHAR(255) NOT NULL DEFAULT '' COMMENT '微信模版消息id', - weapp_template_id VARCHAR(255) NOT NULL DEFAULT '' COMMENT '微信小程序订阅消息id', - sms_id VARCHAR(255) NOT NULL DEFAULT '' COMMENT '短信id（对应短信配置）', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '添加时间', - wechat_first VARCHAR(255) NOT NULL DEFAULT '' COMMENT '微信头部', - wechat_remark VARCHAR(255) NOT NULL DEFAULT '' COMMENT '微信说明', + id int(11) NOT NULL AUTO_INCREMENT, + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点ID', + `key` varchar(50) NOT NULL DEFAULT '' COMMENT '标识', + sms_content text DEFAULT NULL COMMENT '短信配置参数', + is_wechat tinyint(4) NOT NULL DEFAULT 0 COMMENT '公众号模板消息（0：关闭，1：开启）', + is_weapp tinyint(4) NOT NULL DEFAULT 0 COMMENT '小程序订阅消息（0：关闭，1：开启）', + is_sms tinyint(4) NOT NULL DEFAULT 0 COMMENT '发送短信（0：关闭，1：开启）', + wechat_template_id varchar(255) NOT NULL DEFAULT '' COMMENT '微信模版消息id', + weapp_template_id varchar(255) NOT NULL DEFAULT '' COMMENT '微信小程序订阅消息id', + sms_id varchar(255) NOT NULL DEFAULT '' COMMENT '短信id（对应短信配置）', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', + wechat_first varchar(255) NOT NULL DEFAULT '' COMMENT '微信头部', + wechat_remark varchar(255) NOT NULL DEFAULT '' COMMENT '微信说明', PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 2048, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, -COMMENT = '通知模型'; +COMMENT = '通知模型', +ROW_FORMAT = COMPACT; -ALTER TABLE sys_notice ADD INDEX message_key(`key`, site_id); +ALTER TABLE sys_notice +ADD INDEX message_key (`key`, site_id); +-- +-- `ns_sys_menu` +-- CREATE TABLE sys_menu ( - id int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '菜单ID', + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '菜单ID', app_type varchar(255) NOT NULL DEFAULT 'admin' COMMENT '应用类型', menu_name varchar(32) NOT NULL DEFAULT '' COMMENT '菜单名称', menu_key varchar(255) NOT NULL DEFAULT '' COMMENT '菜单标识（菜单输入，接口自动生成）', @@ -357,26 +410,32 @@ CREATE TABLE sys_menu ( view_path varchar(255) NOT NULL DEFAULT '' COMMENT '菜单文件地址', methods varchar(10) NOT NULL DEFAULT '' COMMENT '提交方式POST GET PUT DELETE', sort tinyint(4) NOT NULL DEFAULT 1 COMMENT '排序', - status tinyint(4) UNSIGNED NOT NULL DEFAULT 1 COMMENT '正常，禁用（禁用后不允许访问）', + status tinyint(3) UNSIGNED NOT NULL DEFAULT 1 COMMENT '正常，禁用（禁用后不允许访问）', is_show tinyint(4) NOT NULL DEFAULT 1 COMMENT '是否显示', create_time int(11) NOT NULL DEFAULT 0, delete_time int(11) NOT NULL DEFAULT 0, - addon VARCHAR(255) NOT NULL DEFAULT '' COMMENT '所属插件', + addon varchar(255) NOT NULL DEFAULT '' COMMENT '所属插件', PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 406, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '菜单表', ROW_FORMAT = COMPACT; -ALTER TABLE sys_menu ADD INDEX is_show (is_show); +ALTER TABLE sys_menu +ADD INDEX is_show (is_show); -ALTER TABLE sys_menu ADD INDEX menu_key (menu_key (191), app_type (191)); - -ALTER TABLE sys_menu ADD INDEX parent_key (parent_key (191)); +ALTER TABLE sys_menu +ADD INDEX menu_key (menu_key (191), app_type (191)); +ALTER TABLE sys_menu +ADD INDEX parent_key (parent_key (191)); +-- +-- `ns_sys_cron_task` +-- CREATE TABLE sys_cron_task ( id int(11) NOT NULL AUTO_INCREMENT, site_id int(11) NOT NULL DEFAULT 0, @@ -398,31 +457,38 @@ CREATE TABLE sys_cron_task ( PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 8192, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = ' 系统任务'; - +-- +-- `ns_sys_config` +-- CREATE TABLE sys_config ( - id int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', config_key varchar(255) NOT NULL DEFAULT '' COMMENT '配置项关键字', value text DEFAULT NULL COMMENT '配置值json', status tinyint(4) NOT NULL DEFAULT 1 COMMENT '是否启用 1启用 0不启用', create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', update_time int(11) NOT NULL DEFAULT 0 COMMENT '修改时间', - addon VARCHAR(255) NOT NULL DEFAULT '' COMMENT '所属插件', + addon varchar(255) NOT NULL DEFAULT '' COMMENT '所属插件', PRIMARY KEY (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 910, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '系统配置表', ROW_FORMAT = COMPACT; -ALTER TABLE sys_config ADD INDEX config_key (config_key (191), site_id); - +ALTER TABLE sys_config +ADD INDEX config_key (config_key (191), site_id); +-- +-- `ns_sys_attachment_category` +-- CREATE TABLE sys_attachment_category ( id int(11) NOT NULL AUTO_INCREMENT, site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', @@ -435,16 +501,21 @@ CREATE TABLE sys_attachment_category ( UNIQUE INDEX id (id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 3276, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '附件分类表', ROW_FORMAT = COMPACT; -ALTER TABLE sys_attachment_category ADD INDEX pid (pid); - -ALTER TABLE sys_attachment_category ADD INDEX sort (sort); +ALTER TABLE sys_attachment_category +ADD INDEX pid (pid); +ALTER TABLE sys_attachment_category +ADD INDEX sort (sort); +-- +-- `ns_sys_attachment` +-- CREATE TABLE sys_attachment ( att_id int(11) NOT NULL AUTO_INCREMENT, site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', @@ -462,20 +533,26 @@ CREATE TABLE sys_attachment ( PRIMARY KEY (att_id) ) ENGINE = INNODB, +AVG_ROW_LENGTH = 702, CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '附件管理表', ROW_FORMAT = COMPACT; -ALTER TABLE sys_attachment ADD INDEX cate_id (cate_id); +ALTER TABLE sys_attachment +ADD INDEX cate_id (cate_id); -ALTER TABLE sys_attachment ADD INDEX create_time (create_time); - -ALTER TABLE sys_attachment ADD INDEX site_id (site_id); +ALTER TABLE sys_attachment +ADD INDEX create_time (create_time); +ALTER TABLE sys_attachment +ADD INDEX site_id (site_id); +-- +-- `ns_sys_area` +-- CREATE TABLE sys_area ( - id int(11) UNSIGNED NOT NULL AUTO_INCREMENT, + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT, pid int(11) NOT NULL DEFAULT 0 COMMENT '父级', name varchar(50) NOT NULL DEFAULT '' COMMENT '名称', shortname varchar(30) NOT NULL DEFAULT '' COMMENT '简称', @@ -493,15 +570,869 @@ CHARACTER SET utf8mb4, COLLATE utf8mb4_general_ci, COMMENT = '地址表'; -ALTER TABLE sys_area ADD INDEX area (name, shortname); +ALTER TABLE sys_area +ADD INDEX area (name, shortname); -ALTER TABLE sys_area ADD INDEX level (level, sort, status); +ALTER TABLE sys_area +ADD INDEX level (level, sort, status); -ALTER TABLE sys_area ADD INDEX longitude (longitude, latitude); +ALTER TABLE sys_area +ADD INDEX longitude (longitude, latitude); -ALTER TABLE sys_area ADD INDEX pid (pid); +ALTER TABLE sys_area +ADD INDEX pid (pid); +-- +-- `ns_sys_agreement` +-- +CREATE TABLE sys_agreement ( + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + agreement_key varchar(255) NOT NULL DEFAULT '' COMMENT '协议关键字', + title varchar(255) NOT NULL DEFAULT '' COMMENT '协议标题', + content text DEFAULT NULL COMMENT '协议内容', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '修改时间', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 6553, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '协议表'; +ALTER TABLE sys_agreement +ADD INDEX agreement_key (agreement_key); + +ALTER TABLE sys_agreement +ADD INDEX site_id (site_id); + +-- +-- `ns_site_group` +-- +CREATE TABLE site_group ( + group_id int(11) NOT NULL AUTO_INCREMENT COMMENT '分组ID', + group_name varchar(255) NOT NULL DEFAULT '' COMMENT '分组名称', + group_desc text DEFAULT NULL COMMENT '分组介绍', + group_roles text DEFAULT NULL COMMENT '分组权限', + app_type varchar(255) NOT NULL DEFAULT '' COMMENT '应用类型', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (group_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 2048, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '店铺分组（分组权限）'; + +-- +-- `ns_site` +-- +CREATE TABLE site ( + site_id int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + site_name varchar(50) NOT NULL DEFAULT '' COMMENT '站点名称', + group_id int(11) NOT NULL DEFAULT 0 COMMENT '分组ID(0:不限制)', + keywords varchar(255) NOT NULL DEFAULT '' COMMENT '关键字', + app_type varchar(50) NOT NULL DEFAULT 'admin' COMMENT '站点类型', + logo varchar(255) NOT NULL DEFAULT '' COMMENT '站点logo', + `desc` varchar(255) NOT NULL DEFAULT '' COMMENT '简介', + status tinyint(4) NOT NULL DEFAULT 1 COMMENT '状态 1-正常 0-体验期 2-已到期', + latitude varchar(255) NOT NULL DEFAULT '' COMMENT '纬度', + longitude varchar(255) NOT NULL DEFAULT '' COMMENT '经度', + province_id int(11) NOT NULL DEFAULT 0 COMMENT '省', + city_id int(11) NOT NULL DEFAULT 0 COMMENT '市', + district_id int(11) NOT NULL DEFAULT 0 COMMENT '区', + address varchar(255) NOT NULL DEFAULT '' COMMENT '详细地址', + full_address varchar(255) NOT NULL DEFAULT '' COMMENT '完整地址', + phone varchar(255) NOT NULL DEFAULT '' COMMENT '客服电话', + business_hours varchar(255) NOT NULL DEFAULT '' COMMENT '营业时间', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + expire_time int(11) NOT NULL DEFAULT 0 COMMENT '到期时间（如果是0 无限期）', + front_end_name varchar(50) NOT NULL DEFAULT '' COMMENT '前台名称', + front_end_logo varchar(255) NOT NULL DEFAULT '' COMMENT '前台logo', + icon varchar(255) NOT NULL DEFAULT '' COMMENT '网站图标', + member_no varchar(255) NOT NULL DEFAULT '0' COMMENT '最大会员码值', + PRIMARY KEY (site_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 1365, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '站点表', +ROW_FORMAT = COMPACT; + +ALTER TABLE site +ADD INDEX create_time (create_time); + +ALTER TABLE site +ADD INDEX group_id (group_id); + +-- +-- `ns_pay_transfer` +-- +CREATE TABLE pay_transfer ( + id int(11) NOT NULL AUTO_INCREMENT, + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + trade_type varchar(255) NOT NULL DEFAULT '' COMMENT '业务类型', + transfer_no varchar(50) NOT NULL DEFAULT '' COMMENT '转账单号', + main_id int(11) NOT NULL DEFAULT 0 COMMENT '会员id', + main_type varchar(255) NOT NULL DEFAULT '' COMMENT '主体类型', + transfer_type varchar(20) NOT NULL DEFAULT '0' COMMENT '转账类型', + transfer_realname varchar(50) NOT NULL DEFAULT '' COMMENT '联系人名称', + transfer_mobile varchar(11) NOT NULL DEFAULT '' COMMENT '手机号', + transfer_bank varchar(255) NOT NULL DEFAULT '' COMMENT '银行名称', + transfer_account varchar(255) NOT NULL DEFAULT '' COMMENT '收款账号', + transfer_voucher varchar(255) NOT NULL DEFAULT '' COMMENT '凭证', + transfer_remark varchar(255) NOT NULL DEFAULT '' COMMENT '凭证说明', + transfer_fail_reason varchar(255) NOT NULL DEFAULT '' COMMENT '失败原因', + transfer_status varchar(20) NOT NULL DEFAULT '' COMMENT '转账状态', + money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '转账金额', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '申请时间', + transfer_time int(11) NOT NULL DEFAULT 0 COMMENT '转账时间', + update_time int(11) NOT NULL DEFAULT 0, + openid varchar(50) NOT NULL DEFAULT '', + remark varchar(255) NOT NULL, + batch_id varchar(500) NOT NULL DEFAULT '' COMMENT '转账批次id', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 3276, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '转账表'; + +ALTER TABLE pay_transfer +ADD INDEX member_withdraw_apply_time (create_time); + +ALTER TABLE pay_transfer +ADD INDEX member_withdraw_audit_time (transfer_time); + +ALTER TABLE pay_transfer +ADD INDEX member_withdraw_site_id (site_id, main_id); + +ALTER TABLE pay_transfer +ADD INDEX member_withdraw_status (transfer_status); + +-- +-- `ns_pay_refund` +-- +CREATE TABLE pay_refund ( + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + refund_no varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '退款单号', + out_trade_no varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '支付流水号', + type varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '支付方式', + channel varchar(50) NOT NULL DEFAULT '' COMMENT '支付渠道', + money decimal(10, 2) NOT NULL COMMENT '支付金额', + reason varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '退款原因', + status varchar(255) NOT NULL DEFAULT '0' COMMENT '支付状态（0.待退款 1. 退款中中 2. 已退款 -1已关闭）', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + refund_time int(11) NOT NULL DEFAULT 0 COMMENT '支付时间', + close_time int(11) NOT NULL DEFAULT 0 COMMENT '关闭时间', + fail_reason varchar(255) NOT NULL COMMENT '失败原因', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 5461, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '支付记录表'; + +-- +-- `ns_pay_channel` +-- +CREATE TABLE pay_channel ( + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + type varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '支付类型', + channel varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '支付渠道', + config text NOT NULL COMMENT '支付配置', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '修改时间', + status int(11) NOT NULL DEFAULT 0 COMMENT '是否启用', + sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 496, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '支付渠道配置表'; + +-- +-- `ns_pay` +-- +CREATE TABLE pay ( + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + main_id int(11) NOT NULL DEFAULT 0 COMMENT '支付会员id', + out_trade_no varchar(255) NOT NULL DEFAULT '' COMMENT '支付流水号', + trade_type varchar(255) NOT NULL DEFAULT '' COMMENT '业务类型', + trade_no varchar(255) NOT NULL DEFAULT '' COMMENT '交易单号', + body varchar(1000) NOT NULL DEFAULT '' COMMENT '支付主体', + money decimal(10, 2) NOT NULL COMMENT '支付金额', + voucher varchar(255) NOT NULL DEFAULT '' COMMENT '支付票据', + status int(11) NOT NULL DEFAULT 0 COMMENT '支付状态（0.待支付 1. 支付中 2. 已支付 -1已取消）', + json varchar(255) NOT NULL DEFAULT '' COMMENT '支付扩展用支付信息', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + pay_time int(11) NOT NULL DEFAULT 0 COMMENT '支付时间', + cancel_time int(11) NOT NULL DEFAULT 0 COMMENT '关闭时间', + type varchar(255) NOT NULL DEFAULT '' COMMENT '支付方式', + mch_id varchar(50) NOT NULL DEFAULT '' COMMENT '商户收款账号', + main_type varchar(255) NOT NULL DEFAULT '', + channel varchar(50) NOT NULL DEFAULT '' COMMENT '支付渠道', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 16384, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '支付记录表'; + +ALTER TABLE pay +ADD UNIQUE INDEX UK_ns_pay_out_trade_no (out_trade_no); + +-- +-- `ns_order_log` +-- +CREATE TABLE order_log ( + id int(11) NOT NULL AUTO_INCREMENT, + order_id int(11) NOT NULL DEFAULT 0 COMMENT '订单id', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + action varchar(255) NOT NULL DEFAULT '' COMMENT '操作内容', + uid int(11) NOT NULL DEFAULT 0 COMMENT '操作人id', + nick_name varchar(50) NOT NULL DEFAULT '' COMMENT '操作人名称', + order_status int(11) NOT NULL DEFAULT 0 COMMENT '订单状态，操作后', + action_way bigint(20) NOT NULL DEFAULT 2 COMMENT '操作类型1买家2卖家 3 系统任务', + order_status_name varchar(255) NOT NULL DEFAULT '' COMMENT '订单状态名称，操作后', + action_time int(11) NOT NULL DEFAULT 0 COMMENT '操作时间', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 223, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '订单操作记录表', +ROW_FORMAT = COMPACT; + +-- +-- `ns_order_item_refund` +-- +CREATE TABLE order_item_refund ( + refund_id int(11) NOT NULL AUTO_INCREMENT, + order_item_id int(11) NOT NULL DEFAULT 0 COMMENT '订单id', + order_id int(11) NOT NULL DEFAULT 0 COMMENT '订单id', + order_no varchar(255) NOT NULL DEFAULT '' COMMENT '订单编号', + refund_no varchar(255) NOT NULL DEFAULT '0' COMMENT '退款单号', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + member_id int(11) NOT NULL DEFAULT 0 COMMENT '会员id', + num decimal(10, 3) NOT NULL DEFAULT 0.000 COMMENT '退货数量', + money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '总退款', + status int(11) NOT NULL DEFAULT 0 COMMENT '退款状态', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + audit_time int(11) NOT NULL DEFAULT 0 COMMENT '审核时间', + transfer_time int(11) NOT NULL DEFAULT 0 COMMENT '转账时间', + item_type varchar(255) NOT NULL DEFAULT '' COMMENT '项目类型', + PRIMARY KEY (refund_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 16384, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '订单退款表', +ROW_FORMAT = COMPACT; + +-- +-- `ns_order_item` +-- +CREATE TABLE order_item ( + order_item_id int(11) NOT NULL AUTO_INCREMENT, + order_id int(11) NOT NULL DEFAULT 0 COMMENT '订单id', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + member_id int(11) NOT NULL DEFAULT 0 COMMENT '购买会员id', + item_id int(11) NOT NULL DEFAULT 0 COMMENT '项目id', + item_type varchar(255) NOT NULL DEFAULT '' COMMENT '项目类型', + item_name varchar(400) NOT NULL DEFAULT '' COMMENT '项目名称', + item_image varchar(2000) NOT NULL DEFAULT '' COMMENT '项目图片', + price decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '项目单价', + num decimal(10, 3) NOT NULL DEFAULT 0.000 COMMENT '购买数量', + item_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '项目总价', + is_refund int(11) NOT NULL DEFAULT 0 COMMENT '是否退款', + refund_no varchar(255) NOT NULL DEFAULT '' COMMENT '退款编号', + refund_status int(11) NOT NULL DEFAULT 0 COMMENT '退款状态', + create_time int(11) NOT NULL DEFAULT 0, + PRIMARY KEY (order_item_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 16384, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '订单商品表', +ROW_FORMAT = COMPACT; + +-- +-- `ns_order` +-- +CREATE TABLE `order` ( + order_id int(11) NOT NULL AUTO_INCREMENT, + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + order_no varchar(50) NOT NULL DEFAULT '' COMMENT '订单编号', + order_from varchar(55) NOT NULL DEFAULT '' COMMENT '订单来源', + order_type varchar(50) NOT NULL DEFAULT '' COMMENT '订单类型', + out_trade_no varchar(50) NOT NULL DEFAULT '' COMMENT '支付流水号', + order_status int(11) NOT NULL DEFAULT 0 COMMENT '订单状态', + refund_status int(11) NOT NULL DEFAULT 0 COMMENT '退款状态', + member_id int(11) NOT NULL DEFAULT 0 COMMENT '会员id', + ip varchar(20) NOT NULL DEFAULT '' COMMENT '会员ip', + member_message varchar(50) NOT NULL DEFAULT '' COMMENT '会员留言信息', + order_item_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '订单项目金额', + order_discount_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '订单优惠金额', + order_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '订单金额', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + pay_time int(11) NOT NULL DEFAULT 0 COMMENT '订单支付时间', + close_time int(11) NOT NULL DEFAULT 0 COMMENT '订单关闭时间', + is_delete int(11) NOT NULL DEFAULT 0 COMMENT '是否删除(针对后台)', + is_enable_refund int(11) NOT NULL DEFAULT 0 COMMENT '是否允许退款', + remark varchar(255) NOT NULL DEFAULT '' COMMENT '商家留言', + invoice_id int(11) NOT NULL DEFAULT 0 COMMENT '发票id，0表示不开发票', + close_reason varchar(255) NOT NULL DEFAULT '' COMMENT '关闭原因', + PRIMARY KEY (order_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 16384, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '订单表', +ROW_FORMAT = COMPACT; + +-- +-- `ns_member_level` +-- +CREATE TABLE member_level ( + level_id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '会员等级', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + level_name varchar(50) NOT NULL DEFAULT '' COMMENT '等级名称', + growth decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '所需成长值', + remark varchar(255) NOT NULL DEFAULT '' COMMENT '备注', + status int(11) NOT NULL DEFAULT 1 COMMENT '状态 0已禁用1已启用', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (level_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 16384, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '会员等级', +ROW_FORMAT = COMPACT; + +ALTER TABLE member_level +ADD INDEX site_id (site_id); + +ALTER TABLE member_level +ADD INDEX status (status); + +-- +-- `ns_member_label` +-- +CREATE TABLE member_label ( + label_id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '标签id', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + label_name varchar(50) NOT NULL DEFAULT '' COMMENT '标签名称', + memo varchar(1000) NOT NULL DEFAULT '' COMMENT '备注', + sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (label_id), + INDEX label_id (label_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 8192, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '会员标签', +ROW_FORMAT = COMPACT; + +ALTER TABLE member_label +ADD INDEX site_id (site_id); + +ALTER TABLE member_label +ADD INDEX sort (sort); + +-- +-- `ns_member_cash_out_account` +-- +CREATE TABLE member_cash_out_account ( + account_id int(11) NOT NULL AUTO_INCREMENT, + site_id int(11) NOT NULL COMMENT '站点id', + member_id int(11) NOT NULL COMMENT '会员id', + account_type varchar(255) NOT NULL DEFAULT '' COMMENT '账户类型', + bank_name varchar(255) NOT NULL DEFAULT '' COMMENT '银行名称', + realname varchar(255) NOT NULL DEFAULT '' COMMENT '真实名称', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '修改时间', + account_no varchar(255) NOT NULL DEFAULT '' COMMENT '提现账户', + PRIMARY KEY (account_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 8192, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '会员提现账户'; + +-- +-- `ns_member_cash_out` +-- +CREATE TABLE member_cash_out ( + id int(11) NOT NULL AUTO_INCREMENT, + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + cash_out_no varchar(50) NOT NULL DEFAULT '' COMMENT '提现交易号', + member_id int(11) NOT NULL DEFAULT 0 COMMENT '会员id', + account_type varchar(255) NOT NULL DEFAULT 'money' COMMENT '提现账户类型', + transfer_type varchar(20) NOT NULL DEFAULT '0' COMMENT '转账提现类型', + transfer_realname varchar(50) NOT NULL DEFAULT '' COMMENT '联系人名称', + transfer_mobile varchar(11) NOT NULL DEFAULT '' COMMENT '手机号', + transfer_bank varchar(255) NOT NULL DEFAULT '' COMMENT '银行名称', + transfer_account varchar(255) NOT NULL DEFAULT '' COMMENT '收款账号', + transfer_fail_reason varchar(255) NOT NULL DEFAULT '' COMMENT '失败原因', + transfer_status varchar(20) NOT NULL DEFAULT '' COMMENT '转账状态', + transfer_time int(11) NOT NULL DEFAULT 0 COMMENT '转账时间', + apply_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '提现申请金额', + rate decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '提现手续费比率', + service_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '提现手续费', + money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '提现到账金额', + audit_time int(11) NOT NULL DEFAULT 0 COMMENT '审核时间', + status int(11) NOT NULL DEFAULT 0 COMMENT '状态1待审核2.待转账3已转账 -1拒绝 -2 已取消', + remark varchar(100) NOT NULL DEFAULT '' COMMENT '备注', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '申请时间', + refuse_reason varchar(100) NOT NULL DEFAULT '' COMMENT '拒绝理由', + update_time int(11) NOT NULL DEFAULT 0, + transfer_no varchar(50) NOT NULL DEFAULT '' COMMENT '转账单号', + cancel_time int(11) NOT NULL DEFAULT 0 COMMENT '取消时间', + final_transfer_type varchar(255) NOT NULL DEFAULT '' COMMENT '转账方式', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 297, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '会员提现表'; + +ALTER TABLE member_cash_out +ADD INDEX member_withdraw_apply_time (create_time); + +ALTER TABLE member_cash_out +ADD INDEX member_withdraw_audit_time (audit_time); + +ALTER TABLE member_cash_out +ADD INDEX member_withdraw_site_id (site_id, member_id); + +ALTER TABLE member_cash_out +ADD INDEX member_withdraw_status (status); + +ALTER TABLE member_cash_out +ADD INDEX member_withdraw_withdraw_no (cash_out_no); + +-- +-- `ns_member_address` +-- +CREATE TABLE member_address ( + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT, + member_id int(11) NOT NULL DEFAULT 0 COMMENT '会员id', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + name varchar(255) NOT NULL DEFAULT '' COMMENT '用户姓名', + mobile varchar(255) NOT NULL DEFAULT '' COMMENT '手机', + telephone varchar(255) NOT NULL DEFAULT '' COMMENT '联系电话', + province_id int(11) NOT NULL DEFAULT 0 COMMENT '省id', + city_id int(11) NOT NULL DEFAULT 0 COMMENT '市id', + district_id int(11) NOT NULL DEFAULT 0 COMMENT '区县id', + community_id int(11) NOT NULL DEFAULT 0 COMMENT '社区id', + address varchar(255) NOT NULL DEFAULT '' COMMENT '地址信息', + full_address varchar(255) NOT NULL DEFAULT '' COMMENT '详细地址信息', + longitude varchar(255) NOT NULL DEFAULT '' COMMENT '经度', + latitude varchar(255) NOT NULL DEFAULT '' COMMENT '纬度', + is_default tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否是默认地址', + type int(11) NOT NULL DEFAULT 1 COMMENT '地址类型 1 普通地址 2 定位地址', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 16384, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '会员收货地址', +ROW_FORMAT = COMPACT; + +ALTER TABLE member_address +ADD INDEX IDX_member_address (member_id, site_id); + +-- +-- `ns_member_account_log` +-- +CREATE TABLE member_account_log ( + id int(10) UNSIGNED NOT NULL AUTO_INCREMENT, + member_id int(11) NOT NULL DEFAULT 0 COMMENT '用户id', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + account_type varchar(255) NOT NULL DEFAULT 'point' COMMENT '账户类型', + account_data decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '账户数据', + account_sum decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '变动后的账户余额', + from_type varchar(255) NOT NULL DEFAULT '' COMMENT '来源类型', + related_id int(11) NOT NULL DEFAULT 0 COMMENT '关联Id', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + memo varchar(255) NOT NULL DEFAULT '' COMMENT '备注信息', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 4096, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '会员账单表', +ROW_FORMAT = COMPACT; + +ALTER TABLE member_account_log +ADD INDEX account_type (account_type (191)); + +ALTER TABLE member_account_log +ADD INDEX create_time (create_time); + +ALTER TABLE member_account_log +ADD INDEX from_type (from_type (191)); + +ALTER TABLE member_account_log +ADD INDEX member_id (member_id); + +-- +-- `ns_member` +-- +CREATE TABLE member ( + member_id int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + member_no varchar(255) NOT NULL DEFAULT '' COMMENT '会员编码', + pid int(11) NOT NULL DEFAULT 0 COMMENT '推广会员id', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + username varchar(255) DEFAULT '' COMMENT '会员用户名', + mobile varchar(20) NOT NULL DEFAULT '' COMMENT '手机号', + password varchar(255) NOT NULL DEFAULT '' COMMENT '会员密码', + nickname varchar(50) NOT NULL DEFAULT '' COMMENT '会员昵称', + headimg varchar(1000) NOT NULL DEFAULT '' COMMENT '会员头像', + member_level int(11) NOT NULL DEFAULT 0 COMMENT '会员等级', + member_label varchar(255) NOT NULL DEFAULT '' COMMENT '会员标签', + wx_openid varchar(255) NOT NULL DEFAULT '' COMMENT '微信用户openid', + weapp_openid varchar(255) NOT NULL DEFAULT '' COMMENT '微信小程序openid', + wx_unionid varchar(255) NOT NULL DEFAULT '' COMMENT '微信unionid', + ali_openid varchar(255) NOT NULL DEFAULT '' COMMENT '支付宝账户id', + douyin_openid varchar(255) NOT NULL DEFAULT '' COMMENT '抖音小程序openid', + register_channel varchar(255) NOT NULL DEFAULT 'H5' COMMENT '注册来源', + register_type varchar(255) NOT NULL DEFAULT '' COMMENT '注册方式', + login_ip varchar(255) NOT NULL DEFAULT '' COMMENT '当前登录ip', + login_type varchar(255) NOT NULL DEFAULT 'h5' COMMENT '当前登录的操作终端类型', + login_channel varchar(255) NOT NULL DEFAULT '', + login_count int(11) NOT NULL DEFAULT 0 COMMENT '登录次数', + login_time int(11) NOT NULL DEFAULT 0 COMMENT '当前登录时间', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '注册时间', + last_visit_time int(11) NOT NULL DEFAULT 0 COMMENT '最后访问时间', + last_consum_time int(11) NOT NULL DEFAULT 0 COMMENT '最后消费时间', + sex tinyint(4) NOT NULL DEFAULT 0 COMMENT '性别 0保密 1男 2女', + status tinyint(4) NOT NULL DEFAULT 1 COMMENT '用户状态 用户状态默认为1', + birthday varchar(20) NOT NULL DEFAULT '' COMMENT '出生日期', + point int(11) NOT NULL DEFAULT 0 COMMENT '可用积分', + point_get int(11) NOT NULL DEFAULT 0 COMMENT '累计获取积分', + balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '可用余额', + balance_get decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '累计获取余额', + money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '可用余额（可提现）', + money_get decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '累计获取余额（可提现）', + money_cash_outing decimal(10, 2) NOT NULL COMMENT '提现中余额（可提现）', + growth int(11) NOT NULL DEFAULT 0 COMMENT '成长值', + growth_get int(11) NOT NULL DEFAULT 0 COMMENT '累计获得成长值', + commission decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '当前佣金', + commission_get decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '佣金获取', + commission_cash_outing decimal(10, 2) NOT NULL COMMENT '提现中佣金', + is_member tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否是会员', + member_time int(11) NOT NULL DEFAULT 0 COMMENT '成为会员时间', + is_del tinyint(4) NOT NULL DEFAULT 0 COMMENT '0正常 1已删除', + province_id int(11) NOT NULL DEFAULT 0 COMMENT '省id', + city_id int(11) NOT NULL DEFAULT 0 COMMENT '市id', + district_id int(11) NOT NULL DEFAULT 0 COMMENT '区县id', + address varchar(255) NOT NULL DEFAULT '' COMMENT '详细地址', + location varchar(255) NOT NULL DEFAULT '' COMMENT '定位地址', + delete_time int(11) NOT NULL DEFAULT 0 COMMENT '删除时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '修改时间', + PRIMARY KEY (member_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 4096, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '会员表', +ROW_FORMAT = COMPACT; + +ALTER TABLE member +ADD INDEX mobile (mobile); + +ALTER TABLE member +ADD INDEX password (password (191)); + +ALTER TABLE member +ADD INDEX site_id (site_id); + +ALTER TABLE member +ADD INDEX username (username (191)); + +ALTER TABLE member +ADD INDEX weapp_openid (weapp_openid (191)); + +ALTER TABLE member +ADD INDEX wx_openid (wx_openid (191)); + +ALTER TABLE member +ADD INDEX wx_unionid (wx_unionid (191)); + +-- +-- `ns_jobs_failed` +-- +CREATE TABLE jobs_failed ( + id int(11) NOT NULL AUTO_INCREMENT, + `connection` text NOT NULL, + queue text NOT NULL, + payload longtext NOT NULL, + exception longtext NOT NULL, + fail_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (id) +) +ENGINE = INNODB, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '消息队列任务失败记录表'; + +-- +-- `ns_jobs` +-- +CREATE TABLE jobs ( + id int(11) NOT NULL AUTO_INCREMENT, + queue varchar(255) NOT NULL, + payload longtext NOT NULL, + attempts tinyint(3) UNSIGNED NOT NULL, + reserved tinyint(3) UNSIGNED NOT NULL, + reserve_time int(10) UNSIGNED DEFAULT NULL, + available_time int(10) UNSIGNED NOT NULL, + create_time int(10) UNSIGNED NOT NULL, + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 5461, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '消息队列任务表'; + +-- +-- `ns_generate_table` +-- +CREATE TABLE generate_table ( + id int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + table_name varchar(255) NOT NULL DEFAULT '' COMMENT '表名', + table_content varchar(255) NOT NULL DEFAULT '' COMMENT '描述前缀', + module_name varchar(255) NOT NULL DEFAULT '' COMMENT '模块名', + class_name varchar(255) NOT NULL DEFAULT '' COMMENT '类名前缀', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', + edit_type int(11) NOT NULL DEFAULT 1 COMMENT '编辑方式 1-弹框 2-新页面', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 780, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '代码生成表'; + +-- +-- `ns_generate_column` +-- +CREATE TABLE generate_column ( + id int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', + table_id int(11) NOT NULL DEFAULT 0 COMMENT '表id', + column_name varchar(100) NOT NULL DEFAULT '' COMMENT '字段名称', + column_comment varchar(300) NOT NULL DEFAULT '' COMMENT '字段描述', + column_type varchar(100) NOT NULL DEFAULT '' COMMENT '字段类型', + is_required tinyint(4) DEFAULT 0 COMMENT '是否必填 0-非必填 1-必填', + is_pk tinyint(4) DEFAULT 0 COMMENT '是否为主键 0-不是 1-是', + is_insert tinyint(4) DEFAULT 0 COMMENT '是否为插入字段 0-不是 1-是', + is_update tinyint(4) DEFAULT 0 COMMENT '是否为更新字段 0-不是 1-是', + is_lists tinyint(4) DEFAULT 1 COMMENT '是否为列表字段 0-不是 1-是', + is_query tinyint(4) DEFAULT 1 COMMENT '是否为查询字段 0-不是 1-是', + is_search tinyint(4) DEFAULT 1 COMMENT '是否搜索字段', + query_type varchar(100) DEFAULT '=' COMMENT '查询类型', + view_type varchar(100) DEFAULT 'input' COMMENT '显示类型', + dict_type varchar(255) DEFAULT '' COMMENT '字典类型', + create_time int(11) NOT NULL COMMENT '创建时间', + update_time int(11) DEFAULT NULL COMMENT '修改时间', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 321, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '代码生成表字段信息表'; + +-- +-- `ns_diy_route` +-- +CREATE TABLE diy_route ( + id int(11) NOT NULL AUTO_INCREMENT, + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + title varchar(255) NOT NULL DEFAULT '' COMMENT '页面名称', + name varchar(255) NOT NULL DEFAULT '' COMMENT '页面标识', + page varchar(255) NOT NULL DEFAULT '' COMMENT '页面路径', + share varchar(1000) NOT NULL DEFAULT '' COMMENT '分享内容', + is_share int(11) NOT NULL DEFAULT 0 COMMENT '是否支持分享', + sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 2730, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '自定义路由'; + +-- +-- `ns_diy_page` +-- +CREATE TABLE diy_page ( + id int(11) NOT NULL AUTO_INCREMENT, + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', + title varchar(255) NOT NULL DEFAULT '' COMMENT '页面名称', + name varchar(255) NOT NULL DEFAULT '' COMMENT '页面标识', + type varchar(255) NOT NULL DEFAULT '' COMMENT '页面模板', + value longtext DEFAULT NULL COMMENT '页面数据，json格式', + is_default int(11) NOT NULL DEFAULT 0 COMMENT '是否默认页面，1：是，0：否', + share varchar(1000) NOT NULL DEFAULT '' COMMENT '分享内容', + visit_count int(11) NOT NULL DEFAULT 0 COMMENT '访问量', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 5461, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '自定义页面'; + +-- +-- `ns_article_category` +-- +CREATE TABLE article_category ( + category_id int(11) NOT NULL AUTO_INCREMENT COMMENT '文章分类id', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点ID', + name varchar(255) NOT NULL DEFAULT '' COMMENT '分类名称', + sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', + is_show tinyint(4) NOT NULL DEFAULT 1 COMMENT '是否显示:1-是;0-否', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (category_id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 8192, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '文章分类表'; + +ALTER TABLE article_category +ADD INDEX create_time (create_time); + +ALTER TABLE article_category +ADD INDEX is_show (is_show); + +ALTER TABLE article_category +ADD INDEX site_id (site_id); + +ALTER TABLE article_category +ADD INDEX sort (sort); + +-- +-- `ns_article` +-- +CREATE TABLE article ( + id int(11) NOT NULL AUTO_INCREMENT COMMENT '文章id', + category_id int(11) NOT NULL COMMENT '文章分类', + site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点ID', + title varchar(255) NOT NULL COMMENT '文章标题', + intro varchar(255) NOT NULL DEFAULT '' COMMENT '简介', + summary varchar(255) NOT NULL DEFAULT '' COMMENT '文章摘要', + image varchar(128) NOT NULL DEFAULT '' COMMENT '文章图片', + author varchar(255) NOT NULL DEFAULT '' COMMENT '作者', + content text DEFAULT NULL COMMENT '文章内容', + visit int(11) NOT NULL DEFAULT 0 COMMENT '实际浏览量', + visit_virtual int(11) NOT NULL DEFAULT 0 COMMENT '虚拟浏览量', + is_show tinyint(4) NOT NULL DEFAULT 1 COMMENT '是否显示:1-是.0-否', + sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (id) +) +ENGINE = INNODB, +AVG_ROW_LENGTH = 5461, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '文章表'; + +ALTER TABLE article +ADD INDEX IDX_article_category_id (category_id); + +ALTER TABLE article +ADD INDEX IDX_article_create_time (create_time); + +ALTER TABLE article +ADD INDEX IDX_article_is_show (is_show); + +ALTER TABLE article +ADD INDEX IDX_article_site_id (site_id); + +ALTER TABLE article +ADD INDEX IDX_ns_article_sort (sort); + +-- +-- `ns_addon_log` +-- +CREATE TABLE addon_log ( + id int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + action varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '操作类型 install 安装 uninstall 卸载 update 更新', + `key` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '插件标识', + from_version varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '升级前的版本号', + to_version varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '升级后的版本号', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + PRIMARY KEY (id) +) +ENGINE = INNODB, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '插件日志表'; + +-- +-- `ns_addon` +-- +CREATE TABLE addon ( + id int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + title varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '插件名称', + icon varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '插件图标', + `key` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '插件标识', + `desc` text CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '插件描述', + status tinyint(4) NOT NULL DEFAULT 1 COMMENT '状态', + author varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '作者', + version varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '版本号', + create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + install_time int(11) NOT NULL DEFAULT 0 COMMENT '安装时间', + update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + cover varchar(255) NOT NULL DEFAULT '' COMMENT '封面', + PRIMARY KEY (id) +) +ENGINE = INNODB, +CHARACTER SET utf8mb4, +COLLATE utf8mb4_general_ci, +COMMENT = '插件表'; + +ALTER TABLE addon +ADD UNIQUE INDEX UK_title (title); + +-- +-- Dumping data for table ns_sys_area +-- INSERT INTO sys_area VALUES (110000, 0, '北京市', '北京', '116.40529', '39.904987', 1, 0, 1), (110100, 110000, '北京市', '北京', '116.40529', '39.904987', 2, 0, 1), @@ -4149,733 +5080,10 @@ INSERT INTO sys_area VALUES (460400499, 460400, '洋浦经济开发区', '洋浦经济开发区', '109.202064', '19.736941', 3, 0, 1), (460400500, 460400, '华南热作学院', '华南热作学院', '109.494073', '19.505382', 3, 0, 1); +INSERT INTO sys_user_role(id, uid, site_id, is_admin) VALUE +(1, 1, 0, 1); -CREATE TABLE sys_agreement ( - id int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - agreement_key varchar(255) NOT NULL DEFAULT '' COMMENT '协议关键字', - title varchar(255) NOT NULL DEFAULT '' COMMENT '协议标题', - content text DEFAULT NULL COMMENT '协议内容', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', - update_time int(11) NOT NULL DEFAULT 0 COMMENT '修改时间', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '协议表'; - -ALTER TABLE sys_agreement ADD INDEX agreement_key (agreement_key); - -ALTER TABLE sys_agreement ADD INDEX site_id (site_id); - - -CREATE TABLE site_group ( - group_id int(11) NOT NULL AUTO_INCREMENT COMMENT '分组ID', - group_name varchar(255) NOT NULL DEFAULT '' COMMENT '分组名称', - group_desc text DEFAULT NULL COMMENT '分组介绍', - group_roles text DEFAULT NULL COMMENT '分组权限', - app_type varchar(255) NOT NULL DEFAULT '' COMMENT '应用类型', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', - update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - PRIMARY KEY (group_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '店铺分组（分组权限）'; - - -CREATE TABLE site ( - site_id int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - site_name varchar(50) NOT NULL DEFAULT '' COMMENT '站点名称', - group_id int(11) NOT NULL DEFAULT 0 COMMENT '分组ID(0:不限制)', - keywords varchar(255) NOT NULL DEFAULT '' COMMENT '关键字', - app_type varchar(50) NOT NULL DEFAULT 'admin' COMMENT '站点类型', - logo varchar(255) NOT NULL DEFAULT '' COMMENT '站点logo', - `desc` varchar(255) NOT NULL DEFAULT '' COMMENT '简介', - status tinyint(4) NOT NULL DEFAULT 1 COMMENT '状态 1-正常 0-体验期 2-已到期', - latitude varchar(255) NOT NULL DEFAULT '' COMMENT '纬度', - longitude varchar(255) NOT NULL DEFAULT '' COMMENT '经度', - province_id int(11) NOT NULL DEFAULT 0 COMMENT '省', - city_id int(11) NOT NULL DEFAULT 0 COMMENT '市', - district_id int(11) NOT NULL DEFAULT 0 COMMENT '区', - address varchar(255) NOT NULL DEFAULT '' COMMENT '详细地址', - full_address varchar(255) NOT NULL DEFAULT '' COMMENT '完整地址', - phone varchar(255) NOT NULL DEFAULT '' COMMENT '客服电话', - business_hours varchar(255) NOT NULL DEFAULT '' COMMENT '营业时间', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - expire_time int(11) NOT NULL DEFAULT 0 COMMENT '到期时间（如果是0 无限期）', - front_end_name VARCHAR(50) NOT NULL DEFAULT '' COMMENT '前台名称', - front_end_logo VARCHAR(255) NOT NULL DEFAULT '' COMMENT '前台logo', - icon VARCHAR(255) NOT NULL DEFAULT '' COMMENT '网站图标', - member_no VARCHAR(255) NOT NULL DEFAULT '0' COMMENT '最大会员码值', - PRIMARY KEY (site_id) -) -ENGINE = INNODB, -AUTO_INCREMENT = 2, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '站点表', -ROW_FORMAT = COMPACT; - -ALTER TABLE site ADD INDEX create_time (create_time); - -ALTER TABLE site ADD INDEX group_id (group_id); - - -CREATE TABLE pay_transfer ( - id int(11) NOT NULL AUTO_INCREMENT, - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - trade_type varchar(255) NOT NULL DEFAULT '' COMMENT '业务类型', - transfer_no varchar(50) NOT NULL DEFAULT '' COMMENT '转账单号', - main_id int(11) NOT NULL DEFAULT 0 COMMENT '会员id', - main_type varchar(255) NOT NULL DEFAULT '' COMMENT '主体类型', - transfer_type varchar(20) NOT NULL DEFAULT '0' COMMENT '转账类型', - transfer_realname varchar(50) NOT NULL DEFAULT '' COMMENT '联系人名称', - transfer_mobile varchar(11) NOT NULL DEFAULT '' COMMENT '手机号', - transfer_bank varchar(255) NOT NULL DEFAULT '' COMMENT '银行名称', - transfer_account varchar(255) NOT NULL DEFAULT '' COMMENT '收款账号', - transfer_voucher varchar(255) NOT NULL DEFAULT '' COMMENT '凭证', - transfer_remark varchar(255) NOT NULL DEFAULT '' COMMENT '凭证说明', - transfer_fail_reason varchar(255) NOT NULL DEFAULT '' COMMENT '失败原因', - transfer_status varchar(20) NOT NULL DEFAULT '' COMMENT '转账状态', - money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '转账金额', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '申请时间', - transfer_time int(11) NOT NULL DEFAULT 0 COMMENT '转账时间', - update_time int(11) NOT NULL DEFAULT 0, - openid varchar(50) NOT NULL DEFAULT '', - remark varchar(255) NOT NULL, - batch_id varchar(500) NOT NULL DEFAULT '' COMMENT '转账批次id', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '转账表'; - -ALTER TABLE pay_transfer ADD INDEX member_withdraw_apply_time (create_time); - -ALTER TABLE pay_transfer ADD INDEX member_withdraw_audit_time (transfer_time); - -ALTER TABLE pay_transfer ADD INDEX member_withdraw_site_id (site_id, main_id); - -ALTER TABLE pay_transfer ADD INDEX member_withdraw_status (transfer_status); - - -CREATE TABLE pay_refund ( - id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', - site_id INT(11) NOT NULL DEFAULT 0 COMMENT '站点id', - refund_no VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '退款单号', - out_trade_no VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '支付流水号', - type VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '支付方式', - channel VARCHAR(50) NOT NULL DEFAULT '' COMMENT '支付渠道', - money DECIMAL(10, 2) NOT NULL COMMENT '支付金额', - reason VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '退款原因', - status VARCHAR(255) NOT NULL DEFAULT '0' COMMENT '支付状态（0.待退款 1. 退款中中 2. 已退款 -1已关闭）', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - refund_time INT(11) NOT NULL DEFAULT 0 COMMENT '支付时间', - close_time INT(11) NOT NULL DEFAULT 0 COMMENT '关闭时间', - fail_reason VARCHAR(255) NOT NULL COMMENT '失败原因', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '支付记录表'; - - -CREATE TABLE pay_channel ( - id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', - site_id INT(11) NOT NULL DEFAULT 0 COMMENT '站点id', - type VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '支付类型', - channel VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '支付渠道', - config TEXT NOT NULL COMMENT '支付配置', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - update_time INT(11) NOT NULL DEFAULT 0 COMMENT '修改时间', - status INT(11) NOT NULL DEFAULT 0 COMMENT '是否启用', - sort INT(11) NOT NULL DEFAULT 0 COMMENT '排序', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '支付渠道配置表'; - -CREATE TABLE pay ( - id int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - main_id int(11) NOT NULL DEFAULT 0 COMMENT '支付会员id', - out_trade_no varchar(255) NOT NULL DEFAULT '' COMMENT '支付流水号', - trade_type varchar(255) NOT NULL DEFAULT '' COMMENT '业务类型', - trade_no varchar(255) NOT NULL DEFAULT '' COMMENT '交易单号', - body varchar(1000) NOT NULL DEFAULT '' COMMENT '支付主体', - money decimal(10, 2) NOT NULL COMMENT '支付金额', - voucher varchar(255) NOT NULL DEFAULT '' COMMENT '支付票据', - status int(11) NOT NULL DEFAULT 0 COMMENT '支付状态（0.待支付 1. 支付中 2. 已支付 -1已取消）', - json varchar(255) NOT NULL DEFAULT '' COMMENT '支付扩展用支付信息', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - pay_time int(11) NOT NULL DEFAULT 0 COMMENT '支付时间', - cancel_time int(11) NOT NULL DEFAULT 0 COMMENT '关闭时间', - type varchar(255) NOT NULL DEFAULT '' COMMENT '支付方式', - mch_id varchar(50) NOT NULL DEFAULT '' COMMENT '商户收款账号', - main_type varchar(255) NOT NULL DEFAULT '', - channel varchar(50) NOT NULL DEFAULT '' COMMENT '支付渠道', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8, -COLLATE utf8_general_ci, -COMMENT = '支付记录表'; - -ALTER TABLE pay -ADD UNIQUE INDEX UK_ns_pay_out_trade_no (out_trade_no); - - -CREATE TABLE order_log ( - id int(11) NOT NULL AUTO_INCREMENT, - order_id int(11) NOT NULL DEFAULT 0 COMMENT '订单id', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - action varchar(255) NOT NULL DEFAULT '' COMMENT '操作内容', - uid int(11) NOT NULL DEFAULT 0 COMMENT '操作人id', - nick_name varchar(50) NOT NULL DEFAULT '' COMMENT '操作人名称', - order_status int(11) NOT NULL DEFAULT 0 COMMENT '订单状态，操作后', - action_way bigint(20) NOT NULL DEFAULT 2 COMMENT '操作类型1买家2卖家 3 系统任务', - order_status_name varchar(255) NOT NULL DEFAULT '' COMMENT '订单状态名称，操作后', - action_time int(11) NOT NULL DEFAULT 0 COMMENT '操作时间', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '订单操作记录表', -ROW_FORMAT = COMPACT; - - -CREATE TABLE order_item_refund ( - refund_id INT(11) NOT NULL AUTO_INCREMENT, - order_item_id INT(11) NOT NULL DEFAULT 0 COMMENT '订单id', - order_id INT(11) NOT NULL DEFAULT 0 COMMENT '订单id', - order_no VARCHAR(255) NOT NULL DEFAULT '' COMMENT '订单编号', - refund_no VARCHAR(255) NOT NULL DEFAULT '0' COMMENT '退款单号', - site_id INT(11) NOT NULL DEFAULT 0 COMMENT '站点id', - member_id INT(11) NOT NULL DEFAULT 0 COMMENT '会员id', - num DECIMAL(10, 3) NOT NULL DEFAULT 0.000 COMMENT '退货数量', - money DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '总退款', - status INT(11) NOT NULL DEFAULT 0 COMMENT '退款状态', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - audit_time INT(11) NOT NULL DEFAULT 0 COMMENT '审核时间', - transfer_time INT(11) NOT NULL DEFAULT 0 COMMENT '转账时间', - item_type VARCHAR(255) NOT NULL DEFAULT '' COMMENT '项目类型', - PRIMARY KEY (refund_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '订单退款表'; - -CREATE TABLE order_item ( - order_item_id int(11) NOT NULL AUTO_INCREMENT, - order_id int(11) NOT NULL DEFAULT 0 COMMENT '订单id', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - member_id int(11) NOT NULL DEFAULT 0 COMMENT '购买会员id', - item_id int(11) NOT NULL DEFAULT 0 COMMENT '项目id', - item_type VARCHAR(255) NOT NULL DEFAULT '' COMMENT '项目类型', - item_name varchar(400) NOT NULL DEFAULT '' COMMENT '项目名称', - item_image varchar(2000) NOT NULL DEFAULT '' COMMENT '项目图片', - price decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '项目单价', - num decimal(10, 3) NOT NULL DEFAULT 0.000 COMMENT '购买数量', - item_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '项目总价', - is_refund int(11) NOT NULL DEFAULT 0 COMMENT '是否退款', - refund_no VARCHAR(255) NOT NULL DEFAULT '' COMMENT '退款编号', - refund_status int(11) NOT NULL DEFAULT 0 COMMENT '退款状态', - create_time int(11) NOT NULL DEFAULT 0, - PRIMARY KEY (order_item_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '订单商品表', -ROW_FORMAT = COMPACT; - - -CREATE TABLE `order` ( - order_id int(11) NOT NULL AUTO_INCREMENT, - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - order_no varchar(50) NOT NULL DEFAULT '' COMMENT '订单编号', - order_from varchar(55) NOT NULL DEFAULT '' COMMENT '订单来源', - order_type varchar(50) NOT NULL DEFAULT '' COMMENT '订单类型', - out_trade_no varchar(50) NOT NULL DEFAULT '' COMMENT '支付流水号', - order_status int(11) NOT NULL DEFAULT 0 COMMENT '订单状态', - refund_status int(11) NOT NULL DEFAULT 0 COMMENT '退款状态', - member_id int(11) NOT NULL DEFAULT 0 COMMENT '会员id', - ip varchar(20) NOT NULL DEFAULT '' COMMENT '会员ip', - member_message varchar(50) NOT NULL DEFAULT '' COMMENT '会员留言信息', - order_item_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '订单项目金额', - order_discount_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '订单优惠金额', - order_money decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '订单金额', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - pay_time int(11) NOT NULL DEFAULT 0 COMMENT '订单支付时间', - close_time int(11) NOT NULL DEFAULT 0 COMMENT '订单关闭时间', - is_delete int(11) NOT NULL DEFAULT 0 COMMENT '是否删除(针对后台)', - is_enable_refund int(11) NOT NULL DEFAULT 0 COMMENT '是否允许退款', - remark varchar(255) NOT NULL DEFAULT '' COMMENT '商家留言', - invoice_id int(11) NOT NULL DEFAULT 0 COMMENT '发票id，0表示不开发票', - close_reason varchar(255) NOT NULL DEFAULT '' COMMENT '关闭原因', - PRIMARY KEY (order_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '订单表', -ROW_FORMAT = COMPACT; - - -CREATE TABLE member_level ( - level_id int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '会员等级', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - level_name varchar(50) NOT NULL DEFAULT '' COMMENT '等级名称', - growth decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '所需成长值', - remark varchar(255) NOT NULL DEFAULT '' COMMENT '备注', - status int(11) NOT NULL DEFAULT 1 COMMENT '状态 0已禁用1已启用', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', - update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - PRIMARY KEY (level_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '会员等级', -ROW_FORMAT = COMPACT; - -ALTER TABLE member_level ADD INDEX site_id (site_id); - -ALTER TABLE member_level ADD INDEX status (status); - - -CREATE TABLE member_label ( - label_id int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '标签id', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - label_name varchar(50) NOT NULL DEFAULT '' COMMENT '标签名称', - memo varchar(1000) NOT NULL DEFAULT '' COMMENT '备注', - sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', - update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - PRIMARY KEY (label_id), - INDEX label_id (label_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '会员标签', -ROW_FORMAT = COMPACT; - -ALTER TABLE member_label ADD INDEX site_id (site_id); - -ALTER TABLE member_label ADD INDEX sort (sort); - - -CREATE TABLE member_cash_out_account ( - account_id INT(11) NOT NULL AUTO_INCREMENT, - site_id INT(11) NOT NULL COMMENT '站点id', - member_id INT(11) NOT NULL COMMENT '会员id', - account_type VARCHAR(255) NOT NULL DEFAULT '' COMMENT '账户类型', - bank_name VARCHAR(255) NOT NULL DEFAULT '' COMMENT '银行名称', - realname VARCHAR(255) NOT NULL DEFAULT '' COMMENT '真实名称', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - update_time INT(11) NOT NULL DEFAULT 0 COMMENT '修改时间', - account_no VARCHAR(255) NOT NULL DEFAULT '' COMMENT '提现账户', - PRIMARY KEY (account_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '会员提现账户'; - - -CREATE TABLE member_cash_out ( - id INT(11) NOT NULL AUTO_INCREMENT, - site_id INT(11) NOT NULL DEFAULT 0 COMMENT '站点id', - cash_out_no VARCHAR(50) NOT NULL DEFAULT '' COMMENT '提现交易号', - member_id INT(11) NOT NULL DEFAULT 0 COMMENT '会员id', - account_type VARCHAR(255) NOT NULL DEFAULT 'money' COMMENT '提现账户类型', - transfer_type VARCHAR(20) NOT NULL DEFAULT '0' COMMENT '转账提现类型', - transfer_realname VARCHAR(50) NOT NULL DEFAULT '' COMMENT '联系人名称', - transfer_mobile VARCHAR(11) NOT NULL DEFAULT '' COMMENT '手机号', - transfer_bank VARCHAR(255) NOT NULL DEFAULT '' COMMENT '银行名称', - transfer_account VARCHAR(255) NOT NULL DEFAULT '' COMMENT '收款账号', - transfer_fail_reason VARCHAR(255) NOT NULL DEFAULT '' COMMENT '失败原因', - transfer_status VARCHAR(20) NOT NULL DEFAULT '' COMMENT '转账状态', - transfer_time INT(11) NOT NULL DEFAULT 0 COMMENT '转账时间', - apply_money DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '提现申请金额', - rate DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '提现手续费比率', - service_money DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '提现手续费', - money DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '提现到账金额', - audit_time INT(11) NOT NULL DEFAULT 0 COMMENT '审核时间', - status INT(11) NOT NULL DEFAULT 0 COMMENT '状态1待审核2.待转账3已转账 -1拒绝 -2 已取消', - remark VARCHAR(100) NOT NULL DEFAULT '' COMMENT '备注', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '申请时间', - refuse_reason VARCHAR(100) NOT NULL DEFAULT '' COMMENT '拒绝理由', - update_time INT(11) NOT NULL DEFAULT 0, - transfer_no VARCHAR(50) NOT NULL DEFAULT '' COMMENT '转账单号', - cancel_time INT(11) NOT NULL DEFAULT 0 COMMENT '取消时间', - final_transfer_type VARCHAR(255) NOT NULL DEFAULT '' COMMENT '转账方式', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '会员提现表'; - -ALTER TABLE member_cash_out ADD INDEX member_withdraw_apply_time(create_time); - -ALTER TABLE member_cash_out ADD INDEX member_withdraw_audit_time(audit_time); - -ALTER TABLE member_cash_out ADD INDEX member_withdraw_site_id(site_id, member_id); - -ALTER TABLE member_cash_out ADD INDEX member_withdraw_status(status); - -ALTER TABLE member_cash_out ADD INDEX member_withdraw_withdraw_no(cash_out_no); - -CREATE TABLE member_address ( - id int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - member_id int(11) NOT NULL DEFAULT 0 COMMENT '会员id', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - name varchar(255) NOT NULL DEFAULT '' COMMENT '用户姓名', - mobile varchar(255) NOT NULL DEFAULT '' COMMENT '手机', - telephone varchar(255) NOT NULL DEFAULT '' COMMENT '联系电话', - province_id int(11) NOT NULL DEFAULT 0 COMMENT '省id', - city_id int(11) NOT NULL DEFAULT 0 COMMENT '市id', - district_id int(11) NOT NULL DEFAULT 0 COMMENT '区县id', - community_id int(11) NOT NULL DEFAULT 0 COMMENT '社区id', - address varchar(255) NOT NULL DEFAULT '' COMMENT '地址信息', - full_address varchar(255) NOT NULL DEFAULT '' COMMENT '详细地址信息', - longitude varchar(255) NOT NULL DEFAULT '' COMMENT '经度', - latitude varchar(255) NOT NULL DEFAULT '' COMMENT '纬度', - is_default tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否是默认地址', - type int(11) NOT NULL DEFAULT 1 COMMENT '地址类型 1 普通地址 2 定位地址', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '会员收货地址', -ROW_FORMAT = COMPACT; - -ALTER TABLE member_address ADD INDEX IDX_member_address (member_id, site_id); - - -CREATE TABLE member_account_log ( - id int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - member_id int(11) NOT NULL DEFAULT 0 COMMENT '用户id', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - account_type varchar(255) NOT NULL DEFAULT 'point' COMMENT '账户类型', - account_data decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '账户数据', - account_sum DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '变动后的账户余额', - from_type varchar(255) NOT NULL DEFAULT '' COMMENT '来源类型', - related_id int(11) NOT NULL DEFAULT 0 COMMENT '关联Id', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - memo varchar(255) NOT NULL DEFAULT '' COMMENT '备注信息', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '会员账单表', -ROW_FORMAT = COMPACT; - -ALTER TABLE member_account_log ADD INDEX account_type (account_type (191)); - -ALTER TABLE member_account_log ADD INDEX create_time (create_time); - -ALTER TABLE member_account_log ADD INDEX from_type (from_type (191)); - -ALTER TABLE member_account_log ADD INDEX member_id (member_id); - - -CREATE TABLE member ( - member_id int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', - member_no VARCHAR(255) NOT NULL DEFAULT '' COMMENT '会员编码', - pid int(11) NOT NULL DEFAULT 0 COMMENT '推广会员id', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - username varchar(255) DEFAULT '' COMMENT '会员用户名', - mobile varchar(20) NOT NULL DEFAULT '' COMMENT '手机号', - password varchar(255) NOT NULL DEFAULT '' COMMENT '会员密码', - nickname varchar(50) NOT NULL DEFAULT '' COMMENT '会员昵称', - headimg varchar(1000) NOT NULL DEFAULT '' COMMENT '会员头像', - member_level int(11) NOT NULL DEFAULT 0 COMMENT '会员等级', - member_label varchar(255) NOT NULL DEFAULT '' COMMENT '会员标签', - wx_openid varchar(255) NOT NULL DEFAULT '' COMMENT '微信用户openid', - weapp_openid varchar(255) NOT NULL DEFAULT '' COMMENT '微信小程序openid', - wx_unionid varchar(255) NOT NULL DEFAULT '' COMMENT '微信unionid', - ali_openid varchar(255) NOT NULL DEFAULT '' COMMENT '支付宝账户id', - douyin_openid varchar(255) NOT NULL DEFAULT '' COMMENT '抖音小程序openid', - register_channel varchar(255) NOT NULL DEFAULT 'H5' COMMENT '注册来源', - register_type varchar(255) NOT NULL DEFAULT '' COMMENT '注册方式', - login_ip varchar(255) NOT NULL DEFAULT '' COMMENT '当前登录ip', - login_type varchar(255) NOT NULL DEFAULT 'h5' COMMENT '当前登录的操作终端类型', - login_channel varchar(255) NOT NULL DEFAULT '', - login_count int(11) NOT NULL DEFAULT 0 COMMENT '登录次数', - login_time int(11) NOT NULL DEFAULT 0 COMMENT '当前登录时间', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '注册时间', - last_visit_time int(11) NOT NULL DEFAULT 0 COMMENT '最后访问时间', - last_consum_time int(11) NOT NULL DEFAULT 0 COMMENT '最后消费时间', - sex tinyint(4) NOT NULL DEFAULT 0 COMMENT '性别 0保密 1男 2女', - status tinyint(4) NOT NULL DEFAULT 1 COMMENT '用户状态 用户状态默认为1', - birthday varchar(20) NOT NULL DEFAULT '' COMMENT '出生日期', - point int(11) NOT NULL DEFAULT 0 COMMENT '可用积分', - point_get int(11) NOT NULL DEFAULT 0 COMMENT '累计获取积分', - balance decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '可用余额', - balance_get decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '累计获取余额', - money DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '可用余额（可提现）', - money_get DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '累计获取余额（可提现）', - money_cash_outing DECIMAL(10, 2) NOT NULL COMMENT '提现中余额（可提现）', - growth int(11) NOT NULL DEFAULT 0 COMMENT '成长值', - growth_get int(11) NOT NULL DEFAULT 0 COMMENT '累计获得成长值', - commission DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '当前佣金', - commission_get DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '佣金获取', - commission_cash_outing DECIMAL(10, 2) NOT NULL COMMENT '提现中佣金', - is_member tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否是会员', - member_time int(11) NOT NULL DEFAULT 0 COMMENT '成为会员时间', - is_del tinyint(4) NOT NULL DEFAULT 0 COMMENT '0正常 1已删除', - province_id int(11) NOT NULL DEFAULT 0 COMMENT '省id', - city_id int(11) NOT NULL DEFAULT 0 COMMENT '市id', - district_id int(11) NOT NULL DEFAULT 0 COMMENT '区县id', - address varchar(255) NOT NULL DEFAULT '' COMMENT '详细地址', - location varchar(255) NOT NULL DEFAULT '' COMMENT '定位地址', - delete_time int(11) NOT NULL DEFAULT 0 COMMENT '删除时间', - update_time INT(11) NOT NULL DEFAULT 0 COMMENT '修改时间', - PRIMARY KEY (member_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '会员表', -ROW_FORMAT = COMPACT; - -ALTER TABLE member ADD INDEX mobile (mobile); - -ALTER TABLE member ADD INDEX password (password (191)); - -ALTER TABLE member ADD INDEX site_id (site_id); - -ALTER TABLE member ADD INDEX username (username (191)); - -ALTER TABLE member ADD INDEX weapp_openid (weapp_openid (191)); - -ALTER TABLE member ADD INDEX wx_openid (wx_openid (191)); - -ALTER TABLE member ADD INDEX wx_unionid (wx_unionid (191)); - - -CREATE TABLE jobs_failed ( - id INT(11) NOT NULL AUTO_INCREMENT, - `connection` TEXT NOT NULL, - queue TEXT NOT NULL, - payload LONGTEXT NOT NULL, - exception LONGTEXT NOT NULL, - fail_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '消息队列任务失败记录表'; - -CREATE TABLE jobs ( - id INT(11) NOT NULL AUTO_INCREMENT, - queue VARCHAR(255) NOT NULL, - payload LONGTEXT NOT NULL, - attempts TINYINT(4) UNSIGNED NOT NULL, - reserved TINYINT(4) UNSIGNED NOT NULL, - reserve_time INT(11) UNSIGNED DEFAULT NULL, - available_time INT(11) UNSIGNED NOT NULL, - create_time INT(11) UNSIGNED NOT NULL, - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '消息队列任务表'; - -CREATE TABLE generate_table ( - id int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - table_name varchar(255) NOT NULL DEFAULT '' COMMENT '表名', - table_content varchar(255) NOT NULL DEFAULT '' COMMENT '描述前缀', - module_name varchar(255) NOT NULL DEFAULT '' COMMENT '模块名', - class_name varchar(255) NOT NULL DEFAULT '' COMMENT '类名前缀', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', - edit_type int(11) NOT NULL DEFAULT 1 COMMENT '编辑方式 1-弹框 2-新页面', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '代码生成表'; - - -CREATE TABLE generate_column ( - id int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', - table_id int(11) NOT NULL DEFAULT 0 COMMENT '表id', - column_name varchar(100) NOT NULL DEFAULT '' COMMENT '字段名称', - column_comment varchar(300) NOT NULL DEFAULT '' COMMENT '字段描述', - column_type varchar(100) NOT NULL DEFAULT '' COMMENT '字段类型', - is_required tinyint(1) DEFAULT 0 COMMENT '是否必填 0-非必填 1-必填', - is_pk tinyint(1) DEFAULT 0 COMMENT '是否为主键 0-不是 1-是', - is_insert tinyint(1) DEFAULT 0 COMMENT '是否为插入字段 0-不是 1-是', - is_update tinyint(1) DEFAULT 0 COMMENT '是否为更新字段 0-不是 1-是', - is_lists tinyint(1) DEFAULT 1 COMMENT '是否为列表字段 0-不是 1-是', - is_query tinyint(1) DEFAULT 1 COMMENT '是否为查询字段 0-不是 1-是', - is_search tinyint(1) DEFAULT 1 COMMENT '是否搜索字段', - query_type varchar(100) DEFAULT '=' COMMENT '查询类型', - view_type varchar(100) DEFAULT 'input' COMMENT '显示类型', - dict_type varchar(255) DEFAULT '' COMMENT '字典类型', - create_time int(11) NOT NULL COMMENT '创建时间', - update_time int(11) DEFAULT NULL COMMENT '修改时间', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '代码生成表字段信息表'; - - -CREATE TABLE diy_route ( - id int(11) NOT NULL AUTO_INCREMENT, - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - title varchar(255) NOT NULL DEFAULT '' COMMENT '页面名称', - name varchar(255) NOT NULL DEFAULT '' COMMENT '页面标识', - page varchar(255) NOT NULL DEFAULT '' COMMENT '页面路径', - share varchar(1000) NOT NULL DEFAULT '' COMMENT '分享内容', - is_share int(11) NOT NULL DEFAULT 0 COMMENT '是否支持分享', - sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '自定义路由'; - - -CREATE TABLE diy_page ( - id int(11) NOT NULL AUTO_INCREMENT, - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点id', - title varchar(255) NOT NULL DEFAULT '' COMMENT '页面名称', - name varchar(255) NOT NULL DEFAULT '' COMMENT '页面标识', - type varchar(255) NOT NULL DEFAULT '' COMMENT '页面模板', - value longtext DEFAULT NULL COMMENT '页面数据，json格式', - is_default int(11) NOT NULL DEFAULT 0 COMMENT '是否默认页面，1：是，0：否', - share varchar(1000) NOT NULL DEFAULT '' COMMENT '分享内容', - visit_count int(11) NOT NULL DEFAULT 0 COMMENT '访问量', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '自定义页面'; - - -CREATE TABLE article_category ( - category_id int(11) NOT NULL AUTO_INCREMENT COMMENT '文章分类id', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点ID', - name varchar(255) NOT NULL DEFAULT '' COMMENT '分类名称', - sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', - is_show tinyint(4) NOT NULL DEFAULT 1 COMMENT '是否显示:1-是;0-否', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - PRIMARY KEY (category_id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '文章分类表'; - -ALTER TABLE article_category ADD INDEX create_time (create_time); - -ALTER TABLE article_category ADD INDEX is_show (is_show); - -ALTER TABLE article_category ADD INDEX site_id (site_id); - -ALTER TABLE article_category ADD INDEX sort (sort); - - -CREATE TABLE article ( - id int(11) NOT NULL AUTO_INCREMENT COMMENT '文章id', - category_id int(11) NOT NULL COMMENT '文章分类', - site_id int(11) NOT NULL DEFAULT 0 COMMENT '站点ID', - title varchar(255) NOT NULL COMMENT '文章标题', - intro varchar(255) NOT NULL DEFAULT '' COMMENT '简介', - summary varchar(255) NOT NULL DEFAULT '' COMMENT '文章摘要', - image varchar(128) NOT NULL DEFAULT '' COMMENT '文章图片', - author varchar(255) NOT NULL DEFAULT '' COMMENT '作者', - content text DEFAULT NULL COMMENT '文章内容', - visit int(11) NOT NULL DEFAULT 0 COMMENT '实际浏览量', - visit_virtual int(11) NOT NULL DEFAULT 0 COMMENT '虚拟浏览量', - is_show tinyint(4) NOT NULL DEFAULT 1 COMMENT '是否显示:1-是.0-否', - sort int(11) NOT NULL DEFAULT 0 COMMENT '排序', - create_time int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - update_time int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '文章表'; - -ALTER TABLE article ADD INDEX IDX_article_category_id (category_id); - -ALTER TABLE article ADD INDEX IDX_article_create_time (create_time); - -ALTER TABLE article ADD INDEX IDX_article_is_show (is_show); - -ALTER TABLE article ADD INDEX IDX_article_site_id (site_id); - -ALTER TABLE article ADD INDEX IDX_ns_article_sort (sort); - - -CREATE TABLE addon_log ( - id INT(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - action VARCHAR(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '操作类型 install 安装 uninstall 卸载 update 更新', - `key` VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '插件标识', - from_version VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '升级前的版本号', - to_version VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '升级后的版本号', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '插件日志表'; - -CREATE TABLE addon ( - id INT(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - title VARCHAR(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '插件名称', - icon VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '插件图标', - `key` VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '插件标识', - `desc` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '插件描述', - status TINYINT(4) NOT NULL DEFAULT 1 COMMENT '状态', - author VARCHAR(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '作者', - version VARCHAR(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '版本号', - create_time INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - install_time INT(11) NOT NULL DEFAULT 0 COMMENT '安装时间', - update_time INT(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - cover VARCHAR(255) NOT NULL DEFAULT '' COMMENT '封面', - PRIMARY KEY (id) -) -ENGINE = INNODB, -CHARACTER SET utf8mb4, -COLLATE utf8mb4_general_ci, -COMMENT = '插件表'; - -ALTER TABLE addon ADD UNIQUE INDEX UK_title(title); - -INSERT INTO sys_user_role VALUES -(1, 1, 1, '', 0, 1); - -INSERT INTO sys_user VALUES -(1, '', '', '', '', '', 0, 0, 0, 1, 0, 0, 0); - -INSERT INTO site VALUES -(1, 'niucloud-admin', 0, '', 'admin', '', '', 1, '', '', 0, 0, 0, '', '', '', '', 0, 0); +INSERT INTO sys_user(uid, username) VALUE +(1, ''); +INSERT INTO site(site_id, site_name, app_type) VALUE +(1, 'niucloud-admin', 'admin'); diff --git a/niucloud/app/install/view/index/step-3.html b/niucloud/app/install/view/index/step-3.html index 8e199a506..3ccdf23f9 100644 --- a/niucloud/app/install/view/index/step-3.html +++ b/niucloud/app/install/view/index/step-3.html @@ -24,7 +24,7 @@
-

数据库设定

+

数据库设置

@@ -79,12 +79,12 @@
*数据库主机：
-

网站设定

+

网站设置

- + @@ -101,7 +101,35 @@ - +
*网站标题： - 网站标题 必填 + 网站标题 必填
*管理员用户名： 确认密码 必填
+

默认站点

+ + + + + + + + + +
+
+ + + + + + + + + +
*站点名称： + 站点名称 必填
*站点管理员： + + 站点管理员 必填 +
请不要和网站管理员相同
*管理员密码： + 管理员密码 必填
*确认密码： + 确认密码 必填
@@ -220,9 +248,9 @@ $.ajax({ url: "{$root_url}/install.php/index/getInstallInfo", dataType: 'json', - type: 'post', + type: 'get', success : function(data) { - if(data.code == 200) { + if(data.code == 1) { $(data.data.log).each(function (i, e){ if($('.log-'+i).length == 0) { let html = `
@@ -263,14 +291,14 @@ type: 'post', success : function(res) { layer.close(index); - if(res.code == 200){ + if(res.code == 1){ $.ajax({ url: "{$root_url}/install.php/index/initData", data: data, dataType: 'json', type: 'post', success : function(data) { - if(data.code == 200){ + if(data.code == 1){ window.location.href = '{$root_url}/install.php/index/installSuccess'; } } diff --git a/niucloud/app/install/view/index/step-4.html b/niucloud/app/install/view/index/step-4.html index 3f8a46ed4..df7639b81 100644 --- a/niucloud/app/install/view/index/step-4.html +++ b/niucloud/app/install/view/index/step-4.html @@ -32,24 +32,36 @@

您现在可以访问：

diff --git a/niucloud/app/job/schedule/OrderClose.php b/niucloud/app/job/schedule/OrderClose.php new file mode 100644 index 000000000..5c0a41b44 --- /dev/null +++ b/niucloud/app/job/schedule/OrderClose.php @@ -0,0 +1,32 @@ +getExpireSiteList(); + if(!empty($list)){ + foreach($list as $k => $v){ + $core_site_service->expire($v['site_id']); + } + } +// Log::write('站点到期自动关闭'.date('Y-m-d h:i:s')); + return true; + } +} diff --git a/niucloud/app/job/sys/AddonInstall.php b/niucloud/app/job/sys/AddonInstall.php new file mode 100644 index 000000000..fbf421e2d --- /dev/null +++ b/niucloud/app/job/sys/AddonInstall.php @@ -0,0 +1,31 @@ +executeTask($task); + } + + public function failed($data){ + + } +} diff --git a/niucloud/app/job/sys/CheckDeleteJob.php b/niucloud/app/job/sys/CheckDeleteJob.php new file mode 100644 index 000000000..92a681b57 --- /dev/null +++ b/niucloud/app/job/sys/CheckDeleteJob.php @@ -0,0 +1,29 @@ + $file], secs:8); + return true; + } +} diff --git a/niucloud/app/job/sys/Cronexecute.php b/niucloud/app/job/sys/Cronexecute.php deleted file mode 100644 index 9a08738c7..000000000 --- a/niucloud/app/job/sys/Cronexecute.php +++ /dev/null @@ -1,64 +0,0 @@ -attempts() > 3) { -// //通过这个方法可以检查这个任务已经重试了几次了 -// } -// -// -// //如果任务执行成功后 记得删除任务，不然这个任务会重复执行，直到达到最大重试次数后失败后，执行failed方法 -// $job->delete(); -// -// // 也可以重新发布这个任务 -// $job->release($delay ?? 0); //$delay为延迟时间 - - - $res = event($data[ 'event' ], $data['data'] ); - //根据结果来判断下一步 - - $cron_task_model = new CoreCronService(); - //定义最新的执行时间或错误 - $cron_task_model->after($data); - $job->delete(); - - - - } - - - /** - * 失败后的解决方案或提示 - * @param $data - * @return void - */ - public function failed($data){ - - // ...任务达到最大重试次数后，失败了 - } - -} diff --git a/niucloud/app/lang/en.php b/niucloud/app/lang/en.php index b389a5004..c95e49f77 100644 --- a/niucloud/app/lang/en.php +++ b/niucloud/app/lang/en.php @@ -12,10 +12,11 @@ * 语言包说明: * 系统相关system: * 返回值语言文件： exception.php - * 枚举相关文件：enum.php + * 枚举相关文件：dict.php * 验证语言文件:validate.php * * 扩展开发相关plugin * */ -return (new \core\addon\AddonLoader("Lang"))->load(["lang_type" =>"en"]); +use core\dict\DictLoader; +return (new DictLoader("Lang"))->load(["lang_type" =>"en"]); diff --git a/niucloud/app/lang/en/system/api.php b/niucloud/app/lang/en/api.php similarity index 100% rename from niucloud/app/lang/en/system/api.php rename to niucloud/app/lang/en/api.php diff --git a/niucloud/app/lang/en/system/enum.php b/niucloud/app/lang/en/dict.php similarity index 89% rename from niucloud/app/lang/en/system/enum.php rename to niucloud/app/lang/en/dict.php index fe6025413..76415025e 100644 --- a/niucloud/app/lang/en/system/enum.php +++ b/niucloud/app/lang/en/dict.php @@ -11,12 +11,12 @@ return [ //端口管理 - 'enum_app' => [ + 'dict_app' => [ 'type_admin' => 'admin', 'type_site' => 'site', 'type_api' => 'api', ], - 'enum_menu' => [ + 'dict_menu' => [ //菜单类型 'type_list' => 'list', 'type_menu' => 'menu', @@ -25,25 +25,25 @@ return [ 'status_on' => 'on', 'status_off' => 'off' ], - 'enum_user' => [ + 'dict_user' => [ //用户状态 'status_on' => 'on', 'status_off' => 'off' ], - 'enum_role' => [ + 'dict_role' => [ //角色状态 'status_on' => 'on', 'status_off' => 'off' ], // 站点 - 'enum_site' => [ + 'dict_site' => [ //站点类型 'type_cms' => 'cms', 'status_on' => 'on', 'status_experience' => 'experience', 'status_expire' => 'expire' ], - 'enum_notice' => [ + 'dict_notice' => [ 'type_sms' => 'sms', 'type_wechat' => 'wechat', 'type_weapp' => 'weapp', @@ -55,7 +55,7 @@ return [ 'var_point' => 'point', ], //上传附件相关 - 'enum_file' => [ + 'dict_file' => [ //上传附件类型 'type_image' => 'image', 'type_video' => 'video', @@ -66,7 +66,7 @@ return [ 'storage_type_qcloud' => 'tencent', ], - 'enum_member' => [ + 'dict_member' => [ //会员端口 'terminal_wechat' => 'wechat', 'terminal_weapp' => 'weapp', @@ -86,19 +86,19 @@ return [ 'account_balance_recharge' => 'recharge', ], - 'enum_order' => [ + 'dict_order' => [ //订单类型 'order_type_recharge' => 'recharge order', ], //微信回复 - 'enum_wechat_reply' => [ + 'dict_wechat_reply' => [ //微信回复状态 'status_on' => 'on', 'status_off' => 'off' ], //自动任务时间间隔 - 'enum_cron' => [ + 'dict_cron' => [ 'type_minute' => 'minute', 'type_day' => 'day', 'type_week' => 'week', @@ -108,38 +108,38 @@ return [ 'type_crond' => 'period work' ], //支付相关 - 'enum_pay' => [ + 'dict_pay' => [ 'type_wechatpay' => 'wechatpay', 'type_alipay' => 'alipay', 'type_unipay' => 'unipay', 'type_offline' => 'offlinepay', ], - 'enum_agreement' => [ + 'dict_agreement' => [ //菜单类型 'service' => 'service agreement', 'privacy' => 'privacy agreement', ], //微信配置 - 'enum_wechat_config' => [ + 'dict_wechat_config' => [ 'not_encrypt' => 'not encrypt', 'compatible' => 'compatible', 'safe' => 'safe' ], //性别 - 'enum_sex' => [ + 'dict_sex' => [ 'unknown' => 'unknown', 'man' => 'man', 'woman' => 'woman' ], - // 自定义页面类型 - 'enum_diy' => [ + // 自定义页面 + 'dict_diy' => [ 'page_index' => 'index', 'page_member_index' => 'member index', 'page_diy' => 'diy page', - 'component_type_basics' => 'base component' + 'component_type_basic' => 'base component' ], //短信相关 - 'enum_sms' => [ + 'dict_sms' => [ 'status_sending' => 'sending', 'status_success' => 'success', 'status_fail' => 'fail', diff --git a/niucloud/app/lang/en/system/validate.php b/niucloud/app/lang/en/validate.php similarity index 100% rename from niucloud/app/lang/en/system/validate.php rename to niucloud/app/lang/en/validate.php diff --git a/niucloud/app/lang/zh-cn.php b/niucloud/app/lang/zh-cn.php index bcf182573..6097fedec 100644 --- a/niucloud/app/lang/zh-cn.php +++ b/niucloud/app/lang/zh-cn.php @@ -12,10 +12,11 @@ * 语言包说明: * 系统相关system: * 返回值语言文件： api.php - * 枚举相关文件：enum.php + * 枚举相关文件：dict.php * 验证语言文件:validate.php * * 扩展开发相关addon * */ -return (new \core\addon\AddonLoader("Lang"))->load(["lang_type" =>"zh-cn"]); +use core\dict\DictLoader; +return (new DictLoader("Lang"))->load(["lang_type" =>"zh-cn"]); \ No newline at end of file diff --git a/niucloud/app/lang/zh-cn/api.php b/niucloud/app/lang/zh-cn/api.php index 9240674d7..3b0cd093b 100644 --- a/niucloud/app/lang/zh-cn/api.php +++ b/niucloud/app/lang/zh-cn/api.php @@ -35,7 +35,9 @@ return [ 'ADDON_UNINSTALL_SUCCESS' => '插件卸载成功', 'DATA_GET_FAIL' => '数据获取失败', 'SERVER_CROSS_REQUEST_FAIL' => '服务器跨域请求异常', - + 'ADDON_INSTALL_NOT_EXIST' => '未找到插件安装任务', + 'ADDON_INSTALL_EXECUTED' => '插件安装任务已执行', + 'INSTALL_CHECK_NOT_PASS' => '安装校验未通过', //登录注册重置账号.... @@ -43,7 +45,7 @@ return [ 'MUST_LOGIN' => '请登录', 'LOGIN_EXPIRE' => '登录过期,请重新登录', 'LOGIN_STATE_ERROR' => '登录状态有误,请重新登录', - 'USER_LOCK' => '账号被限制', + 'USER_LOCK' => '账号被锁定', 'USER_ERROR' => '账号或密码错误', 'NO_SITE_PERMISSION' => '您没有当前站点的访问权限', 'SITE_NOT_EXIST' => '站点不存在', @@ -114,6 +116,7 @@ return [ 'MEMBER_LOGOUT' => '账号退出', 'MEMBER_TYPE_NOT_EXIST' => '账户类型不存在', 'MEMBER_IS_EXIST' => '账号已存在', + 'MEMBER_NO_IS_EXIST' => '会员编号已存在', 'REG_CHANNEL_NOT_EXIST' => '无效的注册渠道', 'MEMBER_USERNAME_LOGIN_NOT_OPEN' => '未开始账号登录注册', 'AUTH_LOGIN_NOT_OPEN' => '未开启第三方登录注册', @@ -158,7 +161,9 @@ return [ //站点相关 'SITE_GROUP_IS_EXIST' => '当前套餐存在站点，请调整站点对应套餐后重试', - + 'SITE_EXPIRE' => '站点已过期', + 'SITE_EXPIRE_NOT_ALLOW' => '站点已打烊，续费后可继续使用此项功能', + 'SITE_CLOSE_NOT_ALLOW' => '站点已停止', //支付相关(todo 注意:7段不共享) 'ALIPAY_TRANSACTION_NO_NOT_EXIST' => '无效的支付交易号', @@ -178,14 +183,26 @@ return [ 'CHANNEL_MARK_INVALID' => '无效的渠道标识', 'TEMPLATE_NOT_EXIST' => '模板不存在', 'IS_EXIST_TEMPLATE_NOT_MODIFY' => '已存在的支付模板不支持修改支付类型', - + //退款相关 + 'REFUND_NOT_EXIST' => '退款单据不存在', //订单相关 8*** 'ORDER_NOT_EXIST' => '订单不存在', 'ORDER_CLOSED' => '订单已关闭', // 退款相关 - 'NOT_ALLOW_APPLY_REFUND' => '当前订单不允许退款', + 'NOT_ALLOW_APPLY_REFUND' => '该订单不允许退款', 'ITEM_REFUND_NOT_EXIST' => '退款单不存在', 'REFUND_STATUS_ABNORMAL' => '退款单状态异常', - 'NO_REFUNDABLE_AMOUNT' => '会员账户金额为0不允许进行退款' + 'NO_REFUNDABLE_AMOUNT' => '会员账户金额为0不允许进行退款', + 'REFUND_HAD_APPLIED' => '订单已申请退款', + 'ORDER_UNPAID_NOT_ALLOW_APPLY_REFUND' => '订单尚未支付不能进行退款', + + + // 缓存相关 + 'CLEAR_MYSQL_CACHE_SUCCESS' => '数据表缓存清除成功', + + //任务队列相关 + 'JOB_NOT_EXISTS' => '任务类不存在', + 'JOB_CREATE_FAIL' => '任务创建失败', + ]; diff --git a/niucloud/app/lang/zh-cn/enum.php b/niucloud/app/lang/zh-cn/dict.php similarity index 81% rename from niucloud/app/lang/zh-cn/enum.php rename to niucloud/app/lang/zh-cn/dict.php index 37e395c74..aa64e5d45 100644 --- a/niucloud/app/lang/zh-cn/enum.php +++ b/niucloud/app/lang/zh-cn/dict.php @@ -11,12 +11,12 @@ return [ //端口管理 - 'enum_app' => [ + 'dict_app' => [ 'type_admin' => '平台管理端', 'type_site' => '站点管理端', 'type_api' => '客户端', ], - 'enum_menu' => [ + 'dict_menu' => [ //菜单类型 'type_list' => '目录', 'type_menu' => '菜单', @@ -25,25 +25,26 @@ return [ 'status_on' => '正常', 'status_off' => '停用' ], - 'enum_user' => [ + 'dict_user' => [ //用户状态 'status_on' => '正常', 'status_off' => '锁定' ], - 'enum_role' => [ + 'dict_role' => [ //角色状态 'status_on' => '启用', 'status_off' => '停用' ], // 站点 - 'enum_site' => [ + 'dict_site' => [ //站点类型 'type_cms' => 'cms', 'status_on' => '正常', 'status_experience' => '体验期', - 'status_expire' => '已到期' + 'status_expire' => '已到期', + 'status_close' => '已停止' ], - 'enum_notice' => [ + 'dict_notice' => [ 'type_sms' => '短信', 'type_wechat' => '微信公众号', 'type_weapp' => '微信小程序', @@ -55,7 +56,7 @@ return [ 'var_point' => '会员积分', ], //上传附件相关 - 'enum_file' => [ + 'dict_file' => [ //上传附件类型 'type_image' => '图片', 'type_video' => '视频', @@ -66,7 +67,7 @@ return [ 'storage_type_qcloud' => '腾讯云', ], - 'enum_member' => [ + 'dict_member' => [ //会员端口 'register_wechat' => '公众号', 'register_weapp' => '微信小程序', @@ -95,28 +96,36 @@ return [ 'account_commission_cash_out' => '佣金提现', 'status_on' => '正常', 'status_off' => '锁定', - 'account_balance_recharge_refund' => '充值订单退款' + 'account_balance_recharge_refund' => '充值订单退款', + 'account_balance_order' => '订单消费', + 'account_balance_order_refund' => '订单退款', ], - 'enum_order' => [ + 'dict_order' => [ //订单类型 'order_type_recharge' => '充值订单', 'trade_type_recharge' => '会员充值', ], - 'enum_refund' => [ + 'dict_refund' => [ //订单类型 'order_type_recharge' => '充值订单', 'trade_type_recharge' => '会员充值', + 'wait' => '待审核', + 'wait_transfer' => "待转账", + "success" => "退款成功", + "fail" => "退款失败", + 'all' => '累计退款', + 'have' => '退款中金额', ], //微信回复 - 'enum_wechat_reply' => [ + 'dict_wechat_reply' => [ //微信回复状态 'status_on' => '启用', 'status_off' => '停用' ], //自动任务时间间隔 - 'enum_cron' => [ + 'dict_cron' => [ 'type_minute' => '分钟', 'type_day' => '天', 'type_week' => '星期', @@ -126,7 +135,7 @@ return [ 'type_crond' => '周期任务' ], //支付相关 - 'enum_pay' => [ + 'dict_pay' => [ 'type_wechatpay' => '微信支付', 'type_alipay' => '支付宝支付', 'type_unipay' => '银联支付', @@ -139,7 +148,7 @@ return [ 'status_cancle' => '已取消', ], //转账相关 - 'enum_transfer' => [ + 'dict_transfer' => [ 'type_wechat' => '微信', 'type_ali' => '支付宝', 'type_bank' => '银行卡', @@ -150,29 +159,29 @@ return [ 'status_success' => '转账成功', 'status_fail' => '转账失败', ], - 'enum_agreement' => [ + 'dict_agreement' => [ //菜单类型 'service' => '服务协议', 'privacy' => '隐私协议', ], //微信配置 - 'enum_wechat_config' => [ + 'dict_wechat_config' => [ 'not_encrypt' => '明文', 'compatible' => '兼容', 'safe' => '安全' ], //性别 - 'enum_sex' => [ + 'dict_sex' => [ 'unknown' => '未知', 'man' => '男', 'woman' => '女' ], - // 自定义页面类型 - 'enum_diy' => [ + // 自定义页面 + 'dict_diy' => [ 'page_index' => '首页', 'page_member_index' => '个人中心', 'page_diy' => '自定义页面', - 'component_type_basics' => '基础组件', + 'component_type_basic' => '基础组件', 'system_link' => '系统页面', 'system_link_index' => '首页', @@ -189,13 +198,13 @@ return [ 'diy_link' => '自定义链接' ], //短信相关 - 'enum_sms' => [ + 'dict_sms' => [ 'status_sending' => '发送中', 'status_success' => '成功', 'status_fail' => '失败', ], //渠道 - 'enum_channel' => [ + 'dict_channel' => [ //渠道端口 'channel_wechat' => '公众号', 'channel_weapp' => '微信小程序', @@ -205,7 +214,7 @@ return [ ], //会员提现 - 'enum_member_cash_out' => [ + 'dict_member_cash_out' => [ //状态 'status_wait_audit' => '待审核', 'status_wait_transfer' => '待转账', @@ -215,7 +224,7 @@ return [ ], //插件操作 - 'enum_addon' => [ + 'dict_addon' => [ //状态 'install' => '安装', 'uninstall' => '卸载', @@ -224,7 +233,7 @@ return [ 'status_off' => '关闭', ], // 退款支付状态 - 'enum_pay_refund' => [ + 'dict_pay_refund' => [ 'success' => '退款成功', 'dealing' => '退款中', 'wait' => '待退款', @@ -235,9 +244,25 @@ return [ 'offline' => '线下退款', 'balance' => '退款到余额', ], - 'enum_order_refund' => [ + 'dict_order_refund' => [ 'refunding' => '退款中', 'refund_complete' => '退款完成', 'refund_fail' => '退款失败' + ], + 'dict_app_manage' => [ + 'system_app' => '基础应用', + 'message_manage' => '消息管理', + 'member_recharge' => '会员充值', + ], + 'dict_setting' => [ + 'server_system' => '服务器系统', + 'server_setting' => '服务器web环境', + 'php_version' => 'PHP版本', + 'mysql_version' => 'mysql版本', + 'php_ask' => '大于等于8.0.0', + 'mysql_ask' => '大于等于5.7', + 'php_authority_ask' => '开启', + 'file_authority_ask' => '可读可写' ] + ]; diff --git a/niucloud/app/lang/zh-cn/validate.php b/niucloud/app/lang/zh-cn/validate.php index d477c9540..e7cd59c76 100644 --- a/niucloud/app/lang/zh-cn/validate.php +++ b/niucloud/app/lang/zh-cn/validate.php @@ -47,7 +47,9 @@ return [ 'expire_time_number' => '到期时间必须是时间戳', 'group_name_require' => '站点分组名称必须填写', 'group_name_max' => '站点分组名称不能超过20字符', - 'group_roles_require' => '分组权限必须填写' + 'group_roles_require' => '分组权限必须填写', + 'front_end_name_require' => '前台名称必须填写', + 'front_end_name_max' => '前台名称最多不能超过20个字符', ], //附件 'validate_attachment' => [ @@ -85,6 +87,11 @@ return [ 'status_require' => '会员状态必须填写', 'not_exit_status' => '不存在的会员状态' ], + 'validate_member_config' => [ + 'length_number' => '会员编码必须是整数', + 'length_min' => '会员编码长度不能小于10', + 'length_max' => '会员编码长度不能大于于20', + ], 'validate_article' => [ 'title_require' => '文章标题必须填写', 'title_max' => '文章标题不能超过20个字符', @@ -149,7 +156,7 @@ return [ ], // 自定义 'validate_diy' => [ - 'type_not_exist' => '不存在的页面类型', + 'type_not_exist' => '不存在的页面模板', ], // 会员提现账号 'validate_member_cash_out_account' => [ diff --git a/niucloud/app/listener/notice/Sms.php b/niucloud/app/listener/notice/Sms.php index c90dd53be..32b61941b 100644 --- a/niucloud/app/listener/notice/Sms.php +++ b/niucloud/app/listener/notice/Sms.php @@ -2,8 +2,7 @@ namespace app\listener\notice; -use app\enum\notice\NoticeTypeEnum; -use app\enum\sys\MessageTypeEnum; +use app\dict\notice\NoticeTypeDict; use app\service\core\member\CoreMemberService; use app\service\core\notice\CoreNoticeLogService; use app\service\core\notice\CoreSmsService; @@ -14,7 +13,6 @@ class Sms public function handle(array $data) { - return true; $site_id = $data['site_id']; $template = $data['template'];//模板 $vars = $data['vars'];//模板变量 @@ -23,7 +21,6 @@ class Sms $mobile = $to['mobile'] ?? ''; //完全信任消息的设置, 不再依赖support_type if (!$template['is_sms']) { - try { $sms_id = $template['sms_id'];//发送模板id $content = $template['sms_content']; $member_id = $to['member_id'] ?? 0; @@ -36,12 +33,14 @@ class Sms $nickname = $info['nickname'] ?? ''; } } + + try{ if (empty($mobile)) throw new NoticeException('NOTICE_SMS_EMPTY');//没有手机号不能发送短信 $core_sms_service = new CoreSmsService(); //消息日志 $log_data = array( 'key' => $key, - 'message_type' => NoticeTypeEnum::SMS, + 'message_type' => NoticeTypeDict::SMS, 'uid' => $uid ?? 0, 'member_id' => $member_id ?? 0, 'nickname' => $nickname ?? '', diff --git a/niucloud/app/listener/notice/Weapp.php b/niucloud/app/listener/notice/Weapp.php index 2a3833697..709b6f612 100644 --- a/niucloud/app/listener/notice/Weapp.php +++ b/niucloud/app/listener/notice/Weapp.php @@ -2,8 +2,8 @@ namespace app\listener\notice; -use app\enum\notice\NoticeTypeEnum; -use app\enum\sys\MessageTypeEnum; +use app\dict\notice\NoticeTypeDict; +use app\dict\sys\MessageTypeDict; use app\service\core\member\CoreMemberService; use app\service\core\notice\CoreNoticeLogService; use core\exception\NoticeException; @@ -30,8 +30,8 @@ class Weapp } if(!empty($openid)) { $weapp_template_id = $template['weapp_template_id']; - $weapp_json = $template['weapp']; - $weapp_content = $weapp_json['content']; + $weapp = $template['weapp']; + $weapp_content = $weapp['content']; $weapp_data = []; foreach($weapp_content as $k => $v){ $search_content = $v[1]; @@ -47,16 +47,16 @@ class Weapp } $log_data = array( 'key' => $key, - 'message_type' => NoticeTypeEnum::WEAPP, + 'message_type' => NoticeTypeDict::WEAPP, 'uid' => $data['uid'] ?? 0, 'member_id' => $member_id, 'nickname' => $nickname ?? '', 'receiver' => $openid, 'params' => $data, - 'content' => $weapp_json + 'content' => $weapp ); try { - (new TemplateLoader(NoticeTypeEnum::WEAPP, ['site_id' => $site_id]))->send( + (new TemplateLoader(NoticeTypeDict::WEAPP, ['site_id' => $site_id]))->send( [ 'template_id' => $weapp_template_id, 'data' => $weapp_data, diff --git a/niucloud/app/listener/notice/Wechat.php b/niucloud/app/listener/notice/Wechat.php index 2bdcd2ea3..0dd8bde45 100644 --- a/niucloud/app/listener/notice/Wechat.php +++ b/niucloud/app/listener/notice/Wechat.php @@ -2,8 +2,8 @@ namespace app\listener\notice; -use app\enum\notice\NoticeTypeEnum; -use app\enum\sys\MessageTypeEnum; +use app\dict\notice\NoticeTypeDict; +use app\dict\sys\MessageTypeDict; use app\service\core\member\CoreMemberService; use app\service\core\notice\CoreNoticeLogService; use core\exception\NoticeException; @@ -14,7 +14,6 @@ class Wechat public function handle(array $data) { - return true; $site_id = $data['site_id']; $template = $data['template'];//模板 $vars = $data['vars'];//模板变量 @@ -33,8 +32,8 @@ class Wechat //或者还有用户的 if(!empty($openid)){ $wechat_template_id = $template['wechat_template_id']; - $wechat_json = $template['wechat']; - $wechat_content = $wechat_json['content']; + $wechat = $template['wechat']; + $wechat_content = $wechat['content']; $wechat_data = []; foreach($wechat_content as $k => $v){ $search_content = $v[1]; @@ -43,8 +42,8 @@ class Wechat } $wechat_data[$v[2]] = $search_content; } - $first = $wechat_json['wechat_first'] ?? ''; - $remark = $wechat_json['wechat_remark'] ?? ''; + $first = $wechat['wechat_first'] ?? ''; + $remark = $wechat['wechat_remark'] ?? ''; if(!empty($first)) $vars['first'] = $first; if(!empty($remark)) $vars['remark'] = $remark; $url = ''; @@ -55,17 +54,17 @@ class Wechat //消息日志 $log_data = array( 'key' => $key, - 'message_type' => NoticeTypeEnum::WECHAT, + 'message_type' => NoticeTypeDict::WECHAT, 'uid' => $data['uid'] ?? 0, 'member_id' => $member_id, 'nickname' => $nickname ?? '', 'receiver' => $openid, 'params' => $vars, - 'content' => $wechat_json + 'content' => $wechat ); try{ - (new TemplateLoader(NoticeTypeEnum::WECHAT, ['site_id' => $site_id]))->send( + (new TemplateLoader(NoticeTypeDict::WECHAT, ['site_id' => $site_id]))->send( [ 'template_id' => $wechat_template_id, 'first' => $remark, diff --git a/niucloud/app/listener/pay/PaySuccessListener.php b/niucloud/app/listener/pay/PaySuccessListener.php index 691bb93d3..e92a5e1aa 100644 --- a/niucloud/app/listener/pay/PaySuccessListener.php +++ b/niucloud/app/listener/pay/PaySuccessListener.php @@ -21,7 +21,7 @@ class PaySuccessListener { public function handle(array $pay_info) { - $class = "app\\enum\\order\\". $pay_info['trade_type']."\\".ucfirst($pay_info['trade_type']).'OrderService'; + $class = "app\\dict\\order\\". $pay_info['trade_type']."\\".ucfirst($pay_info['trade_type']).'OrderService'; return (new $class)->pay($pay_info); } diff --git a/niucloud/app/listener/pay/TransferSuccessListener.php b/niucloud/app/listener/pay/TransferSuccessListener.php index fe94a6a0c..6e68b05b5 100644 --- a/niucloud/app/listener/pay/TransferSuccessListener.php +++ b/niucloud/app/listener/pay/TransferSuccessListener.php @@ -11,7 +11,7 @@ namespace app\listener\pay; -use app\enum\cash_out\CashOutTypeEnum; +use app\dict\cash_out\CashOutTypeDict; use app\service\core\member\CoreMemberCashOutService; /** @@ -22,7 +22,7 @@ class TransferSuccessListener public function handle(array $info) { //会员零钱提现 - if($info['trade_type'] == CashOutTypeEnum::MEMBER_CASH_OUT) + if($info['trade_type'] == CashOutTypeDict::MEMBER_CASH_OUT) { return (new CoreMemberCashOutService())->transferFinish($info['site_id'], $info['transfer_no']); } diff --git a/niucloud/app/listener/scan/ScanListener.php b/niucloud/app/listener/scan/ScanListener.php index 7daadd631..f4ca97e04 100644 --- a/niucloud/app/listener/scan/ScanListener.php +++ b/niucloud/app/listener/scan/ScanListener.php @@ -11,7 +11,7 @@ namespace app\listener\scan; -use app\enum\scan\ScanEnum; +use app\dict\scan\ScanDict; use app\service\api\wechat\WechatAuthService; use app\service\core\order\recharge\CoreRechargeOrderService; @@ -26,13 +26,13 @@ class ScanListener { $action = $data['action']; switch($action){ - case ScanEnum::WECHAT_LOGIN: + case ScanDict::WECHAT_LOGIN: try { $wechat_auth_service = new WechatAuthService(); $data['login_data'] = $wechat_auth_service->login($data['openid']); - $data['status'] = ScanEnum::SUCCESS; + $data['status'] = ScanDict::SUCCESS; }catch(\Throwable $e){ - $data['status'] = ScanEnum::FAIL; + $data['status'] = ScanDict::FAIL; $data['fail_reason'] = get_lang($e->getMessage()); } unset($data['openid']); diff --git a/niucloud/app/listener/site/AddSiteAfterListener.php b/niucloud/app/listener/site/AddSiteAfterListener.php new file mode 100644 index 000000000..9896e8a5e --- /dev/null +++ b/niucloud/app/listener/site/AddSiteAfterListener.php @@ -0,0 +1,35 @@ +install([ 'site_id' => $data[ 'site_id' ] ]); + //加载插件语言包 + return; + } +} \ No newline at end of file diff --git a/niucloud/app/listener/system/AppManageListener.php b/niucloud/app/listener/system/AppManageListener.php index e9c20af7f..36dc283c2 100644 --- a/niucloud/app/listener/system/AppManageListener.php +++ b/niucloud/app/listener/system/AppManageListener.php @@ -25,23 +25,24 @@ class AppManageListener [ "key" => "basic", - "name" => "系统应用" + "name" => get_lang('dict_app_manage.system_app'), + "sort" => 10 ] ], [ "addon" => "", - "title" => "消息管理", + "title" => get_lang('dict_app_manage.message_manage'), "category" => "basic", - "desc" => "消息管理", + "desc" => get_lang('dict_app_manage.message_manage'), "icon" => "static/resource/images/app/message_icon.png", "cover" => "static/resource/images/app/message_cover.png", - "url" => "/setting/message/template" + "url" => "/setting/notice/template" ], [ "addon" => "", - "title" => "会员充值", + "title" => get_lang('dict_app_manage.member_recharge'), "category" => "basic", - "desc" => "会员充值", + "desc" => get_lang('dict_app_manage.member_recharge'), "icon" => "static/resource/images/app/recharge_icon.png", "cover" => "static/resource/images/app/recharge_cover.png", "url" => "/finance/recharge" diff --git a/niucloud/app/model/addon/Addon.php b/niucloud/app/model/addon/Addon.php index ae8d740c8..deb6bbabd 100644 --- a/niucloud/app/model/addon/Addon.php +++ b/niucloud/app/model/addon/Addon.php @@ -11,7 +11,7 @@ namespace app\model\addon; -use app\enum\addon\AddonEnum; +use app\dict\addon\AddonDict; use core\base\BaseModel; /** @@ -45,7 +45,7 @@ class Addon extends BaseModel */ public function getStatusNameAttr($value, $data) { - return AddonEnum::getStatus()[ $data[ 'status' ] ?? '' ] ?? ''; + return AddonDict::getStatus()[ $data[ 'status' ] ?? '' ] ?? ''; } /** * 插件名称搜索器 diff --git a/niucloud/app/model/article/Article.php b/niucloud/app/model/article/Article.php index 6e6a0057f..da01e4b59 100644 --- a/niucloud/app/model/article/Article.php +++ b/niucloud/app/model/article/Article.php @@ -98,6 +98,13 @@ class Article extends BaseModel } } - + public function getArticleUrlAttr($value, $data) { + $site_tag = '/s' . $data['site_id']; + $data = [ + 'wap_url' => ( !empty(env("system.wap_domain")) ? env("system.wap_domain") : request()->domain() ) . "/wap" . $site_tag . "/pages/article/detail?id={$data['id']}", + 'web_url' => ( !empty(env("system.web_domain")) ? env("system.web_domain") : request()->domain() ) . "/web" . $site_tag . "/article/detail?id={$data['id']}" + ]; + return $data; + } } diff --git a/niucloud/app/model/article/ArticleCategory.php b/niucloud/app/model/article/ArticleCategory.php index 30d5e2206..e6e8e3079 100644 --- a/niucloud/app/model/article/ArticleCategory.php +++ b/niucloud/app/model/article/ArticleCategory.php @@ -41,9 +41,15 @@ class ArticleCategory extends BaseModel public function searchNameAttr($query, $value, $data) { if ($value) { - $query->where('name', $value); + $query->where([ ['name', 'like', "%$value%" ]]); } } + public function getArticleNumAttr($value, $data) + { + return (new Article())->where([['category_id', '=', $data['category_id']]])->count(); + } + + } diff --git a/niucloud/app/model/diy/Diy.php b/niucloud/app/model/diy/Diy.php index 9c622afe8..295c2107f 100644 --- a/niucloud/app/model/diy/Diy.php +++ b/niucloud/app/model/diy/Diy.php @@ -11,7 +11,7 @@ namespace app\model\diy; -use app\enum\diy\PageEnum; +use app\dict\diy\TemplateDict; use core\base\BaseModel; @@ -47,7 +47,7 @@ class Diy extends BaseModel */ public function getTypeNameAttr($value, $data) { - return PageEnum::getPageType($data[ 'type' ] ?? '')[ 'title' ] ?? ''; + return TemplateDict::getTemplate($data[ 'type' ] ?? '')[ 'title' ] ?? ''; } /** @@ -98,19 +98,19 @@ class Diy extends BaseModel } /** - * 搜索器:自定义页面页面名称 + * 搜索器:自定义页面名称 * @param $value * @param $data */ public function searchTitleAttr($query, $value, $data) { if ($value) { - $query->where("title", $value); + $query->where("title", 'like', '%' . $value . '%'); } } /** - * 搜索器:自定义页面页面标识 + * 搜索器:自定义页面标识 * @param $value * @param $data */ @@ -122,7 +122,7 @@ class Diy extends BaseModel } /** - * 搜索器:自定义页面页面类型 + * 搜索器:自定义页面模板 * @param $value * @param $data */ @@ -134,7 +134,7 @@ class Diy extends BaseModel } /** - * 搜索器:自定义页面页面数据，json格式 + * 搜索器:自定义页面数据，json格式 * @param $value * @param $data */ diff --git a/niucloud/app/model/member/Member.php b/niucloud/app/model/member/Member.php index e1419c645..b3e2f6540 100644 --- a/niucloud/app/model/member/Member.php +++ b/niucloud/app/model/member/Member.php @@ -11,12 +11,12 @@ namespace app\model\member; -use app\enum\common\ChannelEnum; -use app\enum\common\CommonEnum; -use app\enum\member\MemberEnum; -use app\enum\member\MemberLoginTypeEnum; -use app\enum\member\MemberRegisterChannelEnum; -use app\enum\member\MemberRegisterTypeEnum; +use app\dict\common\ChannelDict; +use app\dict\common\CommonDict; +use app\dict\member\MemberDict; +use app\dict\member\MemberLoginTypeDict; +use app\dict\member\MemberRegisterChannelDict; +use app\dict\member\MemberRegisterTypeDict; use core\base\BaseModel; use think\db\Query; use think\model\concern\SoftDelete; @@ -72,7 +72,7 @@ class Member extends BaseModel */ public function getStatusNameAttr($value, $data) { - return MemberEnum::getStatus()[$data['status'] ?? ''] ?? ''; + return MemberDict::getStatus()[$data['status'] ?? ''] ?? ''; } /** * 注册来源字段转化 @@ -81,7 +81,7 @@ class Member extends BaseModel */ public function getRegisterChannelNameAttr($value, $data) { - return MemberRegisterChannelEnum::getType()[ $data[ 'register_channel' ] ?? '' ] ?? ''; + return MemberRegisterChannelDict::getType()[ $data[ 'register_channel' ] ?? '' ] ?? ''; } /** @@ -91,7 +91,7 @@ class Member extends BaseModel */ public function getRegisterTypeNameAttr($value, $data) { - return MemberRegisterTypeEnum::getType()[ $data[ 'register_type' ] ?? '' ] ?? ''; + return MemberRegisterTypeDict::getType()[ $data[ 'register_type' ] ?? '' ] ?? ''; } /** @@ -101,7 +101,7 @@ class Member extends BaseModel */ public function getLoginChannelNameAttr($value, $data) { - return ChannelEnum::getType()[ $data[ 'login_channel' ] ?? '' ] ?? ''; + return ChannelDict::getType()[ $data[ 'login_channel' ] ?? '' ] ?? ''; } /** @@ -111,7 +111,7 @@ class Member extends BaseModel */ public function getLoginTypeNameAttr($value, $data) { - return MemberLoginTypeEnum::getType()[ $data[ 'login_type' ] ?? '' ] ?? ''; + return MemberLoginTypeDict::getType()[ $data[ 'login_type' ] ?? '' ] ?? ''; } /** @@ -122,7 +122,7 @@ class Member extends BaseModel */ public function getSexNameAttr($value, $data) { - return CommonEnum::getSexType()[ $data[ 'sex' ] ?? '' ] ?? ''; + return CommonDict::getSexType()[ $data[ 'sex' ] ?? '' ] ?? ''; } /** @@ -143,7 +143,7 @@ class Member extends BaseModel public function searchKeywordAttr($query, $value, $data) { if ($value) { - $query->where('username|nickname|mobile', 'like', '%' . $value . '%'); + $query->where('member_no|username|nickname|mobile', 'like', '%' . $value . '%'); } } @@ -197,11 +197,11 @@ class Member extends BaseModel $start_time = empty($value[ 0 ]) ? 0 : strtotime($value[ 0 ]); $end_time = empty($value[ 1 ]) ? 0 : strtotime($value[ 1 ]); if ($start_time > 0 && $end_time > 0) { - $query->whereBetweenTime('create_time', $start_time, $end_time); + $query->whereBetweenTime('member.create_time', $start_time, $end_time); } else if ($start_time > 0 && $end_time == 0) { - $query->where([ [ 'create_time', '>=', $start_time ] ]); + $query->where([ [ 'member.create_time', '>=', $start_time ] ]); } else if ($start_time == 0 && $end_time > 0) { - $query->where([ [ 'create_time', '<=', $end_time ] ]); + $query->where([ [ 'member.create_time', '<=', $end_time ] ]); } } diff --git a/niucloud/app/model/member/MemberAccountLog.php b/niucloud/app/model/member/MemberAccountLog.php index 4073b031d..fb23eeb2a 100644 --- a/niucloud/app/model/member/MemberAccountLog.php +++ b/niucloud/app/model/member/MemberAccountLog.php @@ -11,7 +11,8 @@ namespace app\model\member; -use app\enum\member\MemberAccountEnum; +use app\dict\member\MemberAccountChangeTypeDict; +use app\dict\member\MemberAccountTypeDict; use core\base\BaseModel; /** @@ -43,7 +44,7 @@ class MemberAccountLog extends BaseModel */ public function getAccountTypeNameAttr($value,$data) { - return MemberAccountEnum::getType()[$data['account_type'] ?? ''] ?? ''; + return MemberAccountTypeDict::getType()[$data['account_type'] ?? ''] ?? ''; } /** @@ -53,10 +54,19 @@ class MemberAccountLog extends BaseModel public function memberInfo() { return $this->hasOne( Member::class, 'member_id', 'member_id')->joinType('left') - ->withField('member_id, username, mobile, nickname, headimg') + ->withField('member_id,member_no, username, mobile, nickname, headimg') ->bind(['username', 'mobile', 'nickname', 'headimg']); } + /** + * 会员关联 + * @return \think\model\relation\HasOne + */ + public function member() + { + return $this->hasOne( Member::class, 'member_id', 'member_id')->withField('member_id, member_no, username, mobile, nickname, headimg')->joinType('left'); + } + /** * 获取account_data * @param $value @@ -71,6 +81,20 @@ class MemberAccountLog extends BaseModel return $data['account_data']; } + /** + * 获取account_sum + * @param $value + * @param $data + * @return int + */ + public function getAccountSumAttr($value,$data) + { + if($data['account_type'] == 'point'|| $data['account_type'] == 'growth') + return (int)$data['account_sum']; + else + return $data['account_sum']; + } + /** * 获取账户变动类型名称 * @param $value @@ -80,7 +104,7 @@ class MemberAccountLog extends BaseModel public function getFromTypeNameAttr($value,$data) { if(isset($data['from_type'])&& isset($data['account_type'])) - return MemberAccountEnum::getFromType($data['account_type'])[$data['from_type']]['name']; + return MemberAccountChangeTypeDict::getType($data['account_type'])[$data['from_type']]['name']; else return ''; } @@ -92,7 +116,7 @@ class MemberAccountLog extends BaseModel public function searchMemberIdAttr($query, $value, $data) { if ($value) { - $query->where('member_id', $value); + $query->where('member_account_log.member_id', $value); } } @@ -127,11 +151,11 @@ class MemberAccountLog extends BaseModel $start_time = empty($value[0]) ? 0 : strtotime($value[0]) ; $end_time = empty($value[1]) ? 0 : strtotime($value[1]) ; if($start_time > 0 && $end_time > 0){ - $query->whereBetweenTime('create_time', $start_time, $end_time); + $query->whereBetweenTime('member_account_log.create_time', $start_time, $end_time); }else if($start_time > 0 && $end_time == 0){ - $query->where([['create_time', '>=', $start_time]]); + $query->where([['member_account_log.create_time', '>=', $start_time]]); }else if($start_time == 0 && $end_time > 0){ - $query->where([['create_time', '<=', $end_time]]); + $query->where([['member_account_log.create_time', '<=', $end_time]]); } } diff --git a/niucloud/app/model/member/MemberCashOut.php b/niucloud/app/model/member/MemberCashOut.php index 5cdf39ffb..c57958650 100644 --- a/niucloud/app/model/member/MemberCashOut.php +++ b/niucloud/app/model/member/MemberCashOut.php @@ -11,9 +11,9 @@ namespace app\model\member; -use app\enum\member\MemberAccountEnum; -use app\enum\member\MemberCashOutEnum; -use app\enum\pay\TransferEnum; +use app\dict\member\MemberAccountTypeDict; +use app\dict\member\MemberCashOutDict; +use app\dict\pay\TransferDict; use app\model\pay\Transfer; use core\base\BaseModel; @@ -34,6 +34,10 @@ class MemberCashOut extends BaseModel * @var string */ protected $name = 'member_cash_out'; + protected $type = [ + 'audit_time' => 'timestamp', + 'transfer_time' => 'timestamp', + ]; /** * 会员信息 @@ -42,8 +46,17 @@ class MemberCashOut extends BaseModel public function memberInfo() { return $this->hasOne( Member::class, 'member_id', 'member_id')->joinType('left') - ->withField('member_id, username, mobile, nickname, headimg') - ->bind(['username', 'mobile', 'nickname', 'headimg']); + ->withField('member_id, member_no, username, mobile, nickname, headimg') + ->bind(['username', 'mobile', 'nickname', 'headimg', 'member_no']); + } + + /** + * 会员信息关联列表查询 + * @return \think\model\relation\HasOne + */ + public function member() + { + return $this->hasOne( Member::class, 'member_id', 'member_id')->joinType('left'); } /** @@ -63,7 +76,7 @@ class MemberCashOut extends BaseModel * @return mixed|string */ public function getAccountTypeNameAttr($value, $data){ - return MemberAccountEnum::getType()[ $data[ 'account_type' ] ?? '' ] ?? ''; + return MemberAccountTypeDict::getType()[ $data[ 'account_type' ] ?? '' ] ?? ''; } /** * 提现状态名称 @@ -72,7 +85,7 @@ class MemberCashOut extends BaseModel * @return mixed|string */ public function getStatusNameAttr($value, $data){ - return MemberCashOutEnum::getStatus()[ $data[ 'status' ] ?? '' ] ?? ''; + return MemberCashOutDict::getStatus()[ $data[ 'status' ] ?? '' ] ?? ''; } /** * 转账方式名称 @@ -82,7 +95,7 @@ class MemberCashOut extends BaseModel */ public function getTransferTypeNameAttr($value, $data) { - return TransferEnum::getTransferType()[ $data[ 'transfer_type' ] ?? '' ]['name'] ?? ''; + return TransferDict::getTransferType()[ $data[ 'transfer_type' ] ?? '' ]['name'] ?? ''; } /** @@ -92,7 +105,7 @@ class MemberCashOut extends BaseModel * @return mixed|string */ public function getTransferStatusNameAttr($value, $data){ - return TransferEnum::getStatus()[ $data[ 'transfer_status' ] ?? '' ] ?? ''; + return TransferDict::getStatus()[ $data[ 'transfer_status' ] ?? '' ] ?? ''; } /** * 会员搜索 @@ -118,6 +131,30 @@ class MemberCashOut extends BaseModel } } + /** + * + * @param $value + * @param $data + */ + public function searchCashOutNoAttr($query, $value, $data) + { + if ($value) { + $query->where('cash_out_no', $value); + } + } + + /** + * + * @param $value + * @param $data + */ + public function searchTransferTypeAttr($query, $value, $data) + { + if ($value) { + $query->where('transfer_type', $value); + } + } + /** * 创建时间搜索器 * @param $value @@ -135,4 +172,38 @@ class MemberCashOut extends BaseModel } } + /** + * 审核时间搜索器 + * @param $value + */ + public function searchAuditTimeAttr($query, $value, $data) + { + $start_time = empty($value[0]) ? 0 : strtotime($value[0]) ; + $end_time = empty($value[1]) ? 0 : strtotime($value[1]) ; + if($start_time > 0 && $end_time > 0){ + $query->whereBetweenTime('audit_time', $start_time, $end_time); + }else if($start_time > 0 && $end_time == 0){ + $query->where([['audit_time', '>=', $start_time]]); + }else if($start_time == 0 && $end_time > 0){ + $query->where([['audit_time', '<=', $end_time]]); + } + } + + /** + * 审核时间搜索器 + * @param $value + */ + public function searchTransferTimeAttr($query, $value, $data) + { + $start_time = empty($value[0]) ? 0 : strtotime($value[0]) ; + $end_time = empty($value[1]) ? 0 : strtotime($value[1]) ; + if($start_time > 0 && $end_time > 0){ + $query->whereBetweenTime('transfer_time', $start_time, $end_time); + }else if($start_time > 0 && $end_time == 0){ + $query->where([['transfer_time', '>=', $start_time]]); + }else if($start_time == 0 && $end_time > 0){ + $query->where([['transfer_time', '<=', $end_time]]); + } + } + } diff --git a/niucloud/app/model/member/MemberCashOutAccount.php b/niucloud/app/model/member/MemberCashOutAccount.php index 3928d4923..5f099c1ab 100644 --- a/niucloud/app/model/member/MemberCashOutAccount.php +++ b/niucloud/app/model/member/MemberCashOutAccount.php @@ -11,7 +11,7 @@ namespace app\model\member; -use app\enum\pay\TransferEnum; +use app\dict\pay\TransferDict; use core\base\BaseModel; /** @@ -39,7 +39,7 @@ class MemberCashOutAccount extends BaseModel * @return mixed|string */ public function getAccountTypeNameAttr($value, $data){ - return TransferEnum::getTransferType()[ $data[ 'transfer_type' ] ?? '' ] ?? ''; + return TransferDict::getTransferType()[ $data[ 'transfer_type' ] ?? '' ] ?? ''; } /** diff --git a/niucloud/app/model/member/MemberLabel.php b/niucloud/app/model/member/MemberLabel.php index be08889bf..a0b8d2bdc 100644 --- a/niucloud/app/model/member/MemberLabel.php +++ b/niucloud/app/model/member/MemberLabel.php @@ -33,4 +33,30 @@ class MemberLabel extends BaseModel */ protected $name = 'member_label'; + /** + * 获取对应标签的会员数量 + * @param $value + * @return mixed + */ + public function getMemberNumAttr($value, $data) + { + if(isset($data['label_id'])) + { + return (new Member())->where([['member_label', 'like', '%"' . $data['label_id'] . '"%' ]])->count(); + }else + return 0; + } + + /** + * 会员标签 + * @param $value + * @param $data + */ + public function searchLabelNameAttr($query, $value, $data) + { + if ($value) { + $query->where('label_name','like', '%'.$value.'%'); + } + } + } diff --git a/niucloud/app/model/order/Order.php b/niucloud/app/model/order/Order.php index 5514abcb1..c3926def8 100644 --- a/niucloud/app/model/order/Order.php +++ b/niucloud/app/model/order/Order.php @@ -11,7 +11,7 @@ namespace app\model\order; -use app\enum\common\ChannelEnum; +use app\dict\common\ChannelDict; use app\model\member\Member; use core\base\BaseModel; @@ -51,12 +51,28 @@ class Order extends BaseModel { if(isset($data['order_type']) && isset($data['order_status'])) { - $class = "app\\enum\\order\\". ucfirst($data['order_type']).'OrderEnum'; + $class = "app\\dict\\order\\". ucfirst($data['order_type']).'OrderDict'; return $class::getStatus($data['order_status']); }else return []; } + /** + * 获取退款状态 + * @param $value + * @param $data + * @return void + */ + public function getRefundStatusNameAttr($value, $data) { + if(isset($data['order_type']) && isset($data['refund_status'])) + { + $class = "app\\dict\\order\\". ucfirst($data['order_type']).'OrderDict'; + return $class::getRefundStatus($data['refund_status'])['name'] ?? ''; + } else { + return ''; + } + } + /** * 登录渠道字段转化 * @param $value @@ -66,7 +82,7 @@ class Order extends BaseModel { if(isset($data['order_from'])) { - return ChannelEnum::getType()[$data['order_from']] ?? ''; + return ChannelDict::getType()[$data['order_from']] ?? ''; } } @@ -123,6 +139,39 @@ class Order extends BaseModel } } + /** + * 订单号 + * @param $query + * @param $value + * @param $data + */ + public function searchOrderNoAttr($query, $value, $data) + { + if ($value) { + $query->where('order_no', '=', $value); + } + } + + /** + * 订单金额 + * @param $query + * @param $value + * @param $data + * @return void + */ + public function searchOrderMoneyAttr($query, $value, $data) + { + if (!empty($data['start_money']) && !empty($data['end_money'])) { + $money = [ $data['start_money'], $data['end_money'] ]; + sort($money); + $query->where('order_money', 'between', $money); + } else if (!empty($data['start_money'])) { + $query->where('order_money', '>=', $data['start_money']); + } else if (!empty($data['end_money'])) { + $query->where('order_money', '<=', $data['end_money']); + } + } + /** * 订单状态 * @param $query @@ -152,6 +201,26 @@ class Order extends BaseModel } } + /** + * 支付时间筛选 + * @param $query + * @param $value + * @param $data + * @return void + */ + public function searchPayTimeAttr($query, $value, $data) + { + $start_time = empty($value[0]) ? 0 : strtotime($value[0]) ; + $end_time = empty($value[1]) ? 0 : strtotime($value[1]) ; + if($start_time > 0 && $end_time > 0){ + $query->whereBetweenTime('pay_time', $start_time, $end_time); + }else if($start_time > 0 && $end_time == 0){ + $query->where([['pay_time', '>=', $start_time]]); + }else if($start_time == 0 && $end_time > 0){ + $query->where([['pay_time', '<=', $end_time]]); + } + } + /** * 订单项目 * @return \think\model\relation\HasMany diff --git a/niucloud/app/model/order/OrderItem.php b/niucloud/app/model/order/OrderItem.php index cc1b697a5..7ab4235f4 100644 --- a/niucloud/app/model/order/OrderItem.php +++ b/niucloud/app/model/order/OrderItem.php @@ -33,6 +33,13 @@ class OrderItem extends BaseModel */ protected $name = 'order_item'; + /** + * @return HasOne + */ + public function orderNo() + { + return $this->hasOne(Order::class, 'order_id', 'order_id')->joinType('left')->withField('order_id, order_no')->bind(['order_no' => 'order_no']); + } /** * 数量字段处理 * @param $value diff --git a/niucloud/app/model/order/OrderItemRefund.php b/niucloud/app/model/order/OrderItemRefund.php index b12947d8f..20a78ce7c 100644 --- a/niucloud/app/model/order/OrderItemRefund.php +++ b/niucloud/app/model/order/OrderItemRefund.php @@ -11,7 +11,7 @@ namespace app\model\order; -use app\enum\pay\PayRefundEnum; +use app\dict\pay\PayRefundDict; use app\model\member\Member; use app\model\pay\Refund; use core\base\BaseModel; @@ -49,7 +49,7 @@ class OrderItemRefund extends BaseModel */ public function getStatusNameAttr($value, $data) { - $class = "\\app\\enum\\order\\" . ucfirst($data['item_type']). "OrderEnum"; + $class = "\\app\\dict\\order\\" . ucfirst($data['item_type']). "OrderDict"; if (!class_exists($class)) return ''; return $class::getRefundStatus()[$data['status'] ?? '']['name'] ?? ''; } @@ -68,7 +68,7 @@ class OrderItemRefund extends BaseModel */ public function member() { - return $this->hasOne(Member::class,'member_id', 'member_id'); + return $this->hasOne( Member::class, 'member_id', 'member_id')->withField('member_id, username, mobile, nickname, headimg')->joinType('left'); } /** @@ -92,6 +92,20 @@ class OrderItemRefund extends BaseModel } } + + /** + * 订单号搜索 + * @param $query + * @param $value + * @param $data + */ + public function searchOrderNoAttr($query, $value, $data) + { + if ($value) { + $query->where('order_item_refund.order_no', '=', $value); + } + } + /** * 会员id搜索 * @param $query @@ -101,7 +115,7 @@ class OrderItemRefund extends BaseModel public function searchMemberIdAttr($query, $value, $data) { if ($value) { - $query->where('member_id', '=', $value); + $query->where('order_item_refund.member_id', '=', $value); } } @@ -114,7 +128,7 @@ class OrderItemRefund extends BaseModel public function searchStatusAttr($query, $value, $data) { if ($value != '') { - $query->where('status', '=', $value); + $query->where('order_item_refund.status', '=', $value); } } @@ -127,11 +141,11 @@ class OrderItemRefund extends BaseModel $start_time = empty($value[0]) ? 0 : strtotime($value[0]) ; $end_time = empty($value[1]) ? 0 : strtotime($value[1]) ; if($start_time > 0 && $end_time > 0){ - $query->whereBetweenTime('create_time', $start_time, $end_time); + $query->whereBetweenTime('order_item_refund.create_time', $start_time, $end_time); }else if($start_time > 0 && $end_time == 0){ - $query->where([['create_time', '>=', $start_time]]); + $query->where([['order_item_refund.create_time', '>=', $start_time]]); }else if($start_time == 0 && $end_time > 0){ - $query->where([['create_time', '<=', $end_time]]); + $query->where([['order_item_refund.create_time', '<=', $end_time]]); } } } diff --git a/niucloud/app/model/pay/Pay.php b/niucloud/app/model/pay/Pay.php index d30e004e8..a4f1cdcc7 100644 --- a/niucloud/app/model/pay/Pay.php +++ b/niucloud/app/model/pay/Pay.php @@ -11,8 +11,8 @@ namespace app\model\pay; -use app\enum\order\OrderTypeEnum; -use app\enum\pay\PayEnum; +use app\dict\order\OrderTypeDict; +use app\dict\pay\PayDict; use core\base\BaseModel; /** @@ -54,7 +54,7 @@ class Pay extends BaseModel */ public function getStatusNameAttr($value, $data) { - return PayEnum::getStatus()[$data['status'] ?? ''] ?? ''; + return PayDict::getStatus()[$data['status'] ?? ''] ?? ''; } /** @@ -64,7 +64,7 @@ class Pay extends BaseModel * @return void */ public function getPayTypeListAttr($value, $data){ - return OrderTypeEnum::getAllowPayType($data['trade_type']); + return OrderTypeDict::getAllowPayType($data['trade_type']); } /** * 支付方式字段转化 @@ -73,7 +73,7 @@ class Pay extends BaseModel */ public function getTypeNameAttr($value, $data) { - return PayEnum::getPayType()[$data['type'] ?? '']['name'] ?? ''; + return PayDict::getPayType()[$data['type'] ?? '']['name'] ?? ''; } } diff --git a/niucloud/app/model/pay/PayChannel.php b/niucloud/app/model/pay/PayChannel.php index 58fb2b66b..a745f3389 100644 --- a/niucloud/app/model/pay/PayChannel.php +++ b/niucloud/app/model/pay/PayChannel.php @@ -11,8 +11,8 @@ namespace app\model\pay; -use app\enum\common\ChannelEnum; -use app\enum\pay\PayEnum; +use app\dict\common\ChannelDict; +use app\dict\pay\PayDict; use core\base\BaseModel; /** @@ -47,7 +47,7 @@ class PayChannel extends BaseModel */ public function getTypeNameAttr($value, $data) { - return PayEnum::getPayType()[$data['type'] ?? '']['name'] ?? ''; + return PayDict::getPayType()[$data['type'] ?? '']['name'] ?? ''; } /** @@ -57,7 +57,7 @@ class PayChannel extends BaseModel */ public function getChannelNameAttr($value, $data) { - return ChannelEnum::getType()[$data['channel'] ?? ''] ?? ''; + return ChannelDict::getType()[$data['channel'] ?? ''] ?? ''; } } diff --git a/niucloud/app/model/pay/Refund.php b/niucloud/app/model/pay/Refund.php index e39cebdc9..8210b937c 100644 --- a/niucloud/app/model/pay/Refund.php +++ b/niucloud/app/model/pay/Refund.php @@ -11,10 +11,10 @@ namespace app\model\pay; -use app\enum\order\OrderTypeEnum; -use app\enum\pay\PayEnum; -use app\enum\pay\PayRefundEnum; -use app\enum\pay\RefundEnum; +use app\dict\order\OrderTypeDict; +use app\dict\pay\PayDict; +use app\dict\pay\PayRefundDict; +use app\dict\pay\RefundDict; use core\base\BaseModel; /** @@ -50,7 +50,7 @@ class Refund extends BaseModel */ public function getStatusNameAttr($value, $data) { - return RefundEnum::getStatus()[$data['status'] ?? ''] ?? ''; + return RefundDict::getStatus()[$data['status'] ?? ''] ?? ''; } /** @@ -60,7 +60,7 @@ class Refund extends BaseModel */ public function getTypeNameAttr($value, $data) { - return RefundEnum::getType()[$data['type'] ?? ''] ?? ''; + return RefundDict::getType()[$data['type'] ?? ''] ?? ''; } } diff --git a/niucloud/app/model/pay/Transfer.php b/niucloud/app/model/pay/Transfer.php index 8a1b02741..9d88c91d6 100644 --- a/niucloud/app/model/pay/Transfer.php +++ b/niucloud/app/model/pay/Transfer.php @@ -11,7 +11,7 @@ namespace app\model\pay; -use app\enum\pay\TransferEnum; +use app\dict\pay\TransferDict; use core\base\BaseModel; /** @@ -48,7 +48,7 @@ class Transfer extends BaseModel */ public function getTransferStatusNameAttr($value, $data) { - return TransferEnum::getStatus()[$data['transfer_status'] ?? ''] ?? ''; + return TransferDict::getStatus()[$data['transfer_status'] ?? ''] ?? ''; } @@ -59,7 +59,7 @@ class Transfer extends BaseModel */ public function getTransferTypeNameAttr($value, $data) { - return TransferEnum::getTransferType()[$data['transfer_type'] ?? '']['name'] ?? ''; + return TransferDict::getTransferType()[$data['transfer_type'] ?? '']['name'] ?? ''; } } diff --git a/niucloud/app/model/site/Site.php b/niucloud/app/model/site/Site.php index 712ce8d9f..4bbe2ad74 100644 --- a/niucloud/app/model/site/Site.php +++ b/niucloud/app/model/site/Site.php @@ -11,7 +11,7 @@ namespace app\model\site; -use app\enum\site\SiteEnum; +use app\dict\site\SiteDict; use core\base\BaseModel; use think\db\Query; @@ -46,7 +46,7 @@ class Site extends BaseModel */ public function getStatusNameAttr($value, $data) { - return SiteEnum::getStatus()[$data['status'] ?? ''] ?? ''; + return SiteDict::getStatus()[$data['status'] ?? ''] ?? ''; } /** * 关键字搜索 @@ -114,5 +114,22 @@ class Site extends BaseModel } } + /** + * 到期时间搜索器 + * @param $value + */ + public function searchExpireTimeAttr(Query $query, $value, $data) + { + $start_time = empty($value[ 0 ]) ? 0 : strtotime($value[ 0 ]); + $end_time = empty($value[ 1 ]) ? 0 : strtotime($value[ 1 ]); + if ($start_time > 0 && $end_time > 0) { + $query->whereBetweenTime('expire_time', $start_time, $end_time); + } else if ($start_time > 0 && $end_time == 0) { + $query->where([ [ 'expire_time', '>=', $start_time ] ]); + } else if ($start_time == 0 && $end_time > 0) { + $query->where([ [ 'expire_time', '<=', $end_time ] ]); + } + } + } diff --git a/niucloud/app/model/sys/SysAgreement.php b/niucloud/app/model/sys/SysAgreement.php index f744b34a6..f1e9b4aa5 100644 --- a/niucloud/app/model/sys/SysAgreement.php +++ b/niucloud/app/model/sys/SysAgreement.php @@ -11,7 +11,7 @@ namespace app\model\sys; -use app\enum\sys\AgreementEnum; +use app\dict\sys\AgreementDict; use core\base\BaseModel; /** @@ -45,6 +45,6 @@ class SysAgreement extends BaseModel */ public function getAgreementKeyNameAttr($value, $data) { - return AgreementEnum::getType()[$data['agreement_key'] ?? ''] ?? ''; + return AgreementDict::getType()[$data['agreement_key'] ?? ''] ?? ''; } } diff --git a/niucloud/app/model/sys/SysCronTask.php b/niucloud/app/model/sys/SysCronTask.php index 885599fa0..61baf4d3c 100644 --- a/niucloud/app/model/sys/SysCronTask.php +++ b/niucloud/app/model/sys/SysCronTask.php @@ -11,7 +11,7 @@ namespace app\model\sys; -use app\enum\sys\CronEnum; +use app\dict\sys\CronDict; use core\base\BaseModel; use think\db\Query; @@ -52,7 +52,7 @@ class SysCronTask extends BaseModel */ public function getTypeNameAttr($value, $data) { - return CronEnum::getType()[$data['type'] ?? ''] ?? ''; + return CronDict::getType()[$data['type'] ?? ''] ?? ''; } /** @@ -62,7 +62,7 @@ class SysCronTask extends BaseModel */ public function getCrondTypeNameAttr($value, $data) { - return CronEnum::getCrondType()[$data['crond_type'] ?? ''] ?? ''; + return CronDict::getCrondType()[$data['crond_type'] ?? ''] ?? ''; } /** * 任务名称搜索器 diff --git a/niucloud/app/model/sys/SysMenu.php b/niucloud/app/model/sys/SysMenu.php index 11337e4cb..b6c34306a 100644 --- a/niucloud/app/model/sys/SysMenu.php +++ b/niucloud/app/model/sys/SysMenu.php @@ -11,8 +11,8 @@ namespace app\model\sys; -use app\enum\sys\MenuEnum; -use app\enum\sys\MenuTypeEnum; +use app\dict\sys\MenuDict; +use app\dict\sys\MenuTypeDict; use core\base\BaseModel; /** @@ -38,6 +38,18 @@ class SysMenu extends BaseModel * @var array */ protected $append = ['status_name', 'menu_type_name']; + + /** + * 定义软删除标记字段 + * @var string + */ + protected $deleteTime = 'delete_time'; + /** + * 定义软删除字段的默认值 + * @var int + */ + protected $defaultSoftDelete = 0; + /** * 菜单类型 * @param $value @@ -46,7 +58,7 @@ class SysMenu extends BaseModel */ public function getMenuTypeNameAttr($value,$data) { - return MenuTypeEnum::getMenuType()[$data['menu_type'] ?? ''] ?? ''; + return MenuTypeDict::getMenuType()[$data['menu_type'] ?? ''] ?? ''; } /** @@ -57,6 +69,6 @@ class SysMenu extends BaseModel */ public function getStatusNameAttr($value,$data) { - return MenuEnum::getStatus()[$data['status'] ?? ''] ?? ''; + return MenuDict::getStatus()[$data['status'] ?? ''] ?? ''; } } diff --git a/niucloud/app/model/sys/SysNoticeLog.php b/niucloud/app/model/sys/SysNoticeLog.php index 78be21be6..87050ba0a 100644 --- a/niucloud/app/model/sys/SysNoticeLog.php +++ b/niucloud/app/model/sys/SysNoticeLog.php @@ -11,7 +11,7 @@ namespace app\model\sys; -use app\enum\notice\NoticeTypeEnum; +use app\dict\notice\NoticeTypeDict; use core\base\BaseModel; use think\db\Query; @@ -66,7 +66,7 @@ class SysNoticeLog extends BaseModel */ public function getNameAttr($value,$data) { - $temp = \app\enum\notice\NoticeEnum::getNotice()[$data['key'] ?? ''] ?? ''; + $temp = \app\dict\notice\NoticeDict::getNotice()[$data['key'] ?? ''] ?? ''; return $temp['name'] ?? ''; } @@ -78,7 +78,7 @@ class SysNoticeLog extends BaseModel */ public function getNoticeTypeNameAttr($value,$data) { - $temp = NoticeTypeEnum::getType()[$data['notice_type'] ?? ''] ?? ''; + $temp = NoticeTypeDict::getType()[$data['notice_type'] ?? ''] ?? ''; return $temp['name'] ?? ''; } /** diff --git a/niucloud/app/model/sys/SysNoticeSmsLog.php b/niucloud/app/model/sys/SysNoticeSmsLog.php index 7f880ce84..3ca06646a 100644 --- a/niucloud/app/model/sys/SysNoticeSmsLog.php +++ b/niucloud/app/model/sys/SysNoticeSmsLog.php @@ -11,7 +11,7 @@ namespace app\model\sys; -use app\enum\sys\SmsEnum; +use app\dict\sys\SmsDict; use core\base\BaseModel; /** @@ -65,7 +65,7 @@ class SysNoticeSmsLog extends BaseModel */ public function getNameAttr($value,$data) { - $temp = \app\enum\notice\NoticeEnum::getNotice()[$data['key'] ?? '']; + $temp = \app\dict\notice\NoticeDict::getNotice()[$data['key'] ?? '']; return $temp['name'] ?? ''; } @@ -77,7 +77,7 @@ class SysNoticeSmsLog extends BaseModel */ public function getStatusNameAttr($value,$data) { - return SmsEnum::getStatusType()[$data['status'] ?? ''] ?? ''; + return SmsDict::getStatusType()[$data['status'] ?? ''] ?? ''; } /** @@ -88,7 +88,7 @@ class SysNoticeSmsLog extends BaseModel */ public function getSmsTypesNameAttr($value,$data) { - $temp = SmsEnum::getType()[$data['sms_type'] ?? ''] ?? []; + $temp = SmsDict::getType()[$data['sms_type'] ?? ''] ?? []; return $temp['name'] ?? ''; } /** diff --git a/niucloud/app/model/sys/SysRole.php b/niucloud/app/model/sys/SysRole.php index 33eab4be1..9d6bdbd7a 100644 --- a/niucloud/app/model/sys/SysRole.php +++ b/niucloud/app/model/sys/SysRole.php @@ -11,7 +11,7 @@ namespace app\model\sys; -use app\enum\sys\RoleStatusEnum; +use app\dict\sys\RoleStatusDict; use core\base\BaseModel; /** @@ -45,7 +45,7 @@ class SysRole extends BaseModel * @return string */ public function getStatusNameAttr($value, $data){ - return RoleStatusEnum::getStatus()[$data['status'] ?? ''] ?? ''; + return RoleStatusDict::getStatus()[$data['status'] ?? ''] ?? ''; } diff --git a/niucloud/app/model/sys/SysUser.php b/niucloud/app/model/sys/SysUser.php index 582ebd75f..56236aad8 100644 --- a/niucloud/app/model/sys/SysUser.php +++ b/niucloud/app/model/sys/SysUser.php @@ -11,7 +11,7 @@ namespace app\model\sys; -use app\enum\sys\UserEnum; +use app\dict\sys\UserDict; use core\base\BaseModel; use think\model\concern\SoftDelete; @@ -72,7 +72,12 @@ class SysUser extends BaseModel */ public function getStatusNameAttr($value, $data) { - return UserEnum::getStatus()[$data['status'] ?? ''] ?? ''; + return UserDict::getStatus()[$data['status'] ?? ''] ?? ''; + } + + public function getCreateTimeAttr($value, $data) + { + return $data['create_time'] ? get_date_by_time($data['create_time']) : ''; } /** diff --git a/niucloud/app/model/wechat/WechatReply.php b/niucloud/app/model/wechat/WechatReply.php index df0f1a275..c55263837 100644 --- a/niucloud/app/model/wechat/WechatReply.php +++ b/niucloud/app/model/wechat/WechatReply.php @@ -11,7 +11,7 @@ namespace app\model\wechat; -use app\enum\channel\ReplyEnum; +use app\dict\channel\ReplyDict; use core\base\BaseModel; /** @@ -44,7 +44,7 @@ class WechatReply extends BaseModel public function getContentAttr($value,$data) { - return $data['content_type'] == ReplyEnum::CONTENT_TYPE_TEXT ? $value : json_decode($value, true); + return $data['content_type'] == ReplyDict::CONTENT_TYPE_TEXT ? $value : json_decode($value, true); } } diff --git a/niucloud/app/service/admin/addon/AddonService.php b/niucloud/app/service/admin/addon/AddonService.php index d3cc8342e..f7e67a1d8 100644 --- a/niucloud/app/service/admin/addon/AddonService.php +++ b/niucloud/app/service/admin/addon/AddonService.php @@ -44,7 +44,36 @@ class AddonService extends BaseAdminService */ public function install(string $addon) { - return CoreAddonInstallService::instance($addon)->install(); + try { + $data = (new CoreAddonInstallService($addon))->install(); + return success('SUCCESS', $data); + } catch (\Exception $e) { + return fail($e->getMessage()); + } + } + + /** + * 执行安装 + * @param string $addon + * @return \think\Response + */ + public function executeInstall(string $addon) { + try { + $data = (new CoreAddonInstallService($addon))->executeInstall(); + return success('SUCCESS', $data); + } catch (\Exception $e) { + return fail($e->getMessage()); + } + } + + /** + * 安装插件检测安装环境 + * @param string $addon + * @return \think\Response + */ + public function installCheck(string $addon) { + $data = (new CoreAddonInstallService($addon))->installCheck(); + return success('SUCCESS', $data); } /** @@ -52,9 +81,9 @@ class AddonService extends BaseAdminService * @param string $addon * @return mixed */ - public function getInstallState(string $addon) + public function getInstallState(string $addon, string $key) { - return CoreAddonInstallService::instance($addon)->getInstallState(); + return CoreAddonInstallService::instance($addon)->getInstallState($key); } /** diff --git a/niucloud/app/service/admin/addon/TerminalService.php b/niucloud/app/service/admin/addon/TerminalService.php deleted file mode 100644 index c8db550af..000000000 --- a/niucloud/app/service/admin/addon/TerminalService.php +++ /dev/null @@ -1,341 +0,0 @@ - 'command-link-success', - // 执行成功 - 'exec-success' => 'command-exec-success', - // 执行完成 - 'exec-completed' => 'command-exec-completed', - // 执行出错 - 'exec-error' => 'command-exec-error', - ]; - - - - /** - * 初始化 - */ - public static function instance() - { - if (is_null(self::$instance)) { - self::$instance = new static(); - } - return self::$instance; - } - - /** - * 构造函数 - */ - public function __construct() - { - // 初始化日志文件 - $outputDir = root_path() . 'runtime' . DIRECTORY_SEPARATOR . 'terminal'; - $this->outputFile = $outputDir . DIRECTORY_SEPARATOR . 'exec.log'; - if (!is_dir($outputDir)) { - mkdir($outputDir, 0755, true); - } - file_put_contents($this->outputFile, ''); - - /** - * 命令执行结果输出到文件而不是管道 - * 因为输出到管道时有延迟，而文件虽然需要频繁读取和对比内容，但是输出实时的 - */ - $this->descriptorsPec = [0 => ['pipe', 'r'], 1 => ['file', $this->outputFile, 'w'], 2 => ['file', $this->outputFile, 'w']]; - } - - /** - * 获取命令 - * @param string $key 命令key - * @return array|false - */ - public static function getCommand(string $key) - { - if (!$key) { - return false; - } - - $commands = Config::get('terminal.commands'); - if (stripos($key, '.')) { - $key = explode('.', $key); - if (!array_key_exists($key[0], $commands) || !is_array($commands[$key[0]]) || !array_key_exists($key[1], $commands[$key[0]])) { - return false; - } - $command = $commands[$key[0]][$key[1]]; - } else { - if (!array_key_exists($key, $commands)) { - return false; - } - $command = $commands[$key]; - } - if (!is_array($command)) { - $command = [ - 'cwd' => dirname(root_path()) . DIRECTORY_SEPARATOR, - 'command' => $command, - ]; - } else { - $command = [ - 'cwd' => dirname(root_path()) . DIRECTORY_SEPARATOR . $command['cwd'], - 'command' => $command['command'], - ]; - } - $command['cwd'] = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $command['cwd']); - return $command; - } - - public function exec(array $commands = []) - { - header('Content-Type: text/event-stream'); - header('Cache-Control: no-cache'); - - if (ob_get_level()) ob_end_clean(); - if (!ob_get_level()) ob_start(); - - $command = self::getCommand($this->commandKey); - if (!$command) { - $this->execError('The command was not allowed to be executed', true); - } - - $this->beforeExecution(); - $this->outputFlag('link-success'); - $this->output('> ' . $command['command'], false); - - $this->process = proc_open($command['command'], $this->descriptorsPec, $this->pipes, $command['cwd']); - if (!is_resource($this->process)) { - $this->execError('Failed to execute', true); - } - while ($this->getProcStatus()) { - $contents = file_get_contents($this->outputFile); - if (strlen($contents) && $this->outputContent != $contents) { - $newOutput = str_replace($this->outputContent, '', $contents); - if (preg_match('/\r\n|\r|\n/', $newOutput)) { - $this->output($newOutput); - $this->outputContent = $contents; - } - } - usleep(500000); - } - foreach ($this->pipes as $pipe) { - fclose($pipe); - } - proc_close($this->process); - $this->outputFlag('exec-completed'); - } - - public function getProcStatus(): bool - { - $status = proc_get_status($this->process); - if ($status['running']) { - $this->procStatus = 1; - return true; - } elseif ($this->procStatus === 1) { - $this->procStatus = 0; - $this->output('exitcode: ' . $status['exitcode']); - if ($status['exitcode'] === 0) { - if ($this->successCallback()) { - $this->outputFlag('exec-success'); - } else { - $this->output('Error: Command execution succeeded, but callback execution failed'); - $this->outputFlag('exec-error'); - } - } else { - $this->outputFlag('exec-error'); - } - return true; - } else { - return false; - } - } - - /** - * 输出 EventSource 数据 - * @param string $data - * @param bool $callback - */ - public function output(string $data, bool $callback = true) - { - $data = self::outputFilter($data); - $data = [ - 'data' => $data, - 'uuid' => $this->uuid, - 'extend' => $this->extend, - 'key' => $this->commandKey, - ]; - $data = json_encode($data, JSON_UNESCAPED_UNICODE); - if ($data) { - echo 'data: ' . $data . "\n\n"; - if ($callback) $this->outputCallback($data); - @ob_flush();// 刷新浏览器缓冲区 - } - } - - /** - * 输出状态标记 - * @param string $flag - */ - public function outputFlag(string $flag) - { - $this->output($this->flag[$flag], false); - } - - /** - * 输出后回调 - */ - public function outputCallback($data) - { - - } - - /** - * 成功后回调 - * @return bool - */ - public function successCallback(): bool - { - if (stripos($this->commandKey, '.')) { - $commandKeyArr = explode('.', $this->commandKey); - $commandPKey = $commandKeyArr[0] ?? ''; - } else { - $commandPKey = $this->commandKey; - } - return true; - } - - /** - * 执行前埋点 - */ - public function beforeExecution() - { -/* if ($this->commandKey == 'test.pnpm') { - @unlink(root_path() . 'public' . DIRECTORY_SEPARATOR . 'npm-install-test' . DIRECTORY_SEPARATOR . 'pnpm-lock.yaml'); - } elseif ($this->commandKey == 'web-install.pnpm') { - @unlink(root_path() . 'web' . DIRECTORY_SEPARATOR . 'pnpm-lock.yaml'); - }*/ - } - - /** - * 输出过滤 - */ - public static function outputFilter($str) - { - $str = trim($str); - $preg = '/\[(.*?)m/i'; - $str = preg_replace($preg, '', $str); - $str = str_replace(["\r\n", "\r", "\n"], "", $str); - return mb_convert_encoding($str, 'UTF-8', 'UTF-8,GBK,GB2312,BIG5'); - } - - /** - * 执行错误 - */ - public function execError($error, $break = false) - { - $this->output('Error:' . $error); - $this->outputFlag('exec-error'); - if ($break) $this->break(); - } - - /** - * 退出执行 - */ - public function break() - { - throw new CommonException(Response::create()->contentType('text/event-stream')); - } - - /** - * 执行一个命令并以字符串的方式返回执行输出 - * 代替 exec 使用，这样就只需要解除 proc_open 的函数禁用了 - * @param $commandKey - * @return string | bool - */ - public static function getOutputFromProc($commandKey) - { - if (!function_exists('proc_open') || !function_exists('proc_close')) { - return false; - } - $command = self::getCommand($commandKey); - if (!$command) { - return false; - } - $descriptorsPec = [1 => ['pipe', 'w'], 2 => ['pipe', 'w']]; - $process = proc_open($command['command'], $descriptorsPec, $pipes, null, null); - if (is_resource($process)) { - $info = stream_get_contents($pipes[1]); - $info .= stream_get_contents($pipes[2]); - fclose($pipes[1]); - fclose($pipes[2]); - proc_close($process); - return self::outputFilter($info); - } - return ''; - } -} \ No newline at end of file diff --git a/niucloud/app/service/admin/article/ArticleCategoryService.php b/niucloud/app/service/admin/article/ArticleCategoryService.php index 406c1c62e..f99b5e648 100644 --- a/niucloud/app/service/admin/article/ArticleCategoryService.php +++ b/niucloud/app/service/admin/article/ArticleCategoryService.php @@ -37,7 +37,7 @@ class ArticleCategoryService extends BaseAdminService $field = 'category_id, site_id, name, sort, is_show, create_time, update_time'; $order = 'create_time desc'; - $search_model = $this->model->where([['site_id', '=', $this->site_id]])->withSearch(['name'], $where)->field($field)->order($order); + $search_model = $this->model->where([['site_id', '=', $this->site_id]])->withSearch(['name'], $where)->field($field)->order($order)->append(["article_num"]); $list = $this->pageQuery($search_model); return $list; } @@ -62,7 +62,7 @@ class ArticleCategoryService extends BaseAdminService { $field = 'category_id, site_id, name, sort, is_show, create_time, update_time'; - $info = $this->model->field($field)->where([['category_id', '=', $id], ['site_id', '=', $this->site_id]])->findOrEmpty()->toArray(); + $info = $this->model->field($field)->where([['category_id', '=', $id], ['site_id', '=', $this->site_id]])->append(["article_num"])->findOrEmpty()->toArray(); return $info; } diff --git a/niucloud/app/service/admin/article/ArticleService.php b/niucloud/app/service/admin/article/ArticleService.php index 81fd60e92..e7babdc85 100644 --- a/niucloud/app/service/admin/article/ArticleService.php +++ b/niucloud/app/service/admin/article/ArticleService.php @@ -38,7 +38,7 @@ class ArticleService extends BaseAdminService $where[] = [ 'site_id', '=', $this->site_id ]; $field = 'id, category_id, site_id, title, intro, summary, image, author, content, visit, visit_virtual, is_show, sort, create_time, update_time'; $order = 'create_time desc'; - $search_model = $this->model->where([ [ 'site_id', '=', $this->site_id ] ])->withSearch([ 'title', 'category_id', 'is_show'], $where)->with('articleCategory')->field($field)->order($order); + $search_model = $this->model->where([ [ 'site_id', '=', $this->site_id ] ])->withSearch([ 'title', 'category_id', 'is_show'], $where)->with('articleCategory')->field($field)->order($order)->append(['article_url']); $list = $this->pageQuery($search_model); return $list; } diff --git a/niucloud/app/service/admin/auth/AuthService.php b/niucloud/app/service/admin/auth/AuthService.php index 6713cceef..ab25ad248 100644 --- a/niucloud/app/service/admin/auth/AuthService.php +++ b/niucloud/app/service/admin/auth/AuthService.php @@ -11,6 +11,7 @@ namespace app\service\admin\auth; +use app\dict\site\SiteDict; use app\Request; use app\service\admin\site\SiteService; use app\service\admin\site\SiteUserService; @@ -66,6 +67,12 @@ class AuthService extends BaseAdminService $rule = trim(strtolower($request->rule()->getRule())); $method = trim(strtolower($request->method())); + $site_info = (new AuthSiteService())->getSiteInfo(); + if($method != 'get'){ + if($site_info['status'] == SiteDict::EXPIRE) throw new AuthException('SITE_EXPIRE_NOT_ALLOW'); + if($site_info['status'] == SiteDict::CLOSE) throw new AuthException('SITE_CLOSE_NOT_ALLOW'); + } + $menu_service = new MenuService(); $all_menu_list = $menu_service->getAllApiList($this->app_type); //先判断当前访问的接口是否收到权限的限制 @@ -104,7 +111,6 @@ class AuthService extends BaseAdminService if($is_admin){//查询全部启用的权限 //获取站点信息 return (new AuthSiteService())->getApiList(1); -// return $menu_service->getAllApiList($this->app_type, 1); }else{ $user_role_ids = $user_role_info['role_ids']; $role_service = new RoleService(); diff --git a/niucloud/app/service/admin/auth/AuthSiteService.php b/niucloud/app/service/admin/auth/AuthSiteService.php index 6ff51200e..3063ff1a8 100644 --- a/niucloud/app/service/admin/auth/AuthSiteService.php +++ b/niucloud/app/service/admin/auth/AuthSiteService.php @@ -44,13 +44,24 @@ class AuthSiteService extends BaseAdminService public function getSiteList(){ //通过用户id获取 $cache_name = 'site_list'.'_'.$this->uid; - return Cache::tag(SiteService::$cache_tag_name)->remember($cache_name, function (){ - $auth_service = new AuthService(); - $user_role_list = $auth_service->getAuthSiteRoleList(); - $site_ids = array_column($user_role_list, 'site_id'); - $site_list = $this->model->where([['site_id', 'in', $site_ids]])->field('app_type,site_name,logo')->column('site_id, site_name, logo, app_type'); - return $site_list; - }); + return cache_remember( + $cache_name, + function (){ + $auth_service = new AuthService(); + $user_role_list = $auth_service->getAuthSiteRoleList(); + $site_ids = array_column($user_role_list, 'site_id'); + $site_list = $this->model->where([['site_id', 'in', $site_ids]])->field('app_type,site_name,logo')->column('site_id, site_name, logo, app_type'); + return $site_list; + }, + SiteService::$cache_tag_name + ); +// return Cache::tag(SiteService::$cache_tag_name)->remember($cache_name, function (){ +// $auth_service = new AuthService(); +// $user_role_list = $auth_service->getAuthSiteRoleList(); +// $site_ids = array_column($user_role_list, 'site_id'); +// $site_list = $this->model->where([['site_id', 'in', $site_ids]])->field('app_type,site_name,logo')->column('site_id, site_name, logo, app_type'); +// return $site_list; +// }); } /** diff --git a/niucloud/app/service/admin/auth/ConfigService.php b/niucloud/app/service/admin/auth/ConfigService.php index e8a467c3e..df339059c 100644 --- a/niucloud/app/service/admin/auth/ConfigService.php +++ b/niucloud/app/service/admin/auth/ConfigService.php @@ -11,7 +11,7 @@ namespace app\service\admin\auth; -use app\enum\sys\ConfigKeyEnum; +use app\dict\sys\ConfigKeyDict; use app\model\sys\SysConfig; use app\service\core\sys\CoreConfigService; use core\base\BaseAdminService; @@ -36,7 +36,7 @@ class ConfigService extends BaseAdminService */ public function getConfig() { - $info = (new CoreConfigService())->getConfig($this->request->defaultSiteId(), ConfigKeyEnum::ADMIN_LOGIN)['value'] ?? []; + $info = (new CoreConfigService())->getConfig($this->request->defaultSiteId(), ConfigKeyDict::ADMIN_LOGIN)['value'] ?? []; $config = [ 'is_captcha' => $info['is_captcha'] ?? 0,//是否启用验证码 'is_site_captcha' => $info['is_site_captcha'] ?? 0,//是否启用站点验证码 @@ -60,7 +60,7 @@ class ConfigService extends BaseAdminService 'bg' => $data['bg'] ?? '',//平台登录端 背景 'site_bg' => $data['site_bg'] ?? '',//站点登录端 背景 ]; - (new CoreConfigService())->setConfig($this->site_id, ConfigKeyEnum::ADMIN_LOGIN, $config); + (new CoreConfigService())->setConfig($this->site_id, ConfigKeyDict::ADMIN_LOGIN, $config); return true; } diff --git a/niucloud/app/service/admin/auth/LoginService.php b/niucloud/app/service/admin/auth/LoginService.php index 69260ad45..ffd924ab6 100644 --- a/niucloud/app/service/admin/auth/LoginService.php +++ b/niucloud/app/service/admin/auth/LoginService.php @@ -11,7 +11,7 @@ namespace app\service\admin\auth; -use app\enum\sys\AppTypeEnum; +use app\dict\sys\AppTypeDict; use app\model\sys\SysUser; use app\service\admin\captcha\CaptchaService; use app\service\admin\site\SiteService; @@ -46,14 +46,14 @@ class LoginService extends BaseAdminService public function login(string $username, string $password, string $app_type) { - if(!in_array($app_type, array_keys(AppTypeEnum::getAppType()))) throw new AuthException('APP_TYPE_NOT_EXIST'); + if(!in_array($app_type, array_keys(AppTypeDict::getAppType()))) throw new AuthException('APP_TYPE_NOT_EXIST'); $config = (new ConfigService())->getConfig(); switch($app_type){ - case AppTypeEnum::SITE: + case AppTypeDict::SITE: $is_captcha = $config['is_site_captcha']; break; - case AppTypeEnum::ADMIN: + case AppTypeDict::ADMIN: $is_captcha = $config['is_captcha']; break; } @@ -71,15 +71,14 @@ class LoginService extends BaseAdminService } - if($app_type == AppTypeEnum::ADMIN){ + if($app_type == AppTypeDict::ADMIN){ $default_site_id = $this->request->defaultSiteId(); $userrole = (new UserRoleService())->getUserRole($default_site_id, $userinfo->uid); if(empty($userrole)) throw new AuthException('SITE_USER_CAN_NOT_LOGIN_IN_ADMIN'); - }else if($app_type == AppTypeEnum::SITE){ + }else if($app_type == AppTypeDict::SITE){ $default_site_id = (new UserRoleService())->getUserDefaultSiteId($userinfo->uid); - if(!($default_site_id > 0)){ - if(empty($userrole)) throw new AuthException('ADMIN_USER_CAN_NOT_LOGIN_IN_SITE'); - } + if(!($default_site_id > 0)) throw new AuthException('ADMIN_USER_CAN_NOT_LOGIN_IN_SITE'); + } //修改用户登录信息 $userinfo->last_time = time(); @@ -121,7 +120,7 @@ class LoginService extends BaseAdminService public function createToken(SysUser $userinfo, string $app_type) { $expire_time = env('system.admin_token_expire_time') ?? 3600; - $token_info = TokenAuth::createToken($userinfo->uid, AppTypeEnum::ADMIN, ['uid' => $userinfo->uid, 'username' => $userinfo->username], $expire_time); + $token_info = TokenAuth::createToken($userinfo->uid, AppTypeDict::ADMIN, ['uid' => $userinfo->uid, 'username' => $userinfo->username], $expire_time); return $token_info; } @@ -133,8 +132,8 @@ class LoginService extends BaseAdminService public static function clearToken(int $uid, ?string $type = '', ?string $token = '') { if (empty($type)) { - TokenAuth::clearToken($uid, AppTypeEnum::ADMIN, $token);//清除平台管理端的token -// TokenAuth::clearToken($uid, AppTypeEnum::SITE, $token);//清除站点管理端的token + TokenAuth::clearToken($uid, AppTypeDict::ADMIN, $token);//清除平台管理端的token +// TokenAuth::clearToken($uid, AppTypeDict::SITE, $token);//清除站点管理端的token } else { TokenAuth::clearToken($uid, $type, $token); } @@ -155,7 +154,7 @@ class LoginService extends BaseAdminService } //暴力操作,截停所有异常覆盖为token失效 try { - $token_info = TokenAuth::parseToken($token, AppTypeEnum::ADMIN); + $token_info = TokenAuth::parseToken($token, AppTypeDict::ADMIN); } catch ( \Throwable $e ) { // if(env('app_debug', false)){ // throw new AuthException($e->getMessage(), 401); diff --git a/niucloud/app/service/admin/channel/H5Service.php b/niucloud/app/service/admin/channel/H5Service.php index d068771ea..cd3cf3160 100644 --- a/niucloud/app/service/admin/channel/H5Service.php +++ b/niucloud/app/service/admin/channel/H5Service.php @@ -11,7 +11,7 @@ namespace app\service\admin\channel; -use app\enum\sys\ConfigKeyEnum; +use app\dict\sys\ConfigKeyDict; use app\service\core\channel\CoreH5Service; use app\service\core\sys\CoreConfigService; use core\base\BaseAdminService; @@ -42,7 +42,7 @@ class H5Service extends BaseAdminService $data = [ 'is_open' => $value['is_open'] ]; - $res = $this->core_config_service->setConfig($this->site_id,ConfigKeyEnum::H5, $data); + $res = $this->core_config_service->setConfig($this->site_id,ConfigKeyDict::H5, $data); return $res; } diff --git a/niucloud/app/service/admin/cron/CronService.php b/niucloud/app/service/admin/cron/CronService.php index 82c7d80c9..e4fe5ee95 100644 --- a/niucloud/app/service/admin/cron/CronService.php +++ b/niucloud/app/service/admin/cron/CronService.php @@ -11,7 +11,7 @@ namespace app\service\admin\cron; -use app\service\core\cron\CoreCronService; +use app\service\core\schedule\CoreCronService; use core\base\BaseAdminService; /** diff --git a/niucloud/app/service/admin/diy/DiyRouteService.php b/niucloud/app/service/admin/diy/DiyRouteService.php index de2608cfe..84adeea48 100644 --- a/niucloud/app/service/admin/diy/DiyRouteService.php +++ b/niucloud/app/service/admin/diy/DiyRouteService.php @@ -11,7 +11,7 @@ namespace app\service\admin\diy; -use app\enum\diy\LinkEnum; +use app\dict\diy\LinkDict; use app\model\diy\DiyRoute; use core\base\BaseAdminService; @@ -36,7 +36,7 @@ class DiyRouteService extends BaseAdminService */ public function getList(array $where = []) { - $link = LinkEnum::getLink(); + $link = LinkDict::getLink(); $diy_route_list = []; $sort = 0; foreach ($link as $k => $v) { diff --git a/niucloud/app/service/admin/diy/DiyService.php b/niucloud/app/service/admin/diy/DiyService.php index 1250cf897..776740e8f 100644 --- a/niucloud/app/service/admin/diy/DiyService.php +++ b/niucloud/app/service/admin/diy/DiyService.php @@ -11,9 +11,10 @@ namespace app\service\admin\diy; -use app\enum\diy\ComponentEnum; -use app\enum\diy\LinkEnum; -use app\enum\diy\PageEnum; +use app\dict\diy\ComponentDict; +use app\dict\diy\LinkDict; +use app\dict\diy\PagesDict; +use app\dict\diy\TemplateDict; use app\model\diy\Diy; use app\service\admin\sys\SystemService; use core\base\BaseAdminService; @@ -162,7 +163,7 @@ class DiyService extends BaseAdminService */ public function getInit(array $params = []) { - $page_type = PageEnum::getPageType(); + $page_template = TemplateDict::getTemplate(); $time = time(); $data = []; @@ -173,23 +174,32 @@ class DiyService extends BaseAdminService } if (!empty($data)) { - if (isset($page_type[ $data[ 'type' ] ])) { - $page = $page_type[ $data[ 'type' ] ]; + // 编辑赋值 + if (isset($page_template[ $data[ 'type' ] ])) { + $page = $page_template[ $data[ 'type' ] ]; $data[ 'type_name' ] = $page[ 'title' ]; $data[ 'page' ] = $page[ 'page' ]; } } else { - // 空页面赋值 + // 新页面赋值 $type = 'DIY_PAGE'; $type_name = ''; $name = $params[ 'name' ]; $page_route = ''; - if (isset($page_type[ $params[ 'type' ] ])) { - $page = $page_type[ $params[ 'type' ] ]; - $name = $params[ 'type' ] == 'DIY_PAGE' ? 'DIY_PAGE_RANDOM_' . $time : $params[ 'type' ]; - $type = $params[ 'type' ]; + $value = ''; + if (isset($page_template[ $params[ 'template' ] ])) { + $page = $page_template[ $params[ 'template' ] ]; + $name = $params[ 'template' ] == 'DIY_PAGE' ? 'DIY_PAGE_RANDOM_' . $time : $params[ 'template' ]; + $type = $params[ 'template' ]; $type_name = $page[ 'title' ]; $page_route = $page[ 'page' ]; + + // 查询指定页面数据 + $page_data = $this->getPageData($params[ 'template' ], $params[ 'template_name' ]); + if (!empty($page_data)) { + $value = json_encode($page_data[ 'data' ], JSON_UNESCAPED_UNICODE); + } + } $data = [ 'name' => $name, @@ -197,15 +207,24 @@ class DiyService extends BaseAdminService 'type' => $type, 'type_name' => $type_name, 'page' => $page_route, - 'value' => '', + 'value' => $value, + 'is_default' => 0 ]; - if (isset($page_type[ $params[ 'name' ] ])) { - $page = $page_type[ $params[ 'name' ] ]; - $data[ 'name' ] = $params[ 'type' ]; + if (isset($page_template[ $params[ 'name' ] ])) { + $page = $page_template[ $params[ 'name' ] ]; + $data[ 'name' ] = $params[ 'template' ] ? $params[ 'template' ] : $params[ 'name' ]; + $data[ 'type' ] = $data[ 'name' ]; $data[ 'title' ] = $page[ 'title' ]; $data[ 'type_name' ] = $page[ 'title' ]; $data[ 'page' ] = $page[ 'page' ]; + + // 查询默认页面数据 + $page_data = $this->getFirstPageData($data[ 'name' ]); + if (!empty($page_data)) { + $data[ 'value' ] = json_encode($page_data[ 'data' ], JSON_UNESCAPED_UNICODE); + $data[ 'is_default' ] = 1; + } } } $data[ 'component' ] = $this->getComponentList($data[ 'name' ]); @@ -220,7 +239,7 @@ class DiyService extends BaseAdminService */ public function getComponentList(string $name = '') { - $data = ComponentEnum::getComponent(); + $data = ComponentDict::getComponent(); foreach ($data as $k => $v) { // 查询组件支持的页面 $sort_arr = []; @@ -247,16 +266,17 @@ class DiyService extends BaseAdminService */ public function getLink() { - $link = LinkEnum::getLink(); + $link = LinkDict::getLink(); foreach ($link as $k => $v) { + $link[ $k ][ 'name' ] = $k; if (!empty($v[ 'child_list' ])) { foreach ($v[ 'child_list' ] as $ck => $cv) { - $link[ $k ][ 'child_list' ][ $ck ][ 'parent' ] = $v[ 'name' ]; + $link[ $k ][ 'child_list' ][ $ck ][ 'parent' ] = $k; } } // 查询自定义页面 - if ($v[ 'name' ] == 'DIY_PAGE') { + if ($k == 'DIY_PAGE') { $diy_service = new DiyService(); $list = $diy_service->getList([ [ 'type', '=', 'DIY_PAGE' ] ]); foreach ($list as $ck => $cv) { @@ -269,7 +289,7 @@ class DiyService extends BaseAdminService } - if ($v[ 'name' ] == 'DIY_LINK') { + if ($k == 'DIY_LINK') { $link[ $k ][ 'parent' ] = 'DIY_LINK'; } @@ -289,5 +309,50 @@ class DiyService extends BaseAdminService return true; } + /** + * 获取页面模板 + * @param string $type + * @return array|string + */ + public function getTemplate(string $type) + { + $page_template = TemplateDict::getTemplate($type); + foreach ($page_template as $k => $v) { + // 查询页面数据 + $page_template[ $k ][ 'template' ] = PagesDict::getPages($k); + } + return $page_template; + } + + /** + * 获取页面数据 + * @param $template + * @param $name + * @return array + */ + public function getPageData($template, $name) + { + $pages = PagesDict::getPages($template); + if (isset($pages[ $name ])) { + return $pages[ $name ]; + } + return []; + } + + /** + * 获取默认页面数据 + * @param $template + * @return array|mixed + */ + public function getFirstPageData($template) + { + $pages = PagesDict::getPages($template); + if (!empty($pages)) { + $page = array_shift($pages); + $page[ 'template' ] = $template; + return $page; + } + return []; + } } \ No newline at end of file diff --git a/niucloud/app/service/admin/file/StorageConfigService.php b/niucloud/app/service/admin/file/StorageConfigService.php index 121317c77..326dda844 100644 --- a/niucloud/app/service/admin/file/StorageConfigService.php +++ b/niucloud/app/service/admin/file/StorageConfigService.php @@ -11,7 +11,7 @@ namespace app\service\admin\file; -use app\enum\sys\StorageEnum; +use app\dict\sys\StorageDict; use app\service\core\upload\CoreStorageService; use app\service\core\sys\CoreConfigService; use core\base\BaseAdminService; @@ -46,7 +46,7 @@ class StorageConfigService extends BaseAdminService */ public function getStorageConfig(string $storage_type) { - $storage_type_list = StorageEnum::getType(); + $storage_type_list = StorageDict::getType(); if(!array_key_exists($storage_type, $storage_type_list)) throw new AdminException('OSS_TYPE_NOT_EXIST'); $info = (new CoreConfigService())->getConfig($this->site_id, 'STORAGE'); if(empty($info)) @@ -57,7 +57,7 @@ class StorageConfigService extends BaseAdminService $data = [ 'storage_type' => $storage_type, - 'is_use' => $storage_type == $config_type['default'] ? StorageEnum::ON : StorageEnum::OFF, + 'is_use' => $storage_type == $config_type['default'] ? StorageDict::ON : StorageDict::OFF, 'name' => $storage_type_list[$storage_type]['name'], ]; foreach ($storage_type_list[$storage_type]['params'] as $k_param => $v_param) @@ -79,7 +79,7 @@ class StorageConfigService extends BaseAdminService */ public function setStorageConfig(string $storage_type, array $data) { - $storage_type_list = StorageEnum::getType(); + $storage_type_list = StorageDict::getType(); if(!array_key_exists($storage_type, $storage_type_list)) throw new AdminException('OSS_TYPE_NOT_EXIST'); $info = (new CoreConfigService())->getConfig($this->site_id, 'STORAGE'); if(empty($info)) diff --git a/niucloud/app/service/admin/file/UploadService.php b/niucloud/app/service/admin/file/UploadService.php index 91b608f50..e6ba3dac5 100644 --- a/niucloud/app/service/admin/file/UploadService.php +++ b/niucloud/app/service/admin/file/UploadService.php @@ -11,7 +11,7 @@ namespace app\service\admin\file; -use app\enum\sys\FileEnum; +use app\dict\sys\FileDict; use app\service\core\upload\CoreUploadService; use core\base\BaseAdminService; use core\exception\UploadFileException; @@ -58,7 +58,7 @@ class UploadService extends BaseAdminService * @return array */ public function document($file, string $type,bool $is_local = false){ - if(!in_array($type, FileEnum::getSceneType())) + if(!in_array($type, FileDict::getSceneType())) throw new UploadFileException('CERT_TYPE_ERROR'); $dir = $this->root_path.'/document/'.$type.'/'.$this->site_id.'/'.date('Ym').'/'.date('d'); $core_upload_service = new CoreUploadService(); diff --git a/niucloud/app/service/admin/generator/Generate.php b/niucloud/app/service/admin/generator/Generate.php index 7015bd08c..9fb04403e 100644 --- a/niucloud/app/service/admin/generator/Generate.php +++ b/niucloud/app/service/admin/generator/Generate.php @@ -63,7 +63,7 @@ class Generate public function delOutFiles() { // 删除runtime目录制定文件夹 - !is_dir($this->outPath) && mkdir($this->outPath, 0755, true); + !is_dir($this->outPath) && mkdirs($this->outPath, 0777, true); del_target_dir($this->outPath, false); } diff --git a/niucloud/app/service/admin/generator/GenerateService.php b/niucloud/app/service/admin/generator/GenerateService.php index 0d86c2713..bd24e3676 100644 --- a/niucloud/app/service/admin/generator/GenerateService.php +++ b/niucloud/app/service/admin/generator/GenerateService.php @@ -272,7 +272,7 @@ class GenerateService extends BaseAdminService */ public static function getDbFieldType(string $type): string { - if (0 === strpos($type, 'set') || 0 === strpos($type, 'enum')) { + if (0 === strpos($type, 'set') || 0 === strpos($type, 'dict')) { $result = 'string'; } elseif (preg_match('/(double|float|decimal|real|numeric)/is', $type)) { $result = 'float'; diff --git a/niucloud/app/service/admin/generator/core/BaseGenerator.php b/niucloud/app/service/admin/generator/core/BaseGenerator.php index 450f26668..6647e00fc 100644 --- a/niucloud/app/service/admin/generator/core/BaseGenerator.php +++ b/niucloud/app/service/admin/generator/core/BaseGenerator.php @@ -171,7 +171,7 @@ abstract class BaseGenerator */ public function checkDir(string $path) { - !is_dir($path) && mkdirs($path, 0755, true); + !is_dir($path) && mkdir($path, 0777, true); } /** @@ -316,7 +316,7 @@ abstract class BaseGenerator */ public function getDefault(string $type) { - if (0 === strpos($type, 'set') || 0 === strpos($type, 'enum')) { + if (0 === strpos($type, 'set') || 0 === strpos($type, 'dict')) { $result = '""'; } elseif (preg_match('/(int|serial|bit)/is', $type)) { $result = '0'; @@ -342,7 +342,7 @@ abstract class BaseGenerator */ public function getAuthor() { - return empty($this->table['author']) ? 'Niushop team' : $this->table['author']; + return empty($this->table['author']) ? 'Niucloud team' : $this->table['author']; } diff --git a/niucloud/app/service/admin/generator/core/WebApiGenerator.php b/niucloud/app/service/admin/generator/core/WebApiGenerator.php index 49c2162c8..8e7626b9c 100644 --- a/niucloud/app/service/admin/generator/core/WebApiGenerator.php +++ b/niucloud/app/service/admin/generator/core/WebApiGenerator.php @@ -61,7 +61,7 @@ class WebApiGenerator extends BaseGenerator */ public function getModuleOutDir() { - $dir = dirname(app()->getRootPath()) . '/admin-niushop/src/api/'; + $dir = dirname(app()->getRootPath()) . '/admin/src/api/'; $this->checkDir($dir); return $dir; } diff --git a/niucloud/app/service/admin/generator/vm/admin_api_route.vm b/niucloud/app/service/admin/generator/vm/admin_api_route.vm index 36b472d43..af5842563 100644 --- a/niucloud/app/service/admin/generator/vm/admin_api_route.vm +++ b/niucloud/app/service/admin/generator/vm/admin_api_route.vm @@ -1,12 +1,12 @@ +// | Author: Niucloud Team // +---------------------------------------------------------------------- use think\facade\Route; diff --git a/niucloud/app/service/admin/generator/vm/web_edit.vm b/niucloud/app/service/admin/generator/vm/web_edit.vm index c4c56b8ae..d3a12e836 100644 --- a/niucloud/app/service/admin/generator/vm/web_edit.vm +++ b/niucloud/app/service/admin/generator/vm/web_edit.vm @@ -64,7 +64,6 @@ const confirm = async (formEl: FormInstance | undefined) => { emit('complete') }).catch(err => { loading.value = false - showDialog.value = false }) } }) diff --git a/niucloud/app/service/admin/generator/vm/web_index.vm b/niucloud/app/service/admin/generator/vm/web_index.vm index 266f54010..719e14797 100644 --- a/niucloud/app/service/admin/generator/vm/web_index.vm +++ b/niucloud/app/service/admin/generator/vm/web_index.vm @@ -1,14 +1,15 @@