0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

架构调整路由加载

Browse Source
This commit is contained in:
JaguarJack 2020-06-24 09:11:08 +08:00
parent 2d95212973
commit 2c18af0aa7
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
extend/catcher/event/LoadModuleRoutes.php
View File

@ -6,6 +6,7 @@ namespace catcher\event;
use catchAdmin\permissions\PermissionsMiddleware; use catchAdmin\permissions\PermissionsMiddleware;
use catchAdmin\user\AuthTokenMiddleware; use catchAdmin\user\AuthTokenMiddleware;
use catcher\CatchAdmin; use catcher\CatchAdmin;
use think\App;
use think\Route; use think\Route;
class LoadModuleRoutes class LoadModuleRoutes
@ -19,28 +20,21 @@ class LoadModuleRoutes
public function handle(): void public function handle(): void
{ {
$router = app(Route::class); $router = app(Route::class);
$domain = config('catch.domain'); $domain = config('catch.domain');
$paths = app(App::class)->make('routePath')->get();
$routes = CatchAdmin::getRoutes(); // $routeMiddleware = config('catch.route_middleware');
$routeMiddleware = config('catch.route_middleware');
if ($domain) { if ($domain) {
$router->domain($domain, function () use ($router, $routes) { $router->domain($domain, function () use ($router, $paths) {
foreach ($routes as $route) { foreach ($paths as $path) {
include $route; include $path;
} }
})->middleware($routeMiddleware); });
} else { } else {
$router->group(function () use ($router, $routes) { $router->group(function () use ($router, $paths) {
foreach ($routes as $route) { foreach ($paths as $path) {
include $route; include $path;
}
});
} }
})->middleware($routeMiddleware);
}
// 单独加载登录
include CatchAdmin::moduleDirectory('login') . 'route.php';
} }
} }