From 3aa9d42b13d1e8d5ea5cef15e4259b8417fc591a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Thu, 15 Sep 2022 15:29:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/setting/SystemRole.php | 23 ++++++---- ...eware.php => AdminCheckRoleMiddleware.php} | 14 ++++-- crmeb/app/adminapi/route/agent.php | 2 +- crmeb/app/adminapi/route/app.php | 2 +- crmeb/app/adminapi/route/cms.php | 2 +- crmeb/app/adminapi/route/common.php | 2 +- crmeb/app/adminapi/route/diy.php | 2 +- crmeb/app/adminapi/route/export.php | 2 +- crmeb/app/adminapi/route/file.php | 2 +- crmeb/app/adminapi/route/finance.php | 2 +- crmeb/app/adminapi/route/freight.php | 2 +- crmeb/app/adminapi/route/live.php | 2 +- crmeb/app/adminapi/route/marketing.php | 2 +- crmeb/app/adminapi/route/merchant.php | 2 +- crmeb/app/adminapi/route/notify.php | 2 +- crmeb/app/adminapi/route/order.php | 4 +- crmeb/app/adminapi/route/product.php | 2 +- crmeb/app/adminapi/route/serve.php | 2 +- crmeb/app/adminapi/route/setting.php | 2 +- crmeb/app/adminapi/route/statistic.php | 2 +- crmeb/app/adminapi/route/system.php | 2 +- crmeb/app/adminapi/route/user.php | 2 +- crmeb/app/adminapi/route/widget.php | 2 +- .../system/admin/SystemRoleServices.php | 46 ++++++++++--------- crmeb/app/services/user/LoginServices.php | 38 ++++++++++----- crmeb/public/install/crmeb.sql | 2 +- 26 files changed, 99 insertions(+), 68 deletions(-) rename crmeb/app/adminapi/middleware/{AdminCkeckRoleMiddleware.php => AdminCheckRoleMiddleware.php} (81%) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemRole.php b/crmeb/app/adminapi/controller/v1/setting/SystemRole.php index 12347f3f3..3797abf38 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemRole.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemRole.php @@ -35,8 +35,7 @@ class SystemRole extends AuthController /** * 显示资源列表 - * - * @return \think\Response + * @return mixed */ public function index() { @@ -49,9 +48,12 @@ class SystemRole extends AuthController } /** - * 显示创建资源表单页. - * - * @return \think\Response + * 显示创建资源表单页 + * @param SystemMenusServices $services + * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function create(SystemMenusServices $services) { @@ -88,10 +90,13 @@ class SystemRole extends AuthController } /** - * 显示编辑资源表单页. - * - * @param int $id - * @return \think\Response + * 显示编辑资源表单页 + * @param SystemMenusServices $services + * @param $id + * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function edit(SystemMenusServices $services, $id) { diff --git a/crmeb/app/adminapi/middleware/AdminCkeckRoleMiddleware.php b/crmeb/app/adminapi/middleware/AdminCheckRoleMiddleware.php similarity index 81% rename from crmeb/app/adminapi/middleware/AdminCkeckRoleMiddleware.php rename to crmeb/app/adminapi/middleware/AdminCheckRoleMiddleware.php index f0f46d4ce..db4670378 100644 --- a/crmeb/app/adminapi/middleware/AdminCkeckRoleMiddleware.php +++ b/crmeb/app/adminapi/middleware/AdminCheckRoleMiddleware.php @@ -18,12 +18,18 @@ use crmeb\interfaces\MiddlewareInterface; /** * 权限规则验证 - * Class AdminCkeckRoleMiddleware + * Class AdminCheckRoleMiddleware * @package app\http\middleware */ -class AdminCkeckRoleMiddleware implements MiddlewareInterface +class AdminCheckRoleMiddleware implements MiddlewareInterface { - + /** + * 权限规则验证 + * @param Request $request + * @param \Closure $next + * @return mixed + * @throws \throwable + */ public function handle(Request $request, \Closure $next) { if (!$request->adminId() || !$request->adminInfo()) @@ -32,7 +38,7 @@ class AdminCkeckRoleMiddleware implements MiddlewareInterface if ($request->adminInfo()['level']) { /** @var SystemRoleServices $systemRoleService */ $systemRoleService = app()->make(SystemRoleServices::class); - $systemRoleService->verifiAuth($request); + $systemRoleService->verifyAuth($request); } return $next($request); diff --git a/crmeb/app/adminapi/route/agent.php b/crmeb/app/adminapi/route/agent.php index 09a52d920..c268d2b6e 100644 --- a/crmeb/app/adminapi/route/agent.php +++ b/crmeb/app/adminapi/route/agent.php @@ -74,6 +74,6 @@ Route::group('agent', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/app.php b/crmeb/app/adminapi/route/app.php index 026902a0f..8fbd83426 100644 --- a/crmeb/app/adminapi/route/app.php +++ b/crmeb/app/adminapi/route/app.php @@ -109,6 +109,6 @@ Route::group('app', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/cms.php b/crmeb/app/adminapi/route/cms.php index 85b849809..93c053e47 100644 --- a/crmeb/app/adminapi/route/cms.php +++ b/crmeb/app/adminapi/route/cms.php @@ -31,6 +31,6 @@ Route::group('cms', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/common.php b/crmeb/app/adminapi/route/common.php index 41e70d605..8e3a241dc 100644 --- a/crmeb/app/adminapi/route/common.php +++ b/crmeb/app/adminapi/route/common.php @@ -46,7 +46,7 @@ Route::group(function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/diy.php b/crmeb/app/adminapi/route/diy.php index 215d3d136..85bd6f0f5 100644 --- a/crmeb/app/adminapi/route/diy.php +++ b/crmeb/app/adminapi/route/diy.php @@ -72,6 +72,6 @@ Route::group('diy', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/export.php b/crmeb/app/adminapi/route/export.php index 63a55077e..07a051dab 100644 --- a/crmeb/app/adminapi/route/export.php +++ b/crmeb/app/adminapi/route/export.php @@ -43,6 +43,6 @@ Route::group('export', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/file.php b/crmeb/app/adminapi/route/file.php index 4ec899866..e2ece1aeb 100644 --- a/crmeb/app/adminapi/route/file.php +++ b/crmeb/app/adminapi/route/file.php @@ -35,6 +35,6 @@ Route::group('file', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/finance.php b/crmeb/app/adminapi/route/finance.php index 5fff5374b..d146d95fb 100644 --- a/crmeb/app/adminapi/route/finance.php +++ b/crmeb/app/adminapi/route/finance.php @@ -52,6 +52,6 @@ Route::group('finance', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/freight.php b/crmeb/app/adminapi/route/freight.php index 3bb141abe..a79ee9d99 100644 --- a/crmeb/app/adminapi/route/freight.php +++ b/crmeb/app/adminapi/route/freight.php @@ -28,6 +28,6 @@ Route::group('freight', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/live.php b/crmeb/app/adminapi/route/live.php index 1c719e10b..0c5ff5482 100644 --- a/crmeb/app/adminapi/route/live.php +++ b/crmeb/app/adminapi/route/live.php @@ -66,6 +66,6 @@ Route::group('live', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/marketing.php b/crmeb/app/adminapi/route/marketing.php index fa2c191ed..e90326af3 100644 --- a/crmeb/app/adminapi/route/marketing.php +++ b/crmeb/app/adminapi/route/marketing.php @@ -192,6 +192,6 @@ Route::group('marketing', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/merchant.php b/crmeb/app/adminapi/route/merchant.php index 504382532..f6d275068 100644 --- a/crmeb/app/adminapi/route/merchant.php +++ b/crmeb/app/adminapi/route/merchant.php @@ -51,6 +51,6 @@ Route::group('merchant', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/notify.php b/crmeb/app/adminapi/route/notify.php index 2c687514b..702d8d8f3 100644 --- a/crmeb/app/adminapi/route/notify.php +++ b/crmeb/app/adminapi/route/notify.php @@ -46,6 +46,6 @@ Route::group('notify', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/order.php b/crmeb/app/adminapi/route/order.php index 21f6defb6..79eb76b3e 100644 --- a/crmeb/app/adminapi/route/order.php +++ b/crmeb/app/adminapi/route/order.php @@ -109,7 +109,7 @@ Route::group('order', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); @@ -136,6 +136,6 @@ Route::group('refund', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/product.php b/crmeb/app/adminapi/route/product.php index a087588d9..4bd750cf1 100644 --- a/crmeb/app/adminapi/route/product.php +++ b/crmeb/app/adminapi/route/product.php @@ -96,6 +96,6 @@ Route::group('product', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/serve.php b/crmeb/app/adminapi/route/serve.php index b5fb161cf..11f228436 100644 --- a/crmeb/app/adminapi/route/serve.php +++ b/crmeb/app/adminapi/route/serve.php @@ -63,6 +63,6 @@ Route::group('serve', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/setting.php b/crmeb/app/adminapi/route/setting.php index b9f3c0611..8f3692ff6 100644 --- a/crmeb/app/adminapi/route/setting.php +++ b/crmeb/app/adminapi/route/setting.php @@ -192,6 +192,6 @@ Route::group('setting', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/statistic.php b/crmeb/app/adminapi/route/statistic.php index 81a1ff008..62b3658e1 100644 --- a/crmeb/app/adminapi/route/statistic.php +++ b/crmeb/app/adminapi/route/statistic.php @@ -74,6 +74,6 @@ Route::group('statistic', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/system.php b/crmeb/app/adminapi/route/system.php index 8ac0956a5..edd927a8c 100644 --- a/crmeb/app/adminapi/route/system.php +++ b/crmeb/app/adminapi/route/system.php @@ -103,6 +103,6 @@ Route::group('system', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/user.php b/crmeb/app/adminapi/route/user.php index 5802dfff2..0a0116732 100644 --- a/crmeb/app/adminapi/route/user.php +++ b/crmeb/app/adminapi/route/user.php @@ -145,6 +145,6 @@ Route::group('user', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/adminapi/route/widget.php b/crmeb/app/adminapi/route/widget.php index 7e1fdbd5e..7bf1455cd 100644 --- a/crmeb/app/adminapi/route/widget.php +++ b/crmeb/app/adminapi/route/widget.php @@ -18,6 +18,6 @@ Route::group('widget', function () { })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, - \app\adminapi\middleware\AdminCkeckRoleMiddleware::class, + \app\adminapi\middleware\AdminCheckRoleMiddleware::class, \app\adminapi\middleware\AdminLogMiddleware::class ]); diff --git a/crmeb/app/services/system/admin/SystemRoleServices.php b/crmeb/app/services/system/admin/SystemRoleServices.php index eb39161f4..aa8a26cb4 100644 --- a/crmeb/app/services/system/admin/SystemRoleServices.php +++ b/crmeb/app/services/system/admin/SystemRoleServices.php @@ -90,41 +90,40 @@ class SystemRoleServices extends BaseServices /** * 后台验证权限 * @param Request $request + * @return bool|void + * @throws \throwable */ - public function verifiAuth(Request $request) + public function verifyAuth(Request $request) { - + // 获取当前的接口于接口类型 $rule = trim(strtolower($request->rule()->getRule())); $method = trim(strtolower($request->method())); + + // 判断接口是一下两种的时候放行 if (in_array($rule, ['setting/admin/logout', 'menuslist'])) { return true; } - //权限菜单未添加时返回true + // 获取所有接口类型以及对应的接口 $allAuth = Cache::remember('all_auth', function () { /** @var SystemMenusServices $menusService */ $menusService = app()->make(SystemMenusServices::class); - return $menusService->getColumn([['api_url', '<>', ''], ['auth_type', '=', 2]], 'api_url,methods'); + $allList = $menusService->getColumn([['api_url', '<>', ''], ['auth_type', '=', 2]], 'api_url,methods'); + $allAuth = []; + foreach ($allList as $item) { + $allAuth[trim(strtolower($item['methods']))][] = trim(strtolower(str_replace(' ', '', $item['api_url']))); + } + return $allAuth; }); - if (!in_array($rule, array_map(function ($item) { - return trim(strtolower(str_replace(' ', '', $item))); - }, array_column($allAuth, 'api_url')))) { - return true; - } - //菜单按钮能看到的情况下所有接口都能访问 + // 权限菜单未添加时放行 + if (!in_array($rule, $allAuth[$method])) return true; + + // 获取管理员的接口权限列表，存在时放行 $auth = $this->getRolesByAuth($request->adminInfo()['roles'], 2); - //验证访问接口是否存在 - if (!in_array($rule, array_map(function ($item) { - return trim(strtolower(str_replace(' ', '', $item))); - }, array_column($auth, 'api_url')))) { + if (in_array($rule, $auth[$method])) { return true; - } - //验证访问接口是否有权限 - if (empty(array_filter($auth, function ($item) use ($rule, $method) { - if (trim(strtolower($item['api_url'])) === $rule && $method === trim(strtolower($item['methods']))) - return true; - }))) { + } else { throw new AuthException(110000); } } @@ -144,7 +143,12 @@ class SystemRoleServices extends BaseServices return Cache::remember($cacheName, function () use ($rules, $type) { /** @var SystemMenusServices $menusService */ $menusService = app()->make(SystemMenusServices::class); - return $menusService->getColumn([['id', 'IN', $this->getRoleIds($rules)], ['auth_type', '=', $type]], 'api_url,methods'); + $authList = $menusService->getColumn([['id', 'IN', $this->getRoleIds($rules)], ['auth_type', '=', $type]], 'api_url,methods'); + $rolesAuth = []; + foreach ($authList as $item) { + $rolesAuth[trim(strtolower($item['methods']))][] = trim(strtolower(str_replace(' ', '', $item['api_url']))); + } + return $rolesAuth; }); } diff --git a/crmeb/app/services/user/LoginServices.php b/crmeb/app/services/user/LoginServices.php index bd4b0d567..4a96d0d83 100644 --- a/crmeb/app/services/user/LoginServices.php +++ b/crmeb/app/services/user/LoginServices.php @@ -246,6 +246,10 @@ class LoginServices extends BaseServices * 重置密码 * @param $account * @param $password + * @return bool + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function reset($account, $password) { @@ -263,15 +267,16 @@ class LoginServices extends BaseServices * 手机号登录 * @param $phone * @param $spread + * @param string $user_type * @return array * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function mobile($phone, $spread, $user_type = 'h5') + public function mobile($phone, $spread, string $user_type = 'h5') { //数据库查询 - $user = $this->dao->getOne(['phone' => $phone, 'is_del' => 0]); + $user = $this->dao->getOne(['account|phone' => $phone, 'is_del' => 0]); if (!$user) { $user = $this->register($phone, '123456', $spread, $user_type); if (!$user) { @@ -297,6 +302,10 @@ class LoginServices extends BaseServices * 切换登录 * @param $user * @param $from + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function switchAccount($user, $from) { @@ -329,12 +338,14 @@ class LoginServices extends BaseServices /** * 绑定手机号(静默还没写入用户信息) - * @param $user * @param $phone - * @param $step - * @return mixed + * @param string $key + * @return array + * @throws \Psr\SimpleCache\InvalidArgumentException + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException */ - public function bindind_phone($phone, $key = '') + public function bindind_phone($phone, string $key = '') { if (!$key) { throw new ApiException(410037); @@ -361,10 +372,13 @@ class LoginServices extends BaseServices /** * 用户绑定手机号 - * @param $user + * @param int $uid * @param $phone * @param $step - * @return mixed + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function userBindindPhone(int $uid, $phone, $step) { @@ -393,10 +407,12 @@ class LoginServices extends BaseServices /** * 用户绑定手机号 - * @param $user + * @param int $uid * @param $phone - * @param $step - * @return mixed + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function updateBindindPhone(int $uid, $phone) { diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index 65a08fdea..14ec7af19 100644 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -33040,7 +33040,7 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (468, 125, '', '附加权限', 'admin', '', '', '', '', '[]', 0, 0, 0, 1, '/admin*', '', 1, '', 0, '', 0), (469, 468, '', '添加配置字段表单', 'admin', '', '', 'setting/config/create', 'GET', '[]', 0, 0, 0, 1, '', '', 2, '', 0, '', 0), (470, 468, '', '保存配置字段', 'admin', '', '', 'setting/config', 'POST', '[]', 0, 0, 0, 1, '', '', 2, '', 0, '', 0), -(471, 468, '', '编辑配置字段表单', 'admin', '', '', 'setting/config//edit', '', '[]', 0, 0, 0, 1, '', '', 2, '', 0, '', 0), +(471, 468, '', '编辑配置字段表单', 'admin', '', '', 'setting/config//edit', 'GET', '[]', 0, 0, 0, 1, '', '', 2, '', 0, '', 0), (472, 468, '', '编辑配置分类', 'admin', '', '', 'setting/config/', 'PUT', '[]', 0, 0, 0, 1, '', '', 2, '', 0, '', 0), (473, 468, '', '删除配置', 'admin', '', '', 'setting/config/', 'DELETE', '[]', 0, 0, 0, 1, '', '', 2, '', 0, '', 0), (474, 468, '', '修改配置状态', 'admin', '', '', 'setting/config/set_status//', 'PUT', '[]', 0, 0, 0, 1, '', '', 2, '', 0, '', 0),