From 12ecfecf3e0f34f91f67c87c469be4be71253b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Sat, 18 Sep 2021 11:39:28 +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

---
 http-handler/Router.php              |  2 ++
 http-helper/Route/CoreMiddleware.php | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/http-handler/Router.php b/http-handler/Router.php
index 28e6af20..2c57ca55 100644
--- a/http-handler/Router.php
+++ b/http-handler/Router.php
@@ -17,6 +17,7 @@ class Router
 	 * @param string $route
 	 * @param string|Closure $closure
 	 * @param array $options
+	 * @throws \ReflectionException
 	 */
 	public function get(string $route, string|Closure $closure, array $options = [])
 	{
@@ -32,6 +33,7 @@ class Router
 	 * @param string $route
 	 * @param string|Closure $closure
 	 * @param array $options
+	 * @throws \ReflectionException
 	 */
 	public function post(string $route, string|Closure $closure, array $options = [])
 	{
diff --git a/http-helper/Route/CoreMiddleware.php b/http-helper/Route/CoreMiddleware.php
index 97cde717..f3eb0cf5 100644
--- a/http-helper/Route/CoreMiddleware.php
+++ b/http-helper/Route/CoreMiddleware.php
@@ -7,6 +7,11 @@ namespace Http\Route;
 
 use Closure;
 use Exception;
+use Http\Message\ServerRequest;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Server\Constrict\RequestInterface;
 
 /**
@@ -14,22 +19,22 @@ use Server\Constrict\RequestInterface;
  * @package Kiri\Kiri\Route
  * 跨域中间件
  */
-class CoreMiddleware extends MiddlewareAbstracts
+class CoreMiddleware implements MiddlewareInterface
 {
 
 
 	/**
-	 * @param RequestInterface $request
-	 * @param Closure $next
+	 * @param ServerRequest $request
+	 * @param RequestHandlerInterface $handler
 	 * @return mixed
 	 */
-	public function onHandler(RequestInterface $request, Closure $next): mixed
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
 	{
 		$response = \response();
 		$response->withAccessControlAllowOrigin('*')
 			->withAccessControlRequestMethod($request->getAccessControlRequestMethod())
 			->withAccessControlAllowHeaders($request->getAccessControlAllowHeaders());
-		return $next($request);
+		return $handler->handle($request);
 	}
 
 }