fix: 修复redis密码 优化权限

app/admin/controller/Index.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 // +----------------------------------------------------------------------
 namespace app\admin\controller;
 
+use app\admin\enums\AdminNoticeEnum;
 use app\common\service\notice\EmailService;
 use app\common\service\utils\FtpService;
 use Psr\SimpleCache\InvalidArgumentException;
@@ -185,9 +186,25 @@ class Index extends AdminController
             UserThird::count('id'),
         ];
 
+
+        $workplace = [];
+        foreach (AdminNoticeEnum::COLLECTION as $item) {
+            $workplace[$item] = AdminNotice::where([
+                'admin_id' => get_admin_id(),
+                'type'     => $item
+            ])->count('id');
+        }
+
+        $todoList = AdminNotice::where([
+            'admin_id' => get_admin_id(),
+            'type'     => AdminNoticeEnum::TODO,
+            'status'   => 0
+        ])->count('id');
+
         return view('/index/console', [
             'assetsInfo'            => $assetsInfo,
-            'workplace'             => [],
+            'workplace'             => $workplace,
+            'todoList'              => $todoList,
             'devOpsData'            => json_encode($devOpsData, JSON_UNESCAPED_UNICODE),
             'searchWords'           => json_encode($searchWords, JSON_UNESCAPED_UNICODE),
             'userGroupData'         => json_encode($userGroupData, JSON_UNESCAPED_UNICODE),

app/admin/controller/system/AdminRules.php

@@ -15,7 +15,9 @@ use app\admin\service\AdminRuleService;
 use app\AdminController;
 use app\common\model\system\AdminRules as AdminRuleModel;
 use support\Response;
+use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 use Webman\Http\Request;
 
 /**
@@ -60,15 +62,29 @@ class AdminRules extends AdminController
                 return $this->success('添加菜单成功！');
             }
         }
-        return $this->error('添加菜单失败！');
+
+        $data = $this->getTableFields();
+        $data['pid'] = input('pid', 0);
+        $data['auth'] = 1;
+        $data['type'] = 1;
+        list($count, $list) = AdminRuleService::dataList(request()->all());
+        return view('/system/admin/rules_edit', [
+            'data' => $data,
+            'rules' => json_encode( list_to_tree($list), JSON_UNESCAPED_UNICODE),
+        ]);
 	}
 
-	/**
-	 * 编辑节点数据
+    /**
+     * 编辑节点数据
      * @return Response
-	 */
+     * @throws DbException
+     * @throws DataNotFoundException
+     * @throws ModelNotFoundException
+     */
 	public function edit(): Response
     {
+        $id = input('id', 0);
+        $data = $this->model->find($id);
         if (request()->isPost()) {
             $post = \request()->post();
             validate(\app\common\validate\system\AdminRules::class . '.edit')->check($post);
@@ -76,7 +92,12 @@ class AdminRules extends AdminController
                 return $this->success('更新菜单成功！');
             }
         }
-        return $this->error('更新菜单失败');
+
+        list($count, $list) = AdminRuleService::dataList(request()->all());
+        return view('/system/admin/rules_edit', [
+            'data'  => $data,
+            'rules' => json_encode( list_to_tree($list), JSON_UNESCAPED_UNICODE),
+        ]);
 	}
 
     /**