diff --git a/catch/CatchAdminService.php b/catch/CatchAdminService.php index 28b5c4b..9d86a0a 100644 --- a/catch/CatchAdminService.php +++ b/catch/CatchAdminService.php @@ -99,9 +99,7 @@ class CatchAdminService extends Service */ protected function registerMiddleWares(): void { - $this->app->middleware->import([ - 'catch_check_permission' => PermissionsMiddleware::class, - ], 'route'); + // todo } /** diff --git a/extend/catcher/CatchExceptionHandle.php b/extend/catcher/CatchExceptionHandle.php index c9f65d2..1feec71 100644 --- a/extend/catcher/CatchExceptionHandle.php +++ b/extend/catcher/CatchExceptionHandle.php @@ -1,61 +1,61 @@ -getMessage()); - } - - return parent::render($request, $e); - } -} \ No newline at end of file +getMessage()); + } + + return parent::render($request, $e); + } +} diff --git a/extend/catcher/event/LoadModuleRoutes.php b/extend/catcher/event/LoadModuleRoutes.php index 9904410..12b8618 100644 --- a/extend/catcher/event/LoadModuleRoutes.php +++ b/extend/catcher/event/LoadModuleRoutes.php @@ -3,6 +3,7 @@ declare (strict_types = 1); namespace catcher\event; +use catchAdmin\permissions\PermissionsMiddleware; use catchAdmin\user\AuthTokenMiddleware; use catcher\CatchAdmin; use think\Route; @@ -28,13 +29,13 @@ class LoadModuleRoutes foreach ($routes as $route) { include $route; } - })->middleware([AuthTokenMiddleware::class]); + })->middleware([AuthTokenMiddleware::class, PermissionsMiddleware::class]); } else { $router->group(function () use ($router, $routes) { foreach ($routes as $route) { include $route; } - })->middleware([AuthTokenMiddleware::class]); + })->middleware([AuthTokenMiddleware::class, PermissionsMiddleware::class]); } // 单独加载登录