From bf98751ed528735cc919f78ae623709296776e05 Mon Sep 17 00:00:00 2001 From: wuyanwen Date: Tue, 18 Feb 2020 14:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=B7=AF=E7=94=B1=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E4=BB=B6=E5=8F=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/catch.php | 11 +++++++++-- extend/catcher/event/LoadModuleRoutes.php | 6 ++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/config/catch.php b/config/catch.php index 31c2fd6..f96a6d5 100644 --- a/config/catch.php +++ b/config/catch.php @@ -62,6 +62,13 @@ return [ 'upload' => [ 'image' => 'filesize:' . 1024 * 5 . '|fileExt:jpg,png,gif,jpeg', 'file' => 'filesize:' . 1024 * 10 . '|fileExt:txt,pdf,xlsx,xls,html' - ] - + ], + /** + * 路由中间件 + * + */ + 'route_middleware' => [ + \catchAdmin\user\AuthTokenMiddleware::class, + \catchAdmin\permissions\PermissionsMiddleware::class, + ], ]; diff --git a/extend/catcher/event/LoadModuleRoutes.php b/extend/catcher/event/LoadModuleRoutes.php index 12b8618..42d87b2 100644 --- a/extend/catcher/event/LoadModuleRoutes.php +++ b/extend/catcher/event/LoadModuleRoutes.php @@ -24,18 +24,20 @@ class LoadModuleRoutes $routes = CatchAdmin::getRoutes(); + $routeMiddleware = config('catch.route_middleware'); + if ($domain) { $router->domain($domain, function () use ($router, $routes) { foreach ($routes as $route) { include $route; } - })->middleware([AuthTokenMiddleware::class, PermissionsMiddleware::class]); + })->middleware($routeMiddleware); } else { $router->group(function () use ($router, $routes) { foreach ($routes as $route) { include $route; } - })->middleware([AuthTokenMiddleware::class, PermissionsMiddleware::class]); + })->middleware($routeMiddleware); } // 单独加载登录