diff --git a/app/admin/controller/AuthController.php b/app/admin/controller/AuthController.php index ad45992..6bf63d0 100644 --- a/app/admin/controller/AuthController.php +++ b/app/admin/controller/AuthController.php @@ -95,7 +95,7 @@ abstract class AuthController extends SystemBasic $this->module = App::getInstance()->http->getName(); $this->controller = un_camelize($this->request->controller()); $this->action = $this->request->action(); - $this->auth = explode(",", AdminRole::getAuth($this->adminInfo['role_id'] ?? 0)); + $this->auth = explode(",", $this->adminInfo['role_auth']??''); $this->nowAuthId = AdminAuth::getAuthId($this->module,$this->controller,$this->action); $this->model = $this->buildModel($this->module,$this->request->controller()); // 鉴权 @@ -117,7 +117,7 @@ abstract class AuthController extends SystemBasic if (!self::isActive()) exit($this->failedNotice(lang("未登录"),"/admin/login/login")); // 权限验证 if ($this->nowAuthId == -1 || in_array($this->nowAuthId,$this->auth)) return true; - exit($this->failed(lang('没有权限!'))); + exit($this->failed(lang('没有权限访问!'))); } /** diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 96544b8..debefe0 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -11,9 +11,6 @@ class Index extends AuthController { // 无需登录的 protected $noNeedLogin = ['test','accessauth','pddlogin']; - // 无需权限的 - protected $noNeedRight = ['']; - /** * 后台首页 * @return string @@ -22,8 +19,12 @@ class Index extends AuthController public function index() { $this->assign("adminInfo",$this->adminInfo); - $this->assign("menu",AdminAuth::getMenu(0,$this->auth)); - $this->assign("message",AdminNotify::pageList(5)); + $menuList = cache(AdminAuth::getMenuCacheKey($this->adminId)); + if($menuList === null){ + $menuList = AdminAuth::getMenu(0,$this->auth); + cache(AdminAuth::getMenuCacheKey($this->adminId),$menuList,1*60*60); + } + $this->assign("menu",$menuList); return $this->fetch(); } @@ -45,6 +46,11 @@ class Index extends AuthController */ public function menu() { - return app("json")->success(AdminAuth::getMenu(0,$this->auth)); + $menuList = cache(AdminAuth::getMenuCacheKey($this->adminId)); + if($menuList === null){ + $menuList = AdminAuth::getMenu(0,$this->auth); + cache(AdminAuth::getMenuCacheKey($this->adminId),$menuList,1*60*60); + } + return app("json")->success($menuList); } } \ No newline at end of file diff --git a/public/template/default/pc/index/index.html b/public/template/default/pc/index/index.html index 79f1775..825fd8d 100644 --- a/public/template/default/pc/index/index.html +++ b/public/template/default/pc/index/index.html @@ -81,7 +81,7 @@