diff --git a/catch/permissions/PermissionsMiddleware.php b/catch/permissions/PermissionsMiddleware.php index 5a32889..8a15cf9 100644 --- a/catch/permissions/PermissionsMiddleware.php +++ b/catch/permissions/PermissionsMiddleware.php @@ -24,23 +24,17 @@ class PermissionsMiddleware */ public function handle(Request $request, \Closure $next) { - // Get 请求 - if ($request->isGet() && config('catch.permissions.is_allow_get')) { - return $next($request); - } - $rule = $request->rule()->getName(); if (!$rule) { return $next($request); } - + // 模块忽略 [$module, $controller, $action] = $this->parseRule($rule); - if (in_array($module, $this->ignoreModule())) { return $next($request); } - + // 用户未登录 $user = $request->user(); if (!$user) { throw new PermissionForbiddenException('Login is invalid', Code::LOST_LOGIN); @@ -49,6 +43,10 @@ class PermissionsMiddleware if ($request->user()->id === config('catch.permissions.super_admin_id')) { return $next($request); } + // Get 请求 + if ($request->isGet() && config('catch.permissions.is_allow_get')) { + return $next($request); + } // toad $permission = $this->getPermission($module, $controller, $action); if (!$permission || !in_array($permission->id, Cache::get(CatchCacheKeys::USER_PERMISSIONS . $user->id))) {