变更

2023-04-19 22:13:21 +08:00
parent e531241e2f
commit e892f0f35d
2 changed files with 3 additions and 3 deletions
@@ -130,7 +130,6 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
 			}
 		}
 		$hashMap->put('handler', $handler);
-
 		$this->registerMiddleware($handler->getClass(), $handler->getMethod());
 	}

@@ -144,7 +143,8 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
 	 */
 	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) {
 			$manager = Kiri::getDi()->get(Middleware::class);
 			foreach ($middlewares as $middleware) {