This commit is contained in:
2023-04-19 22:13:21 +08:00
parent e531241e2f
commit e892f0f35d
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -130,7 +130,6 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
} }
} }
$hashMap->put('handler', $handler); $hashMap->put('handler', $handler);
$this->registerMiddleware($handler->getClass(), $handler->getMethod()); $this->registerMiddleware($handler->getClass(), $handler->getMethod());
} }
@@ -144,7 +143,8 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
*/ */
public function registerMiddleware(string $class, string $method): void public function registerMiddleware(string $class, string $method): void
{ {
$middlewares = array_column($this->groupTack, 'middleware'); $middlewares = Kiri::service()->get('request')->middlewares;
$middlewares = [...$middlewares, ...array_column($this->groupTack, 'middleware')];
if (count($middlewares) > 0) { if (count($middlewares) > 0) {
$manager = Kiri::getDi()->get(Middleware::class); $manager = Kiri::getDi()->get(Middleware::class);
foreach ($middlewares as $middleware) { foreach ($middlewares as $middleware) {
+1 -1
View File
@@ -91,7 +91,7 @@ class Server implements OnRequestInterface
$request_uri = $request->getMethod() == 'OPTIONS' ? '/*' : $request->server['request_uri']; $request_uri = $request->getMethod() == 'OPTIONS' ? '/*' : $request->server['request_uri'];
$dispatcher = $this->router->query($request_uri, $request->getMethod()); $dispatcher = $this->router->query($request_uri, $request->getMethod());
$middleware = $this->request->middlewares; $middleware = [];
if (!($dispatcher instanceof Kiri\Router\Base\NotFoundController)) { if (!($dispatcher instanceof Kiri\Router\Base\NotFoundController)) {
$middlewareManager = \Kiri::getDi()->get(MiddlewareManager::class); $middlewareManager = \Kiri::getDi()->get(MiddlewareManager::class);