From d3e0c64b585df0d3110a4dd1d80087583ccb9704 Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Sat, 14 Dec 2019 17:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catchAdmin/permissions/PermissionsMiddleware.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/catchAdmin/permissions/PermissionsMiddleware.php b/catchAdmin/permissions/PermissionsMiddleware.php
index 7945647..bb55ef0 100644
--- a/catchAdmin/permissions/PermissionsMiddleware.php
+++ b/catchAdmin/permissions/PermissionsMiddleware.php
@@ -3,7 +3,6 @@ namespace catchAdmin\permissions;
 
 use app\Request;
 use catchAdmin\permissions\model\Permissions;
-use catcher\CatchAdmin;
 use catcher\exceptions\PermissionForbiddenException;
 use think\helper\Str;
 
@@ -22,6 +21,10 @@ class PermissionsMiddleware
      */
     public function handle(Request $request, \Closure $next)
     {
+        if (!$request->user()) {
+            throw new PermissionForbiddenException('Login is invalid', 10006);
+        }
+
        // toad
         if (($permission = $this->getPermission($request))
             && !in_array($permission->id, $request->user()->getPermissionsBy())) {
@@ -54,11 +57,6 @@ class PermissionsMiddleware
         array_pop($controller);
 
         $module = array_pop($controller);
-        if ($module != 'login') {
-            if (!$request->user()) {
-                throw new PermissionForbiddenException('Login is invalid', 10006);
-            }
-        }
         $permissionMark = sprintf('%s:%s', $controllerName, $action);
         $permission = Permissions::where('module', $module)->where('permission_mark', $permissionMark)->find();