From 50d3420043d192ef4d31acadae2ea48859ebf6cb Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 30 Sep 2020 10:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Index.php | 11 ++++++----- app/admin/controller/Login.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 5a0fc0ac3..7902bd098 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -36,13 +36,14 @@ class Index extends Controller */ public function index() { - if ($this->app->isDebug()) { - AdminService::instance()->apply(true); - } else { - AdminService::instance()->apply(false); - } + /*! 根据运行模式刷新权限 */ + $clear = $this->app->isDebug(); + AdminService::instance()->apply($clear); + /*! 读取当前权限菜单树 */ $this->menus = MenuService::instance()->getTree(); + /*! 判断用户是否已经登录 */ $this->login = AdminService::instance()->isLogin(); + /*! 菜单为空并且未登录跳转到登录页 */ if (empty($this->menus) && empty($this->login)) { $this->redirect(sysuri('admin/login/index')); } else { diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php index 7bc599b52..fa88f3e9f 100644 --- a/app/admin/controller/Login.php +++ b/app/admin/controller/Login.php @@ -62,7 +62,7 @@ class Login extends Controller if (!CaptchaService::instance()->check($data['verify'], $data['uniqid'])) { $this->error('图形验证码验证失败,请重新输入!'); } - // 用户信息验证 + /*! 用户信息验证 */ $map = ['username' => $data['username'], 'is_deleted' => '0']; $user = $this->app->db->name('SystemUser')->where($map)->order('id desc')->find(); if (empty($user)) {