This commit is contained in:
2021-04-27 17:10:32 +08:00
parent 97788168f9
commit c93bb59cc3
+6 -7
View File
@@ -482,14 +482,14 @@ class Router extends HttpService implements RouterInterface
*/ */
public function dispatch(): mixed public function dispatch(): mixed
{ {
if (!($node = $this->find_path(\request()))) { if (!($node = $this->Branch_search(\request()))) {
return send(self::NOT_FOUND); return send(self::NOT_FOUND);
} }
send(($response = $node->dispatch()), 200); return send(($response = $node->dispatch()), 200);
if (!$node->hasAfter()) { // if (!$node->hasAfter()) {
return null; // return null;
} // }
return $node->afterDispatch($response); // return $node->afterDispatch($response);
} }
@@ -511,7 +511,6 @@ class Router extends HttpService implements RouterInterface
*/ */
public function find_path(Request $request): ?Node public function find_path(Request $request): ?Node
{ {
return $this->Branch_search($request);
$method = $request->getMethod(); $method = $request->getMethod();
$uri = $request->headers->get('request_uri', '/'); $uri = $request->headers->get('request_uri', '/');