This commit is contained in:
2021-08-19 11:00:04 +08:00
parent 32d4d0f820
commit 1ded86021a
3 changed files with 6 additions and 7 deletions
+2 -4
View File
@@ -7,9 +7,8 @@ namespace Annotation\Route;
use Annotation\Attribute; use Annotation\Attribute;
use Http\Route\MiddlewareManager; use Http\Route\MiddlewareManager;
use ReflectionException; use ReflectionException;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri; use Kiri\Kiri;
use Http\IInterface\MiddlewareInterface as IMiddleware; use Http\IInterface\MiddlewareInterface ;
/** /**
* Class Middleware * Class Middleware
@@ -33,7 +32,7 @@ use Http\IInterface\MiddlewareInterface as IMiddleware;
$array = []; $array = [];
foreach ($this->middleware as $value) { foreach ($this->middleware as $value) {
$sn = di($value); $sn = di($value);
if (!($sn instanceof IMiddleware)) { if (!($sn instanceof MiddlewareInterface)) {
continue; continue;
} }
$array[] = [$sn, 'onHandler']; $array[] = [$sn, 'onHandler'];
@@ -47,7 +46,6 @@ use Http\IInterface\MiddlewareInterface as IMiddleware;
* @param mixed|null $method * @param mixed|null $method
* @return $this * @return $this
* @throws ReflectionException * @throws ReflectionException
* @throws NotFindClassException
*/ */
public function execute(mixed $class, mixed $method = null): static public function execute(mixed $class, mixed $method = null): static
{ {
+2 -1
View File
@@ -35,6 +35,7 @@ namespace App\Http\Middleware;
use Closure; use Closure;
use Http\Context\Request; use Http\Context\Request;
use Http\IInterface\MiddlewareInterface; use Http\IInterface\MiddlewareInterface;
use Server\RequestInterface;
'; ';
@@ -52,7 +53,7 @@ class ' . $managerName . 'Middleware implements Middleware
* @param Closure $closure * @param Closure $closure
* @return mixed * @return mixed
*/ */
public function handler(Request $request, Closure $closure) public function handler(RequestInterface $request, Closure $closure)
{ {
return $closure($request); return $closure($request);
} }
+2 -2
View File
@@ -8,7 +8,7 @@ namespace Kiri\Jwt;
use Closure; use Closure;
use Exception; use Exception;
use Http\Context\Request; use Http\Context\Request;
use Http\IInterface\MiddlewareInterface; use Http\Route\MiddlewareAbstracts;
use Server\RequestInterface; use Server\RequestInterface;
use Kiri\Kiri; use Kiri\Kiri;
@@ -17,7 +17,7 @@ use Kiri\Kiri;
* @package Kiri\Kiri\Route * @package Kiri\Kiri\Route
* 跨域中间件 * 跨域中间件
*/ */
class JWTAuthMiddleware implements MiddlewareInterface class JWTAuthMiddleware extends MiddlewareAbstracts
{ {