From 13cd95ad35afc8bb03119e3bad4ab7320fd37b43 Mon Sep 17 00:00:00 2001
From: xl <as2252258@163.com>
Date: Fri, 17 Nov 2023 09:43:39 +0800
Subject: [PATCH] eee

---
 src/Base/CoreMiddleware.php     | 35 +++++++++++++++++++--------------
 src/Base/NotFoundController.php |  4 ++--
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/Base/CoreMiddleware.php b/src/Base/CoreMiddleware.php
index d1a21e9..8c64f6c 100644
--- a/src/Base/CoreMiddleware.php
+++ b/src/Base/CoreMiddleware.php
@@ -4,7 +4,9 @@ declare(strict_types=1);
 namespace Kiri\Router\Base;
 
 use Exception;
+use Kiri\Di\Inject\Container;
 use Kiri\Router\Request;
+use Kiri\Router\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -18,20 +20,23 @@ class CoreMiddleware implements MiddlewareInterface
 {
 
 
-	/**
-	 * @param Request $request
-	 * @param RequestHandlerInterface $handler
-	 * @return ResponseInterface
-	 * @throws Exception
-	 */
-	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-	{
-		response()->withHeaders([
-			'Access-Control-Allow-Headers'  => '*',
-			'Access-Control-Request-Method' => '*',
-			'Access-Control-Allow-Origin'   => '*'
-		]);
-		return $handler->handle($request);
-	}
+    /**
+     * @var Response
+     */
+    #[Container(ResponseInterface::class)]
+    public ResponseInterface $response;
+
+
+    /**
+     * @param Request $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     * @throws Exception
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $this->response->withHeaders(['Access-Control-Allow-Headers' => '*', 'Access-Control-Request-Method' => '*', 'Access-Control-Allow-Origin' => '*']);
+        return $handler->handle($request);
+    }
 
 }
diff --git a/src/Base/NotFoundController.php b/src/Base/NotFoundController.php
index 38dec60..183f0f0 100644
--- a/src/Base/NotFoundController.php
+++ b/src/Base/NotFoundController.php
@@ -16,9 +16,9 @@ class NotFoundController extends Controller
     public function fail(): ResponseInterface
     {
         if ($this->request->getMethod() == 'OPTIONS') {
-            return \response()->withStatus(200, "empty content");
+            return $this->response->withStatus(200, "");
         } else {
-            return \response()->withStatus(404, "not found page.");
+            return $this->response->withStatus(404, "not found page.");
         }
     }