From 1ded86021ae5f42de01f5ccab6c11e0453f47d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Thu, 19 Aug 2021 11:00:04 +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

---
 Annotation/Route/Middleware.php  | 6 ++----
 Gii/GiiMiddleware.php            | 3 ++-
 System/Jwt/JWTAuthMiddleware.php | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Annotation/Route/Middleware.php b/Annotation/Route/Middleware.php
index 4fb0f86f..9068957e 100644
--- a/Annotation/Route/Middleware.php
+++ b/Annotation/Route/Middleware.php
@@ -7,9 +7,8 @@ namespace Annotation\Route;
 use Annotation\Attribute;
 use Http\Route\MiddlewareManager;
 use ReflectionException;
-use Kiri\Exception\NotFindClassException;
 use Kiri\Kiri;
-use Http\IInterface\MiddlewareInterface as IMiddleware;
+use Http\IInterface\MiddlewareInterface ;
 
 /**
  * Class Middleware
@@ -33,7 +32,7 @@ use Http\IInterface\MiddlewareInterface as IMiddleware;
         $array = [];
         foreach ($this->middleware as $value) {
             $sn = di($value);
-            if (!($sn instanceof IMiddleware)) {
+            if (!($sn instanceof MiddlewareInterface)) {
                 continue;
             }
             $array[] = [$sn, 'onHandler'];
@@ -47,7 +46,6 @@ use Http\IInterface\MiddlewareInterface as IMiddleware;
 	 * @param mixed|null $method
 	 * @return $this
 	 * @throws ReflectionException
-	 * @throws NotFindClassException
 	 */
     public function execute(mixed $class, mixed $method = null): static
     {
diff --git a/Gii/GiiMiddleware.php b/Gii/GiiMiddleware.php
index 5c89381f..254750e5 100644
--- a/Gii/GiiMiddleware.php
+++ b/Gii/GiiMiddleware.php
@@ -35,6 +35,7 @@ namespace App\Http\Middleware;
 use Closure;
 use Http\Context\Request;
 use Http\IInterface\MiddlewareInterface;
+use Server\RequestInterface;
 
 ';
 
@@ -52,7 +53,7 @@ class ' . $managerName . 'Middleware implements Middleware
 	 * @param Closure $closure
 	 * @return mixed
 	 */
-	public function handler(Request $request, Closure $closure)
+	public function handler(RequestInterface $request, Closure $closure)
 	{
 		return $closure($request);
 	}
diff --git a/System/Jwt/JWTAuthMiddleware.php b/System/Jwt/JWTAuthMiddleware.php
index 32f73c74..12c7013b 100644
--- a/System/Jwt/JWTAuthMiddleware.php
+++ b/System/Jwt/JWTAuthMiddleware.php
@@ -8,7 +8,7 @@ namespace Kiri\Jwt;
 use Closure;
 use Exception;
 use Http\Context\Request;
-use Http\IInterface\MiddlewareInterface;
+use Http\Route\MiddlewareAbstracts;
 use Server\RequestInterface;
 use Kiri\Kiri;
 
@@ -17,7 +17,7 @@ use Kiri\Kiri;
  * @package Kiri\Kiri\Route
  * 跨域中间件
  */
-class JWTAuthMiddleware implements MiddlewareInterface
+class JWTAuthMiddleware extends MiddlewareAbstracts
 {