From 58d63487687b647e24192ca1857490e59cd4f77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Sat, 17 Aug 2024 09:40:17 +0800 Subject: [PATCH] update --- niucloud/app/ExceptionHandle.php | 1 - .../app/adminapi/controller/login/Login.php | 11 - .../app/adminapi/controller/member/Config.php | 56 ++-- .../app/adminapi/controller/notice/Notice.php | 15 - .../app/adminapi/controller/stat/Stat.php | 3 + .../app/adminapi/controller/user/User.php | 10 + niucloud/app/adminapi/route/dict.php | 4 +- niucloud/app/adminapi/route/member.php | 2 +- niucloud/app/adminapi/route/notice.php | 2 - niucloud/app/adminapi/route/route.php | 6 +- niucloud/app/adminapi/route/user.php | 2 + .../app/api/controller/member/Account.php | 1 + niucloud/app/dict/diy/ComponentDict.php | 2 +- niucloud/app/dict/diy/LinkDict.php | 18 +- niucloud/app/dict/diy/PagesDict.php | 4 +- niucloud/app/dict/member/MemberSignDict.php | 2 - .../app/dict/member/MemberSignTypeDict.php | 2 - niucloud/app/dict/menu/admin.php | 38 ++- niucloud/app/dict/menu/site.php | 23 +- niucloud/app/dict/pay/PayChannelDict.php | 2 - niucloud/app/dict/schedule/schedule.php | 22 +- niucloud/app/dict/sys/AgreementDict.php | 4 +- niucloud/app/event.php | 9 +- niucloud/app/install/controller/Index.php | 35 +- niucloud/app/install/source/database.sql | 101 +----- niucloud/app/install/view/base.html | 1 - niucloud/app/install/view/index/step-3.html | 4 +- niucloud/app/job/schedule/SiteStatJob.php | 4 +- niucloud/app/lang/en/api.php | 4 +- niucloud/app/lang/zh-cn/api.php | 10 +- .../MemberExportDataListener.php | 13 +- .../MemberExportTypeListener.php | 3 +- .../listener/site/AddSiteAfterListener.php | 151 --------- niucloud/app/model/dict/Dict.php | 10 +- niucloud/app/model/member/MemberLevel.php | 1 - niucloud/app/model/sys/SysNoticeLog.php | 36 +-- niucloud/app/model/sys/SysPrinterTemplate.php | 3 - niucloud/app/model/sys/SysUser.php | 3 +- niucloud/app/model/verify/Verifier.php | 1 - .../service/admin/auth/AuthSiteService.php | 29 +- .../app/service/admin/auth/LoginService.php | 17 +- niucloud/app/service/admin/diy/DiyService.php | 155 ++++++++- .../admin/generator/GenerateService.php | 2 - .../generator/core/AdminApiRouteGenerator.php | 3 - .../generator/core/WebIndexGenerator.php | 1 - .../admin/generator/vm/form/fileSelect.vm | 3 + .../admin/generator/vm/form/videoSelect.vm | 3 + .../service/admin/member/MemberService.php | 1 - .../admin/member/MemberSignService.php | 29 +- .../app/service/admin/pay/RefundService.php | 2 - .../service/admin/site/SiteGroupService.php | 88 ++--- .../app/service/admin/site/SiteService.php | 94 +++--- .../service/admin/site/SiteUserService.php | 2 +- .../service/admin/stat/SiteStatService.php | 53 +-- .../app/service/admin/stat/StatService.php | 60 ++-- .../app/service/admin/sys/MenuService.php | 306 +++++++++--------- .../app/service/admin/sys/RoleService.php | 2 +- .../app/service/admin/sys/SystemService.php | 2 - .../service/admin/upgrade/RestoreService.php | 7 +- .../service/admin/user/UserRoleService.php | 6 +- .../app/service/admin/user/UserService.php | 14 +- .../admin/wechat/WechatMenuService.php | 1 - .../app/service/api/login/AuthService.php | 6 +- .../api/member/MemberAccountService.php | 87 +++-- .../service/api/member/MemberLevelService.php | 1 + .../app/service/api/member/MemberService.php | 3 - niucloud/app/service/api/site/SiteService.php | 2 - niucloud/app/service/api/sys/TaskService.php | 2 - .../app/service/api/upload/UploadService.php | 4 +- .../app/service/api/verify/VerifyService.php | 75 ++--- .../service/api/weapp/WeappAuthService.php | 13 +- .../service/api/wechat/WechatAuthService.php | 13 +- .../service/api/wechat/WechatServeService.php | 2 - .../addon/CoreAddonDevelopBuildService.php | 1 - .../core/addon/CoreAddonInstallService.php | 12 +- .../service/core/addon/CoreAddonService.php | 6 +- .../core/member/CoreMemberAccountService.php | 31 +- .../core/member/CoreMemberConfigService.php | 110 ++++--- .../service/core/niucloud/CoreAuthService.php | 2 - .../core/niucloud/CoreCloudBuildService.php | 1 - .../core/niucloud/CoreModuleService.php | 1 - .../core/niucloud/CoreNotifyService.php | 6 - .../service/core/pay/CorePayEventService.php | 22 +- .../app/service/core/pay/CorePayService.php | 139 ++++---- .../schedule/CoreScheduleInstallService.php | 20 +- .../core/site/CoreSiteAccountService.php | 30 +- .../app/service/core/site/CoreSiteService.php | 26 +- .../service/core/sys/CoreSysConfigService.php | 2 +- .../core/weapp/CoreWeappAuthService.php | 2 + .../core/weapp/CoreWeappDeliveryService.php | 17 +- .../service/core/weapp/CoreWeappService.php | 41 ++- niucloud/config/version.php | 4 +- niucloud/core/template/Weapp.php | 1 - niucloud/core/template/Wechat.php | 1 - niucloud/core/upload/Aliyun.php | 2 +- niucloud/core/upload/Qiniu.php | 2 +- niucloud/core/upload/Tencent.php | 2 +- niucloud/core/util/Queue.php | 3 - 98 files changed, 1037 insertions(+), 1154 deletions(-) rename niucloud/app/listener/{member => member_export}/MemberExportDataListener.php (77%) rename niucloud/app/listener/{member => member_export}/MemberExportTypeListener.php (95%) delete mode 100644 niucloud/app/listener/site/AddSiteAfterListener.php create mode 100644 niucloud/app/service/admin/generator/vm/form/fileSelect.vm create mode 100644 niucloud/app/service/admin/generator/vm/form/videoSelect.vm diff --git a/niucloud/app/ExceptionHandle.php b/niucloud/app/ExceptionHandle.php index 14d840fbc..c768dc9d6 100644 --- a/niucloud/app/ExceptionHandle.php +++ b/niucloud/app/ExceptionHandle.php @@ -2,7 +2,6 @@ namespace app; use app\dict\sys\AppTypeDict; -use core\exception\AdminException; use core\exception\AuthException; use core\exception\ServerException; use think\db\exception\DataNotFoundException; diff --git a/niucloud/app/adminapi/controller/login/Login.php b/niucloud/app/adminapi/controller/login/Login.php index a4f1408c4..7616f4a13 100644 --- a/niucloud/app/adminapi/controller/login/Login.php +++ b/niucloud/app/adminapi/controller/login/Login.php @@ -13,7 +13,6 @@ namespace app\adminapi\controller\login; use app\service\admin\auth\ConfigService; use app\service\admin\auth\LoginService; -use app\service\admin\upgrade\UpgradeService; use app\service\core\addon\WapTrait; use core\base\BaseAdminController; use think\Response; @@ -62,14 +61,4 @@ class Login extends BaseAdminController { return success(( new ConfigService() )->getConfig()); } - - public function test() - { - ( new UpgradeService() )->executeSql(root_path() . 'app/upgrade/v011/upgrade.sql'); - } - - public function geAddonPackagePath(string $addon) - { - return root_path() . 'addon' . DIRECTORY_SEPARATOR . $addon . DIRECTORY_SEPARATOR . 'package' . DIRECTORY_SEPARATOR; - } } diff --git a/niucloud/app/adminapi/controller/member/Config.php b/niucloud/app/adminapi/controller/member/Config.php index 7b6394ce0..0f5ad54a8 100644 --- a/niucloud/app/adminapi/controller/member/Config.php +++ b/niucloud/app/adminapi/controller/member/Config.php @@ -24,7 +24,7 @@ class Config extends BaseAdminController */ public function getLoginConfig() { - return success((new MemberConfigService())->getLoginConfig()); + return success(( new MemberConfigService() )->getLoginConfig()); } /** @@ -34,14 +34,16 @@ class Config extends BaseAdminController public function setLoginConfig() { $data = $this->request->params([ - ['is_username', 1], - ['is_mobile', 0], - ['is_auth_register', 1], - ['is_bind_mobile', 0], - ['agreement_show', 0] + [ 'is_username', 1 ], + [ 'is_mobile', 0 ], + [ 'is_auth_register', 1 ], + [ 'is_bind_mobile', 0 ], + [ 'agreement_show', 0 ], + [ 'bg_url', '' ], + [ 'desc', '' ] ]); $this->validate($data, 'app\validate\member\LoginConfig.set'); - (new MemberConfigService())->setLoginConfig($data); + ( new MemberConfigService() )->setLoginConfig($data); return success('MODIFY_SUCCESS'); } @@ -51,7 +53,7 @@ class Config extends BaseAdminController */ public function getCashOutConfig() { - return success((new MemberConfigService())->getCashOutConfig()); + return success(( new MemberConfigService() )->getCashOutConfig()); } /** @@ -61,15 +63,15 @@ class Config extends BaseAdminController public function setCashOutConfig() { $data = $this->request->params([ - ['is_open', 0], //是否开启 - ['min', 0.01], //最低提现金额 - ['rate', 0], //提现手续费比率 - ['is_auto_verify', 0], //是否自动审核 - ['is_auto_transfer', 0], //是否自动转账 - ['transfer_type', []] //转账方式 + [ 'is_open', 0 ], //是否开启 + [ 'min', 0.01 ], //最低提现金额 + [ 'rate', 0 ], //提现手续费比率 + [ 'is_auto_verify', 0 ], //是否自动审核 + [ 'is_auto_transfer', 0 ], //是否自动转账 + [ 'transfer_type', [] ] //转账方式 ]); $this->validate($data, 'app\validate\member\CashOutConfig.set'); - (new MemberConfigService())->setCashOutConfig($data); + ( new MemberConfigService() )->setCashOutConfig($data); return success('SET_SUCCESS'); } @@ -79,7 +81,7 @@ class Config extends BaseAdminController */ public function getMemberConfig() { - return success((new MemberConfigService())->getMemberConfig()); + return success(( new MemberConfigService() )->getMemberConfig()); } /** @@ -89,11 +91,11 @@ class Config extends BaseAdminController public function setMemberConfig() { $data = $this->request->params([ - ['prefix', ''], - ['length', 10] + [ 'prefix', '' ], + [ 'length', 10 ] ]); $this->validate($data, 'app\validate\member\MemberConfig.set'); - (new MemberConfigService())->setMemberConfig($data); + ( new MemberConfigService() )->setMemberConfig($data); return success('MODIFY_SUCCESS'); } @@ -103,7 +105,7 @@ class Config extends BaseAdminController */ public function getGrowthRuleConfig() { - return success((new MemberConfigService())->getGrowthRuleConfig()); + return success(( new MemberConfigService() )->getGrowthRuleConfig()); } /** @@ -113,12 +115,12 @@ class Config extends BaseAdminController public function setGrowthRuleConfig() { $param = []; - $rules = (new MemberService())->getGrowthRuleDict(); + $rules = ( new MemberService() )->getGrowthRuleDict(); foreach ($rules as $key => $item) { - $param[] = [$key, []]; + $param[] = [ $key, [] ]; } $data = $this->request->params($param); - (new MemberConfigService())->setGrowthRuleConfig($data); + ( new MemberConfigService() )->setGrowthRuleConfig($data); return success('MODIFY_SUCCESS'); } @@ -128,7 +130,7 @@ class Config extends BaseAdminController */ public function getPointRuleConfig() { - return success((new MemberConfigService())->getPointRuleConfig()); + return success(( new MemberConfigService() )->getPointRuleConfig()); } /** @@ -138,12 +140,12 @@ class Config extends BaseAdminController public function setPointRuleConfig() { $param = []; - $rules = (new MemberService())->getPointRuleDict(); + $rules = ( new MemberService() )->getPointRuleDict(); foreach ($rules as $key => $item) { - $param[] = [$key, []]; + $param[] = [ $key, [] ]; } $data = $this->request->params($param); - (new MemberConfigService())->setPointRuleConfig($data); + ( new MemberConfigService() )->setPointRuleConfig($data); return success('MODIFY_SUCCESS'); } } diff --git a/niucloud/app/adminapi/controller/notice/Notice.php b/niucloud/app/adminapi/controller/notice/Notice.php index 43ba97c04..4d62ed702 100644 --- a/niucloud/app/adminapi/controller/notice/Notice.php +++ b/niucloud/app/adminapi/controller/notice/Notice.php @@ -94,21 +94,6 @@ class Notice extends BaseAdminController return success(); } - /** - * 消息列表 - * @return Response - */ - public function getLogList() - { - $data = $this->request->params([ - ['key', ''], - ['receiver', ''], - ]); - - $res = (new NoticeService())->getLogPage($data); - return success($res); - } - /** * 消息修改 * @return Response diff --git a/niucloud/app/adminapi/controller/stat/Stat.php b/niucloud/app/adminapi/controller/stat/Stat.php index fed923ff8..4c251fbd0 100644 --- a/niucloud/app/adminapi/controller/stat/Stat.php +++ b/niucloud/app/adminapi/controller/stat/Stat.php @@ -25,6 +25,9 @@ class Stat extends BaseAdminController /** * 首页数据 * @return Response + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function index() { diff --git a/niucloud/app/adminapi/controller/user/User.php b/niucloud/app/adminapi/controller/user/User.php index 97db5f002..39ae7bb2f 100644 --- a/niucloud/app/adminapi/controller/user/User.php +++ b/niucloud/app/adminapi/controller/user/User.php @@ -86,6 +86,16 @@ class User extends BaseAdminController return success(); } + /** + * 删除用户 + * @param $uid + * @return Response + */ + public function del($uid) { + (new UserService())->del($uid); + return success("DELETE_SUCCESS"); + } + /** * 获取用户站点创建限制 * @param $uid diff --git a/niucloud/app/adminapi/route/dict.php b/niucloud/app/adminapi/route/dict.php index 40ce6401a..7d11e7850 100644 --- a/niucloud/app/adminapi/route/dict.php +++ b/niucloud/app/adminapi/route/dict.php @@ -16,7 +16,6 @@ use app\adminapi\middleware\AdminCheckToken; use app\adminapi\middleware\AdminLog; -// USER_CODE_BEGIN -- sys_dict Route::group('dict', function () { //数据字典列表 @@ -39,5 +38,4 @@ Route::group('dict', function () { AdminCheckToken::class, AdminCheckRole::class, AdminLog::class -]); -// USER_CODE_END -- sys_dict +]); \ No newline at end of file diff --git a/niucloud/app/adminapi/route/member.php b/niucloud/app/adminapi/route/member.php index c19f77cf2..965856a42 100644 --- a/niucloud/app/adminapi/route/member.php +++ b/niucloud/app/adminapi/route/member.php @@ -18,7 +18,7 @@ use think\facade\Route; /** * 路由 */ -Route::group('member', function () { +Route::group('member', function() { /***************************************************** 会员管理 ****************************************************/ //会员列表 Route::get('member', 'member.Member/lists'); diff --git a/niucloud/app/adminapi/route/notice.php b/niucloud/app/adminapi/route/notice.php index 6365c4feb..1288bb05a 100644 --- a/niucloud/app/adminapi/route/notice.php +++ b/niucloud/app/adminapi/route/notice.php @@ -32,8 +32,6 @@ Route::group('notice', function () { Route::get('notice/sms/:sms_type', 'notice.Notice/smsConfig'); //短信配置修改 Route::put('notice/sms/:sms_type', 'notice.Notice/editSms'); - //消息发送记录 - Route::get('notice/log', 'notice.Notice/getLogList'); //消息修改 Route::post('notice/edit', 'notice.Notice/edit'); diff --git a/niucloud/app/adminapi/route/route.php b/niucloud/app/adminapi/route/route.php index a1d9ad5ad..57e1b7bbb 100644 --- a/niucloud/app/adminapi/route/route.php +++ b/niucloud/app/adminapi/route/route.php @@ -15,7 +15,7 @@ use think\facade\Route; /** * 路由 */ -Route::group(function () { +Route::group(function() { //用户登录 Route::get('login/:app_type', 'login.Login/login'); @@ -26,9 +26,7 @@ Route::group(function () { Route::get('captcha/create', 'login.Captcha/create'); //一次校验验证码 Route::get('captcha/check', 'login.Captcha/check'); - - Route::get('test', 'login.Login/test'); }); //加载插件路由 -(new DictLoader("Route"))->load(['app_type' => 'adminapi']); \ No newline at end of file +( new DictLoader("Route") )->load([ 'app_type' => 'adminapi' ]); \ No newline at end of file diff --git a/niucloud/app/adminapi/route/user.php b/niucloud/app/adminapi/route/user.php index fe67d49f1..c74d62c61 100644 --- a/niucloud/app/adminapi/route/user.php +++ b/niucloud/app/adminapi/route/user.php @@ -28,6 +28,8 @@ Route::group('user', function () { Route::get('user_select', 'user.User/getUserSelect'); //用户详情 Route::get('user/:uid', 'user.User/info'); + // 删除用户 + Route::delete('user/:uid', 'user.User/del'); // 查询账号是否存在 Route::get('isexist', 'user.User/checkUserIsExist'); //添加用户 diff --git a/niucloud/app/api/controller/member/Account.php b/niucloud/app/api/controller/member/Account.php index 8495a6024..09a94ec9e 100644 --- a/niucloud/app/api/controller/member/Account.php +++ b/niucloud/app/api/controller/member/Account.php @@ -62,6 +62,7 @@ class Account extends BaseApiController { $data = $this->request->params([ ['from_type', ''], + ['trade_type', ''], ['create_time', []] ]); return success((new MemberAccountService())->getBalancePage($data)); diff --git a/niucloud/app/dict/diy/ComponentDict.php b/niucloud/app/dict/diy/ComponentDict.php index 5035fe981..abd3706c6 100644 --- a/niucloud/app/dict/diy/ComponentDict.php +++ b/niucloud/app/dict/diy/ComponentDict.php @@ -550,7 +550,7 @@ class ComponentDict 'sort' => 10014, 'position' => 'fixed', 'value' => [ - "imageSize" => 80, + "imageSize" => 40, "aroundRadius" => 0, 'style' => 'style-1', "styleName" => "风格一", diff --git a/niucloud/app/dict/diy/LinkDict.php b/niucloud/app/dict/diy/LinkDict.php index e149ded70..0dbaed213 100644 --- a/niucloud/app/dict/diy/LinkDict.php +++ b/niucloud/app/dict/diy/LinkDict.php @@ -63,63 +63,63 @@ class LinkDict 'name' => 'MEMBER_PERSONAL', 'title' => get_lang('dict_diy.member_my_personal'), 'url' => '/app/pages/member/personal', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], [ 'name' => 'MEMBER_BALANCE', 'title' => get_lang('dict_diy.member_my_balance'), 'url' => '/app/pages/member/balance', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], [ 'name' => 'MEMBER_POINT', 'title' => get_lang('dict_diy.member_my_point'), 'url' => '/app/pages/member/point', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], [ 'name' => 'MEMBER_COMMISSION', 'title' => get_lang('dict_diy.member_my_commission'), 'url' => '/app/pages/member/commission', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], [ 'name' => 'MEMBER_ADDRESS', 'title' => get_lang('dict_diy.member_my_address'), 'url' => '/app/pages/member/address', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], [ 'name' => 'MEMBER_MY_LEVEL', 'title' => get_lang('dict_diy.member_my_level'), 'url' => '/app/pages/member/level', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], [ 'name' => 'MEMBER_MY_SIGN_IN', 'title' => get_lang('dict_diy.member_my_sign_in'), 'url' => '/app/pages/member/sign_in', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], [ 'name' => 'MEMBER_VERIFY_INDEX', 'title' => get_lang('dict_diy.member_verify_index'), 'url' => '/app/pages/verify/index', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], [ 'name' => 'MEMBER_CONTACT', 'title' => get_lang('dict_diy.member_contact'), 'url' => '/app/pages/member/contact', - 'is_share' => 1, + 'is_share' => 0, 'action' => '' ], ] diff --git a/niucloud/app/dict/diy/PagesDict.php b/niucloud/app/dict/diy/PagesDict.php index 31a896502..e90055e4f 100644 --- a/niucloud/app/dict/diy/PagesDict.php +++ b/niucloud/app/dict/diy/PagesDict.php @@ -68,7 +68,9 @@ class PagesDict "list" => [] ]; - $wap_index_list = ( new ConfigService() )->getWapIndexList(); + $wap_index_list = ( new ConfigService() )->getWapIndexList([ + 'site_id' => $params[ 'site_id' ] ?? 0 + ]); if (!empty($wap_index_list)) { foreach ($wap_index_list as $k => $v) { diff --git a/niucloud/app/dict/member/MemberSignDict.php b/niucloud/app/dict/member/MemberSignDict.php index d2d1859a3..741bc0f8c 100644 --- a/niucloud/app/dict/member/MemberSignDict.php +++ b/niucloud/app/dict/member/MemberSignDict.php @@ -11,8 +11,6 @@ namespace app\dict\member; -use app\dict\common\ChannelDict; - /** * 会员签到状态枚举类 * Class MemberDict diff --git a/niucloud/app/dict/member/MemberSignTypeDict.php b/niucloud/app/dict/member/MemberSignTypeDict.php index 633b98619..a4ce581f8 100644 --- a/niucloud/app/dict/member/MemberSignTypeDict.php +++ b/niucloud/app/dict/member/MemberSignTypeDict.php @@ -11,8 +11,6 @@ namespace app\dict\member; -use app\dict\common\ChannelDict; - /** * 会员签到类型枚举类 * Class MemberDict diff --git a/niucloud/app/dict/menu/admin.php b/niucloud/app/dict/menu/admin.php index a34b0fe05..3a12ac4f8 100644 --- a/niucloud/app/dict/menu/admin.php +++ b/niucloud/app/dict/menu/admin.php @@ -132,7 +132,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '40', + 'sort' => '75', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -320,7 +320,7 @@ return [ 'router_path' => 'setting/storage', 'view_path' => 'setting/storage', 'methods' => 'get', - 'sort' => '30', + 'sort' => '70', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -364,7 +364,7 @@ return [ 'router_path' => 'setting/adminlogin', 'view_path' => 'setting/adminlogin', 'methods' => 'get', - 'sort' => '20', + 'sort' => '65', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -394,7 +394,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => 'get', - 'sort' => '20', + 'sort' => '60', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -408,7 +408,7 @@ return [ 'router_path' => 'setting/oplatform', 'view_path' => 'wxoplatform/setting', 'methods' => 'get', - 'sort' => '20', + 'sort' => '100', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -438,7 +438,7 @@ return [ 'router_path' => 'wxoplatform/weapp_version', 'view_path' => 'wxoplatform/weapp_version', 'methods' => 'get', - 'sort' => '10', + 'sort' => '99', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -470,7 +470,7 @@ return [ 'router_path' => 'setting/attachment', 'view_path' => 'tools/attachment', 'methods' => 'get', - 'sort' => '10', + 'sort' => '55', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -570,7 +570,7 @@ return [ 'router_path' => 'setting/map', 'view_path' => 'setting/map', 'methods' => 'get', - 'sort' => '9', + 'sort' => '50', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -600,7 +600,7 @@ return [ 'router_path' => 'setting/layout', 'view_path' => 'setting/layout', 'methods' => 'get', - 'sort' => '8', + 'sort' => '45', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -855,6 +855,20 @@ return [ 'status' => '1', 'is_show' => '1', ], + [ + 'menu_name' => '删除站点用户', + 'menu_key' => 'add_user', + 'menu_short_name' => '', + 'menu_type' => '2', + 'icon' => '', + 'api_url' => 'user/user/', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'delete', + 'sort' => '100', + 'status' => '1', + 'is_show' => '1', + ], [ 'menu_name' => '获取用户套餐权限', 'menu_key' => 'get_user_create_site_limit', @@ -938,7 +952,7 @@ return [ 'router_path' => 'app_manage/app_store', 'view_path' => 'index/store', 'methods' => 'get', - 'sort' => '70', + 'sort' => '78', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -1038,7 +1052,7 @@ return [ 'router_path' => 'app_manage/tools', 'view_path' => 'index/tools', 'methods' => 'get', - 'sort' => '70', + 'sort' => '77', 'status' => '1', 'is_show' => '1', ], @@ -1053,7 +1067,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '60', + 'sort' => '76', 'status' => '1', 'is_show' => '0', 'children' => [ diff --git a/niucloud/app/dict/menu/site.php b/niucloud/app/dict/menu/site.php index 45657c5cc..d9a6408d8 100644 --- a/niucloud/app/dict/menu/site.php +++ b/niucloud/app/dict/menu/site.php @@ -302,7 +302,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '70', + 'sort' => '89', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -715,7 +715,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '60', + 'sort' => '88', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -801,7 +801,7 @@ return [ 'router_path' => 'finance/refund', 'view_path' => 'finance/pay_refund', 'methods' => 'get', - 'sort' => '9', + 'sort' => '96', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -831,7 +831,7 @@ return [ 'router_path' => 'finance/refund/detail', 'view_path' => 'finance/refund_detail', 'methods' => 'get', - 'sort' => '9', + 'sort' => '95', 'status' => '1', 'is_show' => '0', ], @@ -848,7 +848,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '56', + 'sort' => '87', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -1013,7 +1013,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '55', + 'sort' => '86', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -1044,7 +1044,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '50', + 'sort' => '85', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -1517,7 +1517,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '40', + 'sort' => '84', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -1631,7 +1631,7 @@ return [ 'router_path' => 'setting/auth/role', 'view_path' => 'auth/role', 'methods' => 'get', - 'sort' => '70', + 'sort' => '99', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -1689,7 +1689,7 @@ return [ 'router_path' => 'setting/auth/log', 'view_path' => 'auth/log', 'methods' => 'get', - 'sort' => '60', + 'sort' => '98', 'status' => '1', 'is_show' => '1', ], @@ -1706,7 +1706,7 @@ return [ 'router_path' => '', 'view_path' => '', 'methods' => '', - 'sort' => '30', + 'sort' => '83', 'status' => '1', 'is_show' => '1', 'children' => [ @@ -1786,7 +1786,6 @@ return [ ], ] ], - [ 'menu_name' => '会员设置', 'menu_key' => 'setting_member', diff --git a/niucloud/app/dict/pay/PayChannelDict.php b/niucloud/app/dict/pay/PayChannelDict.php index 3ac4b18f4..0ab7ecd67 100644 --- a/niucloud/app/dict/pay/PayChannelDict.php +++ b/niucloud/app/dict/pay/PayChannelDict.php @@ -16,7 +16,6 @@ use app\dict\common\ChannelDict; class PayChannelDict { - /** * 支付渠道类型 * @return array @@ -43,5 +42,4 @@ class PayChannelDict return $list; } - } \ No newline at end of file diff --git a/niucloud/app/dict/schedule/schedule.php b/niucloud/app/dict/schedule/schedule.php index 53966d447..046b89892 100644 --- a/niucloud/app/dict/schedule/schedule.php +++ b/niucloud/app/dict/schedule/schedule.php @@ -25,15 +25,15 @@ return [ 'class' => 'app\job\schedule\SiteExpireClose', 'function' => '' ], - [ - 'key' => 'site_stat', - 'name' => '站点统计', - 'desc' => '', - 'time' => [ - 'type' => 'hour', - 'hour' => 1, - ], - 'class' => 'app\job\schedule\SiteStatJob', - 'function' => '' - ] +// [ +// 'key' => 'site_stat', +// 'name' => '站点统计', +// 'desc' => '', +// 'time' => [ +// 'type' => 'hour', +// 'hour' => 1, +// ], +// 'class' => 'app\job\schedule\SiteStatJob', +// 'function' => '' +// ] ]; diff --git a/niucloud/app/dict/sys/AgreementDict.php b/niucloud/app/dict/sys/AgreementDict.php index 6fb7bd8b4..2837e7c97 100644 --- a/niucloud/app/dict/sys/AgreementDict.php +++ b/niucloud/app/dict/sys/AgreementDict.php @@ -32,8 +32,8 @@ class AgreementDict 'privacy' => get_lang('dict_agreement.privacy'),//隐私协议 ]; $addon_data = event("AgreementType"); - Log::write("检测数据"); - Log::write($addon_data); +// Log::write("检测数据"); +// Log::write($addon_data); foreach ($addon_data as $k => $v) { $data = array_merge($data, $v); diff --git a/niucloud/app/event.php b/niucloud/app/event.php index d800b629b..13a54d8e3 100644 --- a/niucloud/app/event.php +++ b/niucloud/app/event.php @@ -27,7 +27,6 @@ $system_event = [ 'MemberAccount' => [ 'app\listener\member\MemberAccountListener' ], //扫码事件 'Scan' => [ 'app\listener\scan\ScanListener' ], - 'AddSiteAfter' => [ 'app\listener\site\AddSiteAfterListener' ], /** * 支付相关事件 */ @@ -89,12 +88,12 @@ $system_event = [ //导出数据类型 'ExportDataType' => [ //会员导出 - 'app\listener\member\MemberExportTypeListener', + 'app\listener\member_export\MemberExportTypeListener', ], //导出数据源 'ExportData' => [ //会员导出 - 'app\listener\member\MemberExportDataListener', + 'app\listener\member_export\MemberExportDataListener', ], //统计执行 'StatExecute' => [], @@ -102,10 +101,10 @@ $system_event = [ 'StatField' => [], // 获取海报数据 - 'GetPosterData' => ['app\listener\system\Poster'], + 'GetPosterData' => [ 'app\listener\system\Poster' ], // 小程序授权变更事件 - 'WeappAuthChangeAfter' => ['app\listener\system\WeappAuthChangeAfter'] + 'WeappAuthChangeAfter' => [ 'app\listener\system\WeappAuthChangeAfter' ] ], 'subscribe' => [ ], diff --git a/niucloud/app/install/controller/Index.php b/niucloud/app/install/controller/Index.php index 003dfb288..e77fe1782 100644 --- a/niucloud/app/install/controller/Index.php +++ b/niucloud/app/install/controller/Index.php @@ -6,8 +6,6 @@ namespace app\install\controller; use app\model\site\Site; use app\model\sys\SysUser; use app\service\admin\install\InstallSystemService; -use app\service\admin\site\SiteGroupService; -use app\service\admin\site\SiteService; use app\service\core\schedule\CoreScheduleInstallService; use Exception; use think\facade\Cache; @@ -39,7 +37,7 @@ class Index extends BaseInstall $host = ( empty($_SERVER[ 'REMOTE_ADDR' ]) ? $_SERVER[ 'REMOTE_HOST' ] : $_SERVER[ 'REMOTE_ADDR' ] ); $name = $_SERVER[ 'SERVER_NAME' ]; - $verison = !(version_compare(PHP_VERSION, '8.0.0') == -1); + $verison = !( version_compare(PHP_VERSION, '8.0.0') == -1 ); //pdo $pdo = extension_loaded('pdo') && extension_loaded('pdo_mysql'); $system_variables[] = [ "name" => "pdo", "need" => "开启", "status" => $pdo ]; @@ -65,9 +63,9 @@ class Index extends BaseInstall [ "path" => $root_path . DIRECTORY_SEPARATOR, "path_name" => "niucloud/", "name" => "网站目录" ], [ "path" => $root_path . DIRECTORY_SEPARATOR . ".env", "path_name" => "niucloud/.env", "name" => "env" ], [ "path" => $root_path . DIRECTORY_SEPARATOR . ".example.env", "path_name" => "niucloud/.example_env", "name" => "env" ], - [ "path" => $root_path . DIRECTORY_SEPARATOR . 'runtime'.DIRECTORY_SEPARATOR, "path_name" => "niucloud/runtime", "name" => "runtime" ], - [ "path" => $root_path . DIRECTORY_SEPARATOR . 'public'.DIRECTORY_SEPARATOR.'upload'.DIRECTORY_SEPARATOR, "path_name" => "niucloud/public/upload", "name" => "upload" ], - [ "path" => $root_path . DIRECTORY_SEPARATOR . 'app'.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR, "path_name" => "niucloud/app/install", "name" => "安装目录" ] + [ "path" => $root_path . DIRECTORY_SEPARATOR . 'runtime' . DIRECTORY_SEPARATOR, "path_name" => "niucloud/runtime", "name" => "runtime" ], + [ "path" => $root_path . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR . 'upload' . DIRECTORY_SEPARATOR, "path_name" => "niucloud/public/upload", "name" => "upload" ], + [ "path" => $root_path . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR, "path_name" => "niucloud/app/install", "name" => "安装目录" ] ]; //目录 可读 可写检测 $is_dir = true; @@ -164,7 +162,7 @@ class Index extends BaseInstall "message" => "数据库不存在,系统将自动创建" ]; } - } catch ( Exception $e) { + } catch (Exception $e) { $result = [ "status" => 1, "message" => "数据库不存在,系统将自动创建" @@ -182,7 +180,7 @@ class Index extends BaseInstall } return success($result); - } catch ( Exception $e) { + } catch (Exception $e) { $result = [ "status" => -1, "message" => $e->getMessage() @@ -210,7 +208,7 @@ class Index extends BaseInstall $sqls = explode("\n", trim($sql)); $sqls = array_filter($sqls); foreach ($sqls as $query) { - $str1 = $query[0] ?? ''; + $str1 = $query[ 0 ] ?? ''; if ($str1 != '#' && $str1 != '-') $sql_query[ $num ] .= $query; } @@ -263,7 +261,7 @@ class Index extends BaseInstall // return fail('平台信息不能为空!'); // } - if($site_username == $username) { + if ($site_username == $username) { $this->setSuccessLog([ '站点账号不能跟平台账号一致', 'error' ]); return fail('站点账号不能跟平台账号一致!'); } @@ -289,7 +287,7 @@ class Index extends BaseInstall Cache::set('install_status', 1);//成功 return success(); - } catch ( Exception $e) { + } catch (Exception $e) { $this->setSuccessLog([ '安装失败' . $e->getMessage(), 'error' ]); return fail('安装失败' . $e->getMessage()); } @@ -315,7 +313,7 @@ class Index extends BaseInstall return fail('平台两次密码输入不一样，请重新输入'); } - if($site_username == $username) { + if ($site_username == $username) { return fail('站点账号不能跟平台账号一致'); } @@ -331,13 +329,12 @@ class Index extends BaseInstall return fail('菜单初始化失败'); } //初始化计划任务 - $res = ( new CoreScheduleInstallService())->installSystemSchedule(); + $res = ( new CoreScheduleInstallService() )->installSystemSchedule(); if (!$res) { $this->setSuccessLog([ '计划任务初始化失败', 'error' ]); return fail('计划任务初始化失败'); } - $user = ( new SysUser() )->where([ [ 'uid', '=', 1 ] ])->findOrEmpty(); if (!$user->isEmpty()) { $user->save([ @@ -345,7 +342,7 @@ class Index extends BaseInstall 'password' => create_password($password), ]); } - ( new Site() )->where([ [ 'site_id', '=', 1 ] ])->update(['site_id' => 0]); + ( new Site() )->where([ [ 'site_id', '=', 1 ] ])->update([ 'site_id' => 0 ]); $site = ( new Site() )->where([ [ 'site_id', '=', 0 ] ])->findOrEmpty(); if (!$site->isEmpty()) { $site->save([ @@ -353,7 +350,7 @@ class Index extends BaseInstall ]); } //修改自增主键默认值 - Db::execute("alter table ".env('database.prefix', '')."site auto_increment = 100000"); + Db::execute("alter table " . env('database.prefix', '') . "site auto_increment = 100000"); //获取默认套餐 $fp = fopen($this->lock_file, 'wb'); @@ -367,7 +364,7 @@ class Index extends BaseInstall Cache::set('install_status', 2);//成功 // Cache::tag(MenuService::$cache_tag_name)->clear(); return success(); - } catch ( Exception $e) { + } catch (Exception $e) { $this->setSuccessLog([ '安装失败' . $e->getMessage(), 'error' ]); return fail('安装失败' . $e->getMessage()); } @@ -445,7 +442,7 @@ class Index extends BaseInstall $sql_item = $this->str_replace_first($table_name, $new_table_name, $sql); @mysqli_query($conn, $sql_item); if ($is_write) $this->setSuccessLog([ '创建表' . $table_name, 'success' ]); - } catch ( Exception $e) { + } catch (Exception $e) { $this->setSuccessLog([ $e->getMessage(), 'error' ]); return fail('数据库解析失败' . $e->getMessage()); } @@ -517,7 +514,7 @@ class Index extends BaseInstall if ($data[ 1 ] == 'error') { Cache::set('install_status', -1); } - $time = @(int)microtime(true); + $time = @(int) microtime(true); $data[] = date('Y-m-d H:i:s', $time); $install_data = Cache::get('install_data') ?? []; $install_data[] = $data; diff --git a/niucloud/app/install/source/database.sql b/niucloud/app/install/source/database.sql index 42e724c0f..f53c4770e 100644 --- a/niucloud/app/install/source/database.sql +++ b/niucloud/app/install/source/database.sql @@ -2,7 +2,7 @@ SET NAMES utf8mb4; DROP TABLE IF EXISTS `addon`; -CREATE TABLE `addon` ( +CREATE TABLE `addon` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', `title` varchar(40) NOT NULL DEFAULT '' COMMENT '插件名称', `icon` varchar(255) NOT NULL DEFAULT '' COMMENT '插件图标', @@ -24,7 +24,7 @@ CREATE TABLE `addon` ( DROP TABLE IF EXISTS `addon_log`; -CREATE TABLE `addon_log` ( +CREATE TABLE `addon_log` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', `action` varchar(40) NOT NULL DEFAULT '' COMMENT '操作类型 install 安装 uninstall 卸载 update 更新', `key` varchar(20) NOT NULL DEFAULT '' COMMENT '插件标识', @@ -78,12 +78,12 @@ CREATE TABLE `diy_page` ( `template` varchar(255) NOT NULL DEFAULT '' COMMENT '模板名称', `mode` varchar(255) NOT NULL DEFAULT 'diy' COMMENT '页面展示模式，diy：自定义，fixed：固定', `value` longtext COMMENT '页面数据，json格式', - `is_default` int(11) NOT NULL DEFAULT '0' COMMENT '是否默认页面，1：是，0：否', - `is_change` int(11) NOT NULL DEFAULT '0' COMMENT '数据是否发生过变化，1：变化了，2：没有', + `is_default` int(11) NOT NULL DEFAULT 0 COMMENT '是否默认页面，1：是，0：否', + `is_change` int(11) NOT NULL DEFAULT 0 COMMENT '数据是否发生过变化，1：变化了，2：没有', `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 '更新时间', + `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`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义页面' ROW_FORMAT = Dynamic; @@ -458,91 +458,6 @@ CREATE TABLE `pay_transfer` ( ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '转账表' ROW_FORMAT = Dynamic; -DROP TABLE IF EXISTS `recharge_order`; -CREATE TABLE `recharge_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`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单表' ROW_FORMAT = Dynamic; - - -DROP TABLE IF EXISTS `recharge_order_item`; -CREATE TABLE `recharge_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 COMMENT '创建时间', - PRIMARY KEY (`order_item_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单商品表' ROW_FORMAT = Dynamic; - - -DROP TABLE IF EXISTS `recharge_order_item_refund`; -CREATE TABLE `recharge_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`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单退款表' ROW_FORMAT = Dynamic; - - -DROP TABLE IF EXISTS `recharge_order_log`; -CREATE TABLE `recharge_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`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单操作记录表' ROW_FORMAT = Dynamic; - - DROP TABLE IF EXISTS `site`; CREATE TABLE `site` ( `site_id` int(11) NOT NULL AUTO_INCREMENT, @@ -1119,7 +1034,7 @@ INSERT INTO `site`(site_id, site_name, group_id, keywords, app_type, logo, `desc UPDATE `site` SET site_id = 0 WHERE site_id = 1; -INSERT INTO `sys_user` VALUES ('1', '', '', '', '', '', '0', '0', '0', '1', '0', '0', '0'); +-- INSERT INTO `sys_user` VALUES ('1', '', '', '', '', '', '0', '0', '0', '1', '0', '0', '0'); INSERT INTO `sys_user_role` VALUES ('1', '1', '0', '', '0', '1', '1'); diff --git a/niucloud/app/install/view/base.html b/niucloud/app/install/view/base.html index 65dd94e80..8c77b45ba 100644 --- a/niucloud/app/install/view/base.html +++ b/niucloud/app/install/view/base.html @@ -4,7 +4,6 @@ 安装程序 - NiuCloud-Admin - diff --git a/niucloud/app/install/view/index/step-3.html b/niucloud/app/install/view/index/step-3.html index 40456b11b..264d3b5ce 100644 --- a/niucloud/app/install/view/index/step-3.html +++ b/niucloud/app/install/view/index/step-3.html @@ -159,13 +159,13 @@
- +
{/block} {block name='script'} -