改名

http-server/Abstracts/Http.php

@@ -3,14 +3,11 @@
 namespace Server\Abstracts;
 
 use Annotation\Inject;
-use Http\Route\Router;
+use Http\Handler\Router;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
-use Kiri\Exception\NotFindClassException;
 use Kiri\Kiri;
-use ReflectionException;
 use Server\Constrict\ResponseEmitter;
-use Server\Constrict\TcpEmitter;
 use Server\ExceptionHandlerDispatcher;
 use Server\ExceptionHandlerInterface;
 use Server\SInterface\OnRequest;

http-server/Constrict/Request.php

@@ -2,8 +2,8 @@
 
 namespace Server\Constrict;
 
-use Http\Context\Context;
-use Http\IInterface\AuthIdentity;
+use Http\Handler\Context;
+use Http\Handler\AuthIdentity;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Kiri;
 use Http\Message\Response;

http-server/Constrict/RequestInterface.php

@@ -3,7 +3,7 @@
 namespace Server\Constrict;
 
 
-use Http\IInterface\AuthIdentity;
+use Http\Handler\AuthIdentity;
 use JetBrains\PhpStorm\Pure;
 use Http\Message\ServerRequest;
 use Psr\Http\Message\UploadedFileInterface;

http-server/Constrict/Response.php

@@ -4,7 +4,7 @@
 namespace Server\Constrict;
 
 
-use Http\Context\Context;
+use Http\Handler\Context;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Kiri;
 use Psr\Http\Message\StreamInterface;

http-server/Server.php

@@ -5,7 +5,7 @@ namespace Server;
 
 use Annotation\Inject;
 use Exception;
-use Http\Abstracts\HttpService;
+use Http\Handler\Abstracts\HttpService;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
 use Kiri\Error\LoggerProcess;

http-server/ServerManager.php

@@ -5,7 +5,6 @@ namespace Server;
 use Annotation\Inject;
 use Closure;
 use Exception;
-use Http\Route\Router;
 use Kiri\Abstracts\Config;
 use Kiri\Di\ContainerInterface;
 use Kiri\Exception\ConfigException;
@@ -169,12 +168,8 @@ class ServerManager
 				$customProcess = Kiri::createObject($customProcess, [$server]);
 			}
 
-			$namespace = array_filter(explode('\\', Router::getNamespace()));
-
-			$namespace = APP_PATH . implode('/', $namespace);
-
 			$name = $customProcess->getProcessName($soloProcess);
-			scan_directory(directory('app'), 'App', [$namespace]);
+			scan_directory(directory('app'), 'App');
 
 			$system = sprintf('%s.process[%d]', Config::get('id', 'system-service'), $soloProcess->pid);
 			if (Kiri::getPlatform()->isLinux()) {

http-server/Service/Http.php

@@ -5,26 +5,18 @@ namespace Server\Service;
 
 use Annotation\Inject;
 use Exception;
-use Http\Context\Context;
-use Http\Exception\RequestException;
+use Http\Handler\Context;
 use Http\Handler\Abstracts\HandlerManager;
 use Http\Handler\Dispatcher;
 use Http\Handler\Handler;
-use Http\Handler\TestRequest;
 use Http\Message\ServerRequest;
 use Http\Message\Stream;
-use Http\Route\MiddlewareManager;
-use Http\Route\Node;
-use Kiri\Core\Help;
+use Http\Handler\Abstracts\MiddlewareManager;
 use Psr\Http\Message\ServerRequestInterface;
-use Server\Constant;
-use Server\Constrict\Request as ScRequest;
 use Server\Constrict\RequestInterface;
 use Server\Constrict\ResponseInterface;
-use Server\Events\OnAfterRequest;
 use Server\SInterface\OnClose;
 use Server\SInterface\OnConnect;
-use Swoole\Error;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Swoole\Server;

http-server/Worker/OnWorkerStart.php

@@ -5,7 +5,7 @@ namespace Server\Worker;
 use Annotation\Annotation;
 use Annotation\Inject;
 use Exception;
-use Http\Route\Router;
+use Http\Handler\Router;
 use Kiri\Abstracts\Config;
 use Kiri\Di\NoteManager;
 use Kiri\Exception\ConfigException;