From b55dd8f67a9f3f46867ec854c0d6c13b4e52fa3a Mon Sep 17 00:00:00 2001 From: wolfcode <37436228+wolf-leo@users.noreply.github.com> Date: Fri, 14 Feb 2025 11:36:07 +0800 Subject: [PATCH] feat(auth): add support for ignoring node authentication via annotation - Add checkNodeAnnotationAttrAuth method to AuthService for annotation-based auth control - Update checkAuth method to use the new annotation check-Modify Goods controller to use NodeAnnotation for specifying auth requirements - Remove unused library imports in config-admin.js --- app/admin/controller/mall/Goods.php | 2 +- app/common/service/AuthService.php | 66 +++++++++++++++++++---------- public/static/config-admin.js | 2 - 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/app/admin/controller/mall/Goods.php b/app/admin/controller/mall/Goods.php index 078f75d..4fc31f4 100644 --- a/app/admin/controller/mall/Goods.php +++ b/app/admin/controller/mall/Goods.php @@ -45,7 +45,7 @@ class Goods extends AdminController return $this->fetch(); } - #[NodeAnnotation(title: '入库', auth: true)] + #[NodeAnnotation(title: '入库', auth: false)] public function stock(Request $request, $id): string { $row = $this->model->find($id); diff --git a/app/common/service/AuthService.php b/app/common/service/AuthService.php index 9e2e36e..18130a9 100644 --- a/app/common/service/AuthService.php +++ b/app/common/service/AuthService.php @@ -2,6 +2,7 @@ namespace app\common\service; +use app\admin\service\annotation\NodeAnnotation; use app\common\constants\AdminConstant; use think\facade\Db; @@ -52,7 +53,7 @@ class AuthService /*** * 构造方法 * AuthService constructor. - * @param null $adminId + * @param null $adminId * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException @@ -68,7 +69,7 @@ class AuthService /** * 检测检测权限 - * @param null $node + * @param null $node * @return bool * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException @@ -87,7 +88,7 @@ class AuthService // 判断是否需要获取当前节点 if (empty($node)) { $node = $this->getCurrentNode(); - } else { + }else { $node = $this->parseNodeStr($node); } // 判断是否加入节点控制，优先获取缓存信息 @@ -106,9 +107,30 @@ class AuthService if (in_array($node, $this->adminNode)) { return true; } + if ($this->checkNodeAnnotationAttrAuth($node)) return true; return false; } + protected function checkNodeAnnotationAttrAuth(string $node): bool + { + $bool = false; + $controller = request()->controller(); + try { + $controllerExplode = explode('.', $controller); + [$_name, $_controller] = $controllerExplode; + $nodeExplode = explode('/', $node); + $action = end($nodeExplode); + $reflectionClass = new \ReflectionClass("app\admin\controller\\{$_name}\\{$_controller}"); + $attributes = $reflectionClass->getMethod($action)->getAttributes(NodeAnnotation::class); + foreach ($attributes as $attribute) { + $annotation = $attribute->newInstance(); + $bool = $annotation->auth === false; + } + }catch (\Throwable) { + } + return $bool; + } + /** * 获取当前节点 * @return string @@ -130,25 +152,25 @@ class AuthService { $nodeList = []; $adminInfo = Db::name($this->config['system_admin']) - ->where([ - 'id' => $this->adminId, - 'status' => 1, - ])->find(); + ->where([ + 'id' => $this->adminId, + 'status' => 1, + ])->find(); if (!empty($adminInfo) && !empty($adminInfo['auth_ids'])) { $buildAuthSql = Db::name($this->config['system_auth']) - ->distinct(true) - ->whereIn('id', $adminInfo['auth_ids']) - ->field('id') - ->buildSql(true); + ->distinct(true) + ->whereIn('id', $adminInfo['auth_ids']) + ->field('id') + ->buildSql(true); $buildAuthNodeSql = Db::name($this->config['system_auth_node']) - ->distinct(true) - ->where("auth_id IN {$buildAuthSql}") - ->field('node_id') - ->buildSql(true); + ->distinct(true) + ->where("auth_id IN {$buildAuthSql}") + ->field('node_id') + ->buildSql(true); $nodeList = Db::name($this->config['system_node']) - ->distinct(true) - ->where("id IN {$buildAuthNodeSql}") - ->column('node'); + ->distinct(true) + ->where("id IN {$buildAuthNodeSql}") + ->column('node'); } return $nodeList; } @@ -162,7 +184,7 @@ class AuthService public function getNodeList() { return Db::name($this->config['system_node']) - ->column('id,node,title,type,is_auth', 'node'); + ->column('id,node,title,type,is_auth', 'node'); } /** @@ -177,13 +199,13 @@ class AuthService public function getAdminInfo() { return Db::name($this->config['system_admin']) - ->where('id', $this->adminId) - ->find(); + ->where('id', $this->adminId) + ->find(); } /** * 驼峰转下划线规则 - * @param string $node + * @param string $node * @return string */ public function parseNodeStr($node) diff --git a/public/static/config-admin.js b/public/static/config-admin.js index 21e3ab9..de36e12 100644 --- a/public/static/config-admin.js +++ b/public/static/config-admin.js @@ -5,11 +5,9 @@ require.config({ baseUrl: BASE_URL, paths: { "jquery": ["plugs/jquery-3.4.1/jquery-3.4.1.min"], - "jquery-particleground": ["plugs/jq-module/jquery.particleground.min"], "echarts": ["plugs/echarts/echarts.min"], "echarts-theme": ["plugs/echarts/echarts-theme"], "easy-admin": ["plugs/easy-admin/easy-admin"], - "layuiall": ["plugs/layui-v2.x/layui.all"], "layui": ["plugs/layui-v2.x/layui"], "miniAdmin": ["plugs/lay-module/layuimini/miniAdmin"], "miniMenu": ["plugs/lay-module/layuimini/miniMenu"],