权限管理优化

Signed-off-by: vilson <545522390@qq.com>

application/common.php

@@ -49,7 +49,7 @@ function getCurrentMember()
 function setCurrentMember($data)
 {
 
-    $key = 'member:info:' . $data['code'];
+    $key = 'member:info:' . $data['code'];//Member 里的 code
     if (!$data) {
         Cache::rm($key);
     }else{

application/common/Model/Member.php

@@ -59,6 +59,7 @@ class Member extends CommonModel
         $member['authorize'] = $list[0]['authorize'];
         $member['position'] = $list[0]['position'];
         $member['department'] = $list[0]['department'];
+        $member['organization_code'] = $list[0]['organization_code'];
 
         setCurrentMember($member);
         !empty($member['authorize']) && NodeService::applyProjectAuthNode();

application/common/Model/MemberAccount.php

@@ -26,8 +26,7 @@ class MemberAccount extends CommonModel
     {
         NodeService::applyProjectAuthNode();
         $menuModel = new ProjectMenu();
-        $list = $menuModel->listForUser($isTree);
+        return $menuModel->listForUser($isTree);
-        return $list;
     }
 
     /**

application/project/controller/Auth.php

@@ -81,6 +81,7 @@ class Auth extends BasicApi
      */
     protected function _apply_save($auth)
     {
+        //todo 优化
         list($data, $post) = [[], Request::only('action,id,nodes')];
         isset($post['nodes']) && $post['nodes'] = json_decode($post['nodes']);
         foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) {
@@ -88,6 +89,7 @@ class Auth extends BasicApi
         }
         ProjectAuthNode::where(['auth' => $auth])->delete();
         ProjectAuthNode::insertAll($data);
+        NodeService::clearMemberNodes(getCurrentOrganizationCode());
         $this->success('节点授权更新成功！', '');
     }
 

application/project/controller/Index.php

@@ -77,6 +77,7 @@ class Index extends BasicApi
             $member['account_id'] = $memberAccount['id'];
             $member['is_owner'] = $memberAccount['is_owner'];
             $member['authorize'] = $memberAccount['authorize'];
+            $member['organization_code'] = $memberAccount['organization_code'];
             setCurrentMember($member);
             !empty($member['authorize']) && NodeService::applyProjectAuthNode();
             setCurrentOrganizationCode($organizationCode);

application/project/controller/Project.php

@@ -44,7 +44,7 @@ class Project extends BasicApi
      * @return void
      * @throws DbException
      */
-    public function index11()
+   /* public function index11()
     {
         $prefix = config('database.prefix');
         $type = Request::post('type');
@@ -94,7 +94,7 @@ class Project extends BasicApi
             }
         }
         $this->success('', ['list' => $newList, 'total' => $list['total']]);
-    }
+    }*/
 
     public function index()
     {

application/project/middleware/Auth.php

@@ -68,6 +68,8 @@ class Auth
             }
         }
         // 访问权限检查
+//        var_dump(auth($node, 'project'));
+//        die;
         if (!empty($access['is_auth']) && !auth($node, 'project')) {
             $nodeInfo = ProjectNode::where('node', $node)->find();
             return json(['code' => 403, 'msg' => '无权限操作资源['. $nodeInfo['title'] . ']，访问被拒绝']);

extend/service/NodeService.php

@@ -3,7 +3,9 @@
 
 namespace service;
 
+use app\common\Model\MemberAccount;
 use think\Db;
+use think\facade\Cache;
 
 /**
  * 系统权限节点读取器
@@ -19,23 +21,54 @@ class NodeService
      */
     public static function applyProjectAuthNode()
     {
-        cache('member_need_access_node', null);
+//        cache('member_need_access_node', null);
         $member = getCurrentMember();
-        $member['nodes'] = [];
+//        $member['nodes'] = [];
-        if (($authorize = $member['authorize'])) {
+//        if (($authorize = $member['authorize'])) {
-            $where = ['status' => '1'];
+//            $where = ['status' => '1'];
-            $authorizeIds = Db::name('ProjectAuth')->whereIn('id', explode(',', $authorize))->where($where)->column('id');
+//            $authorizeIds = Db::name('ProjectAuth')->whereIn('id', explode(',', $authorize))->where($where)->column('id');
-            if (empty($authorizeIds)) {
+//            if (empty($authorizeIds)) {
-                $member['nodes'] = [];
+//                $member['nodes'] = [];
-                return setCurrentMember($member);
+//                return setCurrentMember($member);
-            }
+//            }
-            $nodes = Db::name('ProjectAuthNode')->whereIn('auth', $authorizeIds)->column('node');
+//            $nodes = Db::name('ProjectAuthNode')->whereIn('auth', $authorizeIds)->column('node');
-            $member['nodes'] = $nodes;
+//            $member['nodes'] = $nodes;
-            return setCurrentMember($member);
+//            return setCurrentMember($member);
-        }
+//        }
-        return setCurrentMember($member);
+//        return setCurrentMember($member);
+        $nodes = self::getMemberNodes($member['organization_code'], $member['account_id']);
+        $member['nodes'] = $nodes;
+        setCurrentMember($member);
+        return $nodes;
     }
 
+    public static function getMemberNodes($orgCode, $memberAccountId)
+    {
+        $cacheKey = 'member:nodes:' . $memberAccountId;
+        $tagKey = 'member:codes:' . $orgCode;
+//        self::clearMemberNodes($orgCode);
+        $nodes = Cache::tag($tagKey)->get($cacheKey);
+        if (!$nodes) {
+            $member = MemberAccount::get($memberAccountId);
+            $authorize = $member['authorize'];
+            $authorizeIds = Db::name('ProjectAuth')->whereIn('id', explode(',', $authorize))->where(['status' => '1'])->column('id');
+            if (empty($authorizeIds)) {
+                $nodes = [];
+            } else {
+                $nodes = Db::name('ProjectAuthNode')->whereIn('auth', $authorizeIds)->column('node');
+            }
+            Cache::tag($tagKey)->set($cacheKey, $nodes, 3600 * 24 * 7);
+        }
+        return $nodes;
+    }
+
+    public static function clearMemberNodes($orgCode)
+    {
+        $tagKey = 'member:codes:' . $orgCode;
+        return Cache::clear($tagKey);
+    }
+
+
     /**
      * 获取项目账号授权节点
      * @return array
@@ -50,6 +83,7 @@ class NodeService
         return $nodes;
     }
 
+
     /**
      * 检查账号节点权限
      * @param string $node 节点
@@ -69,7 +103,8 @@ class NodeService
             if (!in_array($currentNode, self::getProjectAuthNode())) {
                 return true;
             }
-            return in_array($currentNode, !empty($member['nodes']) ? (array)$member['nodes'] : []);
+            $memberNodes = self::getMemberNodes($member['organization_code'], $member['account_id']);
+            return in_array($currentNode, !empty($memberNodes) ? (array)$memberNodes : $memberNodes);
         }
         return false;
     }