From 5e0b2b940e7eaf39e44857debe3f2044e1596237 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 22 May 2023 09:22:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E9=AA=8C=E8=AF=81=E5=AF=86=E7=A0=81=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/admin/SystemAdminServices.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/crmeb/app/services/system/admin/SystemAdminServices.php b/crmeb/app/services/system/admin/SystemAdminServices.php index 0cacdc8bc..8e2efbc68 100644 --- a/crmeb/app/services/system/admin/SystemAdminServices.php +++ b/crmeb/app/services/system/admin/SystemAdminServices.php @@ -257,6 +257,10 @@ class SystemAdminServices extends BaseServices } unset($data['conf_pwd']); + if (strlen(trim($data['pwd'])) < 6 || strlen(trim($data['pwd'])) > 32) { + return app('json')->fail(400762); + } + if ($this->dao->count(['account' => $data['account'], 'is_del' => 0])) { throw new AdminException(400596); } @@ -319,6 +323,11 @@ class SystemAdminServices extends BaseServices if ($data['conf_pwd'] != $data['pwd']) { throw new AdminException(400264); } + + if (strlen(trim($data['pwd'])) < 6 || strlen(trim($data['pwd'])) > 32) { + return app('json')->fail(400762); + } + $adminInfo->pwd = $this->passwordHash($data['pwd']); } //修改账号 From 1752cf4941204fc6d726067f0accf5b453515af6 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 22 May 2023 09:25:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/admin/SystemAdminServices.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/app/services/system/admin/SystemAdminServices.php b/crmeb/app/services/system/admin/SystemAdminServices.php index 8e2efbc68..b60a14096 100644 --- a/crmeb/app/services/system/admin/SystemAdminServices.php +++ b/crmeb/app/services/system/admin/SystemAdminServices.php @@ -258,7 +258,7 @@ class SystemAdminServices extends BaseServices unset($data['conf_pwd']); if (strlen(trim($data['pwd'])) < 6 || strlen(trim($data['pwd'])) > 32) { - return app('json')->fail(400762); + throw new AdminException(400762); } if ($this->dao->count(['account' => $data['account'], 'is_del' => 0])) { @@ -325,7 +325,7 @@ class SystemAdminServices extends BaseServices } if (strlen(trim($data['pwd'])) < 6 || strlen(trim($data['pwd'])) > 32) { - return app('json')->fail(400762); + throw new AdminException(400762); } $adminInfo->pwd = $this->passwordHash($data['pwd']); From c25d8441a242de5a48837fab5c48da72ba334df9 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 22 May 2023 09:37:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A4=84=E7=90=86=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/route/setting.php | 2 +- template/admin/src/pages/marketing/storeCouponIssue/create.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/app/adminapi/route/setting.php b/crmeb/app/adminapi/route/setting.php index 6023dd5c8..e0e49ebe1 100644 --- a/crmeb/app/adminapi/route/setting.php +++ b/crmeb/app/adminapi/route/setting.php @@ -127,7 +127,7 @@ Route::group('setting', function () { /** 组合数据 */ Route::group(function () { //组合数据资源路由 - Route::resource('group', 'v1.setting.SystemGroup')->except(['read'])->option([ + Route::resource('group', 'v1.setting.SystemGroup')->option([ 'real_name' => [ 'index' => '获取组合数据列表', 'create' => '获取组合数据表单', diff --git a/template/admin/src/pages/marketing/storeCouponIssue/create.vue b/template/admin/src/pages/marketing/storeCouponIssue/create.vue index 990562cc2..cc5cef09a 100644 --- a/template/admin/src/pages/marketing/storeCouponIssue/create.vue +++ b/template/admin/src/pages/marketing/storeCouponIssue/create.vue @@ -29,7 +29,7 @@ 付费会员专享
- 用户领取：用户需要手动领取优惠券；新用户自动发放：新注册的用户自动发放；系统赠送：后台发放制定用户或者添加到商品里面用户购买该商品获得；付费会员专享：仅付费会员可以领取和使用 + 用户领取：用户需要手动领取优惠券；新用户自动发放：新注册的用户自动发放；系统赠送：后台发放指定用户或者添加到商品里面用户购买该商品获得；付费会员专享：仅付费会员可以领取和使用
From 8e373cad2e527eecd6279654a5a927dc45e73993 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 22 May 2023 09:45:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=92=8C=E5=8D=87=E7=BA=A7sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/UpgradeController.php | 6 +++--- crmeb/public/install/crmeb.sql | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crmeb/app/adminapi/controller/UpgradeController.php b/crmeb/app/adminapi/controller/UpgradeController.php index 4067c24c6..2cbf922ab 100644 --- a/crmeb/app/adminapi/controller/UpgradeController.php +++ b/crmeb/app/adminapi/controller/UpgradeController.php @@ -15038,9 +15038,9 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (3006, 3001, '', '修改文章分类', '', '', '', 'cms/category/', 'PUT', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-646733862d224', 0, '修改文章分类'), (3007, 3001, '', '获取修改文章分类表单', '', '', '', 'cms/category//edit', 'GET', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-edit', 0, '获取修改文章分类表单'), (3008, 3002, '', '删除文章分类', '', '', '', 'cms/category/', 'DELETE', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-646733a5e8994', 0, '删除文章分类'), -(3009, 657, '', '商城首页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-index', 0, '商城首页'), -(3010, 657, '', '商品分类', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-cate', 0, '商品分类'), -(3011, 657, '', '个人中心', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-user', 0, '个人中心'), +(3009, 657, '', '商城首页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-index', 0, '商城首页'), +(3010, 657, '', '商品分类', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-cate', 0, '商品分类'), +(3011, 657, '', '个人中心', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-user', 0, '个人中心'), (3012, 3009, '', '添加专题页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-add', 0, '添加专题页'), (3013, 3009, '', '编辑页面', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-edit', 0, '编辑页面'), (3014, 3009, '', '删除页面', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-delete', 0, '删除页面'), diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index 7cf89561a..d9189c716 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -48059,9 +48059,9 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (3006, 3001, '', '修改文章分类', '', '', '', 'cms/category/', 'PUT', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-646733862d224', 0, '修改文章分类'), (3007, 3001, '', '获取修改文章分类表单', '', '', '', 'cms/category//edit', 'GET', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-edit', 0, '获取修改文章分类表单'), (3008, 3002, '', '删除文章分类', '', '', '', 'cms/category/', 'DELETE', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-646733a5e8994', 0, '删除文章分类'), -(3009, 657, '', '商城首页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-index', 0, '商城首页'), -(3010, 657, '', '商品分类', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-cate', 0, '商品分类'), -(3011, 657, '', '个人中心', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-user', 0, '个人中心'), +(3009, 657, '', '商城首页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-index', 0, '商城首页'), +(3010, 657, '', '商品分类', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-cate', 0, '商品分类'), +(3011, 657, '', '个人中心', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-user', 0, '个人中心'), (3012, 3009, '', '添加专题页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-add', 0, '添加专题页'), (3013, 3009, '', '编辑页面', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-edit', 0, '编辑页面'), (3014, 3009, '', '删除页面', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-delete', 0, '删除页面'),