From ff3b50f61a6f4982afc0bab8eda32529c22e5e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 8 Sep 2020 12:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HttpServer/Events/OnRequest.php | 9 +-------- HttpServer/Route/Router.php | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/HttpServer/Events/OnRequest.php b/HttpServer/Events/OnRequest.php index 7c1f578a..7b7d3e19 100644 --- a/HttpServer/Events/OnRequest.php +++ b/HttpServer/Events/OnRequest.php @@ -40,14 +40,7 @@ class OnRequest extends Callback if ($sRequest->is('favicon.ico')) { return $sResponse->send($sRequest->isNotFound(), 200); } - $node = Snowflake::app()->router->dispatch(); - if (!($node instanceof Node)) { - return $sResponse->send($node, 200); - } - $sResponse->send($content = $node->dispatch(), 200); - if ($node->hasAfter()) { - $node->afterDispatch($content); - } + $sResponse->send(Snowflake::app()->router->dispatch(), 200); } catch (Error | \Throwable $exception) { $this->sendErrorMessage($sResponse ?? null, $exception, $response); } finally { diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php index f4f8ba7b..09b05791 100644 --- a/HttpServer/Route/Router.php +++ b/HttpServer/Route/Router.php @@ -420,7 +420,7 @@ class Router extends Application implements RouterInterface if (empty($node->callback)) { return JSON::to(404, 'Page not found.'); } - return $node; + return $node->dispatch(); }