From 5e9df58276ab8f2743384ccb0670d380219a5622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Tue, 8 Jun 2021 13:50:05 +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 |  4 ++--
 HttpServer/Route/Router.php     | 20 --------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/HttpServer/Events/OnRequest.php b/HttpServer/Events/OnRequest.php
index b3f17c10..4934ccb7 100644
--- a/HttpServer/Events/OnRequest.php
+++ b/HttpServer/Events/OnRequest.php
@@ -50,7 +50,7 @@ class OnRequest extends Callback
 	public function onHandler(Request $request, Response $response): mixed
 	{
 		try {
-            defer(fn() => fire(Event::SYSTEM_RESOURCE_RELEASES));
+			defer(fn() => fire(Event::SYSTEM_RESOURCE_RELEASES));
 
 			/** @var HResponse $response */
 			[$request, $response] = OnRequest::createContext($request, $response);
@@ -102,7 +102,7 @@ class OnRequest extends Callback
 		if (!($exception instanceof ExitException)) {
 			return $sResponse->send(\logger()->exception($exception), 200);
 		} else {
-			return $sResponse->send($exception->getMessage(), 200);
+			return $sResponse->send($exception->getMessage(), $exception?->getCode() ?? 200);
 		}
 	}
 
diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php
index 64811ec1..d184fa15 100644
--- a/HttpServer/Route/Router.php
+++ b/HttpServer/Route/Router.php
@@ -503,26 +503,6 @@ class Router extends HttpService implements RouterInterface
 	}
 
 
-	/**
-	 * @return string
-	 * @throws Exception
-	 */
-	private function notFundCore(): string
-	{
-		/** @var Response $response */
-		$response = \response();
-
-		/** @var Request $request */
-		$request = Context::getContext('request');
-
-		$response->addHeader('Access-Control-Allow-Origin', '*');
-		$response->addHeader('Access-Control-Allow-Headers', $request->headers->get('access-control-request-headers'));
-		$response->addHeader('Access-Control-Request-Method', $request->headers->get('access-control-request-method'));
-
-		return '[' . \request()->getMethod() . ':' . \request()->getUri() . ']' . self::NOT_FOUND;
-	}
-
-
 	/**
 	 * @param $exception
 	 * @return mixed