From 8dfa7bbd0434268cdb071edf49be20a33f4eaff0 Mon Sep 17 00:00:00 2001
From: 1099438829 <1099438829@qq.com>
Date: Sun, 13 Jun 2021 22:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=90=8E=E5=8F=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Index.php  |  2 ++
 app/admin/model/Admin.php       |  3 +++
 app/admin/model/AdminAuth.php   | 11 +++++++++++
 app/admin/view/index/index.html |  8 ++++----
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index debefe0..f65e15a 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -25,6 +25,8 @@ class Index extends AuthController
             cache(AdminAuth::getMenuCacheKey($this->adminId),$menuList,1*60*60);
         }
         $this->assign("menu",$menuList);
+        $message = ['data'=>[],'count'=>0];
+        $this->assign("message",$message);
         return $this->fetch();
     }
 
diff --git a/app/admin/model/Admin.php b/app/admin/model/Admin.php
index 3e20f45..2ce3fdd 100644
--- a/app/admin/model/Admin.php
+++ b/app/admin/model/Admin.php
@@ -61,6 +61,8 @@ class Admin extends BaseModel
      */
     public static function setLoginInfo($info)
     {
+        unset($info->pwd);//去除密码字段
+        $info->role_auth = AdminRole::getAuth($info['role_id'] ?? 0);//提前缓存auth字段避免频繁查询
         Session::set("adminId",$info['id']);
         Session::set("adminInfo",$info->toArray());
         event("AdminLog",[$info->toArray(),"admin","login","login"]);
@@ -132,6 +134,7 @@ class Admin extends BaseModel
         $model = $model->where("id",$id);
         $model = $model->field($field);
         $info = $model->find();
+        unset($info->pwd);
         return $info ? $info->toArray() : [];
     }
 
diff --git a/app/admin/model/AdminAuth.php b/app/admin/model/AdminAuth.php
index 7067429..909eba4 100644
--- a/app/admin/model/AdminAuth.php
+++ b/app/admin/model/AdminAuth.php
@@ -52,6 +52,17 @@ class AdminAuth extends BaseModel
         return $data->toArray() ?: [];
     }
 
+    /**
+     * 获取菜单列表缓存key
+     * @param $adminId
+     * @return string
+     * @author 李玉坤
+     * @date 2021-06-09 17:24
+     */
+    public static function getMenuCacheKey($adminId){
+        return 'menu:List:'.$adminId;
+    }
+
     /**
      * 权限列表
      * @param $where
diff --git a/app/admin/view/index/index.html b/app/admin/view/index/index.html
index 4527b1b..be20c59 100644
--- a/app/admin/view/index/index.html
+++ b/app/admin/view/index/index.html
@@ -213,10 +213,10 @@
                         <!--切换主题配色-->
                         <!--消息-->
                         <li class="dropdown notifications-menu">
-              <span class="dropdown-toggle icon-notifications" data-toggle="dropdown">
-                <i class="mdi mdi-bell"></i>
-                <span class="label label-warning">{$message.count}</span>
-              </span>
+                            <span class="dropdown-toggle icon-notifications" data-toggle="dropdown">
+                                <i class="mdi mdi-bell"></i>
+                                <span class="label label-warning">{$message.count}</span>
+                            </span>
                             <ul class="dropdown-menu dropdown-menu-right">
                                 <li class="header">您有{$message.count}个未读消息</li>
                                 <li>