分离日志操作权限

catch/permissions/PermissionsMiddleware.php

@@ -7,7 +7,7 @@ use catcher\CatchCacheKeys;
 use catcher\Code;
 use catcher\exceptions\PermissionForbiddenException;
 use think\facade\Cache;
-use think\helper\Str;
+use catcher\Utils;
 
 class PermissionsMiddleware
 {
@@ -29,8 +29,9 @@ class PermissionsMiddleware
         if (!$rule) {
             return $next($request);
         }
+
         // 模块忽略
-        [$module, $controller, $action] = $this->parseRule($rule);
+        [$module, $controller, $action] = Utils::parseRule($rule);
         // toad
         if (in_array($module, $this->ignoreModule())) {
             return $next($request);
@@ -40,10 +41,6 @@ class PermissionsMiddleware
         if (!$user) {
             throw new PermissionForbiddenException('Login is invalid', Code::LOST_LOGIN);
         }
-        //dd($this->parseRule($rule));
-        $permission = $this->getPermission($module, $controller, $action);
-        // 记录操作
-        $this->operateEvent($request->user()->id, $permission);
         // 超级管理员
         if ($request->user()->id === config('catch.permissions.super_admin_id')) {
             return $next($request);
@@ -52,6 +49,9 @@ class PermissionsMiddleware
         if ($request->isGet() && config('catch.permissions.is_allow_get')) {
             return $next($request);
         }
+        // 判断权限
+        $permission = property_exists($request, 'permission') ? $request->permission :
+                        $this->getPermission($module, $controller, $action);
 
         if (!$permission || !in_array($permission->id, Cache::get(CatchCacheKeys::USER_PERMISSIONS . $user->id))) {
           throw new PermissionForbiddenException();
@@ -60,29 +60,6 @@ class PermissionsMiddleware
         return $next($request);
     }
 
-    /**
-     * 解析规则
-     *
-     * @time 2020年04月16日
-     * @param $rule
-     * @return array
-     */
-    protected function parseRule($rule)
-    {
-        [$controller, $action] = explode(Str::contains($rule, '@') ? '@' : '/', $rule);
-
-        $controller = explode('\\', $controller);
-
-        $controllerName = strtolower(array_pop($controller));
-
-        array_pop($controller);
-
-        $module = array_pop($controller);
-
-        return [$module, $controllerName, $action];
-    }
-
-
     /**
      *
      * @time 2019年12月14日