Merge remote-tracking branch 'origin/master'

http-helper/Route/Node.php

@@ -8,7 +8,6 @@ namespace Http\Route;
 use Annotation\Aspect;
 use Closure;
 use Exception;
-use Http\Context\Request;
 use Http\Exception\RequestException;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Events\EventProvider;
@@ -17,6 +16,7 @@ use Kiri\IAspect;
 use Kiri\Kiri;
 use ReflectionException;
 use Server\Events\OnAfterWorkerStart;
+use Server\RequestInterface;
 
 /**
  * Class Node
@@ -269,10 +269,10 @@ class Node
 
 
 	/**
-	 * @param Request $request
+	 * @param RequestInterface $request
 	 * @return bool
 	 */
-	public function methodAllow(Request $request): bool
+	public function methodAllow(RequestInterface $request): bool
 	{
 		if ($this->method == $request->getMethod()) {
 			return true;

http-helper/Route/Router.php

@@ -7,7 +7,6 @@ use Annotation\Inject;
 use Closure;
 use Exception;
 use Http\Abstracts\HttpService;
-use Http\Context\Request;
 use Http\Context\Response;
 use Http\Controller;
 use Http\IInterface\MiddlewareInterface;
@@ -494,12 +493,12 @@ class Router extends HttpService implements RouterInterface
 
 
 	/**
-	 * @param Request $request
+	 * @param RequestInterface $request
 	 * @return Node|null 树干搜索
 	 * 树干搜索
 	 * @throws Exception
 	 */
-	public function find_path(Request $request): ?Node
+	public function find_path(RequestInterface $request): ?Node
 	{
 		$method = $request->getMethod();