From b2728947a33d83425a825089b374792e9b64718e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Mon, 10 Jan 2022 11:39:55 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fdf58326
---
 Abstracts/BaseProcess.php           |  4 ++--
 Abstracts/Server.php                |  2 +-
 Constant.php                        |  2 +-
 Contract/OnBeforeShutdown.php       |  2 +-
 Contract/OnCloseInterface.php       |  2 +-
 Contract/OnConnectInterface.php     |  2 +-
 Contract/OnDisconnectInterface.php  |  2 +-
 Contract/OnHandshakeInterface.php   |  2 +-
 Contract/OnMessageInterface.php     |  2 +-
 Contract/OnOpenInterface.php        |  2 +-
 Contract/OnPacketInterface.php      |  4 ++--
 Contract/OnPipeMessageInterface.php |  2 +-
 Contract/OnProcessInterface.php     |  2 +-
 Contract/OnReceiveInterface.php     |  2 +-
 Contract/OnTaskInterface.php        |  2 +-
 Events/OnAfterReload.php            |  2 +-
 Events/OnAfterWorkerStart.php       |  2 +-
 Events/OnBeforeReload.php           |  2 +-
 Events/OnBeforeShutdown.php         |  2 +-
 Events/OnBeforeWorkerStart.php      |  2 +-
 Events/OnManagerStart.php           |  2 +-
 Events/OnManagerStop.php            |  2 +-
 Events/OnServerBeforeStart.php      |  2 +-
 Events/OnShutdown.php               |  2 +-
 Events/OnStart.php                  |  2 +-
 Events/OnTaskerStart.php            |  2 +-
 Events/OnWorkerError.php            |  2 +-
 Events/OnWorkerExit.php             |  2 +-
 Events/OnWorkerStart.php            |  2 +-
 Events/OnWorkerStop.php             |  2 +-
 Handler/OnPipeMessage.php           |  6 ++---
 Handler/OnServer.php                | 10 ++++-----
 Handler/OnServerManager.php         |  8 +++----
 Handler/OnServerReload.php          |  6 ++---
 Handler/OnServerWorker.php          | 16 +++++++-------
 Server.php                          |  8 +++----
 ServerCommand.php                   |  2 +-
 ServerManager.php                   | 34 ++++++++++++++---------------
 ServerProviders.php                 |  2 +-
 State.php                           |  2 +-
 SwooleServerInterface.php           |  2 +-
 Tasker/AsyncTaskExecute.php         |  6 ++---
 Tasker/OnServerTask.php             |  4 ++--
 TraitServer.php                     |  2 +-
 composer.json                       |  2 +-
 45 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/Abstracts/BaseProcess.php b/Abstracts/BaseProcess.php
index 34994be..d8a3ecc 100644
--- a/Abstracts/BaseProcess.php
+++ b/Abstracts/BaseProcess.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
 
 
 use Kiri\Context;
-use Server\Contract\OnProcessInterface;
+use Kiri\Server\Contract\OnProcessInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
 
diff --git a/Abstracts/Server.php b/Abstracts/Server.php
index dfba1f2..aaaa335 100644
--- a/Abstracts/Server.php
+++ b/Abstracts/Server.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
 
 
 use Kiri\Annotation\Inject;
diff --git a/Constant.php b/Constant.php
index eea519f..79d6595 100644
--- a/Constant.php
+++ b/Constant.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server;
+namespace Kiri\Server;
 
 
 /**
diff --git a/Contract/OnBeforeShutdown.php b/Contract/OnBeforeShutdown.php
index 67f1b66..a378a26 100644
--- a/Contract/OnBeforeShutdown.php
+++ b/Contract/OnBeforeShutdown.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 interface OnBeforeShutdown
 {
diff --git a/Contract/OnCloseInterface.php b/Contract/OnCloseInterface.php
index cefd3eb..0751fe6 100644
--- a/Contract/OnCloseInterface.php
+++ b/Contract/OnCloseInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Swoole\Server;
 
diff --git a/Contract/OnConnectInterface.php b/Contract/OnConnectInterface.php
index b705835..a79a24f 100644
--- a/Contract/OnConnectInterface.php
+++ b/Contract/OnConnectInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Swoole\Server;
 
diff --git a/Contract/OnDisconnectInterface.php b/Contract/OnDisconnectInterface.php
index 5fcde25..15af358 100644
--- a/Contract/OnDisconnectInterface.php
+++ b/Contract/OnDisconnectInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Swoole\Server;
 
diff --git a/Contract/OnHandshakeInterface.php b/Contract/OnHandshakeInterface.php
index dc9f6c6..0c490f5 100644
--- a/Contract/OnHandshakeInterface.php
+++ b/Contract/OnHandshakeInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Swoole\Http\Request;
 use Swoole\Http\Response;
diff --git a/Contract/OnMessageInterface.php b/Contract/OnMessageInterface.php
index 4207503..339c1b8 100644
--- a/Contract/OnMessageInterface.php
+++ b/Contract/OnMessageInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Kiri\Websocket\WebSocketInterface;
 use Swoole\WebSocket\Frame;
diff --git a/Contract/OnOpenInterface.php b/Contract/OnOpenInterface.php
index 30cc4a6..313c8c1 100644
--- a/Contract/OnOpenInterface.php
+++ b/Contract/OnOpenInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Swoole\Http\Request;
 
diff --git a/Contract/OnPacketInterface.php b/Contract/OnPacketInterface.php
index cac0ea4..8f6130f 100644
--- a/Contract/OnPacketInterface.php
+++ b/Contract/OnPacketInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
-use Server\Abstracts\Server;
+use Kiri\Server\Abstracts\Server;
 
 interface OnPacketInterface
 {
diff --git a/Contract/OnPipeMessageInterface.php b/Contract/OnPipeMessageInterface.php
index 97a35b8..2bd7e6b 100644
--- a/Contract/OnPipeMessageInterface.php
+++ b/Contract/OnPipeMessageInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 
 /**
diff --git a/Contract/OnProcessInterface.php b/Contract/OnProcessInterface.php
index 2cf3f92..c327c64 100644
--- a/Contract/OnProcessInterface.php
+++ b/Contract/OnProcessInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 
 use Swoole\Process;
diff --git a/Contract/OnReceiveInterface.php b/Contract/OnReceiveInterface.php
index 45af04a..149ca5d 100644
--- a/Contract/OnReceiveInterface.php
+++ b/Contract/OnReceiveInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Swoole\Server;
 
diff --git a/Contract/OnTaskInterface.php b/Contract/OnTaskInterface.php
index 3a5b076..72d59c6 100644
--- a/Contract/OnTaskInterface.php
+++ b/Contract/OnTaskInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 
 use Swoole\Server;
diff --git a/Events/OnAfterReload.php b/Events/OnAfterReload.php
index 7acfd57..0f45c74 100644
--- a/Events/OnAfterReload.php
+++ b/Events/OnAfterReload.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnAfterWorkerStart.php b/Events/OnAfterWorkerStart.php
index 8405f71..5cb6afb 100644
--- a/Events/OnAfterWorkerStart.php
+++ b/Events/OnAfterWorkerStart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 class OnAfterWorkerStart
 {
diff --git a/Events/OnBeforeReload.php b/Events/OnBeforeReload.php
index 49de570..e73470d 100644
--- a/Events/OnBeforeReload.php
+++ b/Events/OnBeforeReload.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnBeforeShutdown.php b/Events/OnBeforeShutdown.php
index 494840f..0533a42 100644
--- a/Events/OnBeforeShutdown.php
+++ b/Events/OnBeforeShutdown.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnBeforeWorkerStart.php b/Events/OnBeforeWorkerStart.php
index 5328c77..2cf5b2f 100644
--- a/Events/OnBeforeWorkerStart.php
+++ b/Events/OnBeforeWorkerStart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 class OnBeforeWorkerStart
 {
diff --git a/Events/OnManagerStart.php b/Events/OnManagerStart.php
index a07a840..2bceb62 100644
--- a/Events/OnManagerStart.php
+++ b/Events/OnManagerStart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnManagerStop.php b/Events/OnManagerStop.php
index fe7fd82..511fab0 100644
--- a/Events/OnManagerStop.php
+++ b/Events/OnManagerStop.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnServerBeforeStart.php b/Events/OnServerBeforeStart.php
index 1f868a6..6ad1e68 100644
--- a/Events/OnServerBeforeStart.php
+++ b/Events/OnServerBeforeStart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 class OnServerBeforeStart
 {
diff --git a/Events/OnShutdown.php b/Events/OnShutdown.php
index dfa1db6..964f55a 100644
--- a/Events/OnShutdown.php
+++ b/Events/OnShutdown.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnStart.php b/Events/OnStart.php
index 7d7c81c..92951db 100644
--- a/Events/OnStart.php
+++ b/Events/OnStart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnTaskerStart.php b/Events/OnTaskerStart.php
index 15705ff..e5f9c15 100644
--- a/Events/OnTaskerStart.php
+++ b/Events/OnTaskerStart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnWorkerError.php b/Events/OnWorkerError.php
index 1d0b7fe..6c43786 100644
--- a/Events/OnWorkerError.php
+++ b/Events/OnWorkerError.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnWorkerExit.php b/Events/OnWorkerExit.php
index ebc4093..8fa6dc9 100644
--- a/Events/OnWorkerExit.php
+++ b/Events/OnWorkerExit.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnWorkerStart.php b/Events/OnWorkerStart.php
index 5cab39e..a66d12c 100644
--- a/Events/OnWorkerStart.php
+++ b/Events/OnWorkerStart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Events/OnWorkerStop.php b/Events/OnWorkerStop.php
index 9c16766..8ad3de6 100644
--- a/Events/OnWorkerStop.php
+++ b/Events/OnWorkerStop.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 
diff --git a/Handler/OnPipeMessage.php b/Handler/OnPipeMessage.php
index 17f6417..65bd07a 100644
--- a/Handler/OnPipeMessage.php
+++ b/Handler/OnPipeMessage.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 use Kiri\Annotation\Inject;
-use Server\Abstracts\Server;
+use Kiri\Server\Abstracts\Server;
 use Exception;
-use Server\Contract\OnPipeMessageInterface;
+use Kiri\Server\Contract\OnPipeMessageInterface;
 use Kiri\Events\EventDispatch;
 
 /**
diff --git a/Handler/OnServer.php b/Handler/OnServer.php
index ee0500d..d8bc819 100644
--- a/Handler/OnServer.php
+++ b/Handler/OnServer.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use ReflectionException;
-use Server\Abstracts\Server;
-use Server\Events\OnBeforeShutdown;
-use Server\Events\OnShutdown;
-use Server\Events\OnStart;
+use Kiri\Server\Abstracts\Server;
+use Kiri\Server\Events\OnBeforeShutdown;
+use Kiri\Server\Events\OnShutdown;
+use Kiri\Server\Events\OnStart;
 
 
 /**
diff --git a/Handler/OnServerManager.php b/Handler/OnServerManager.php
index 3ac1145..f055492 100644
--- a/Handler/OnServerManager.php
+++ b/Handler/OnServerManager.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use ReflectionException;
-use Server\Abstracts\Server;
+use Kiri\Server\Abstracts\Server;
 use Kiri\Exception\ConfigException;
-use Server\Events\OnManagerStart;
-use Server\Events\OnManagerStop;
+use Kiri\Server\Events\OnManagerStart;
+use Kiri\Server\Events\OnManagerStop;
 
 
 /**
diff --git a/Handler/OnServerReload.php b/Handler/OnServerReload.php
index 631df7b..1023727 100644
--- a/Handler/OnServerReload.php
+++ b/Handler/OnServerReload.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
-use Server\Events\OnAfterReload;
-use Server\Events\OnBeforeReload;
+use Kiri\Server\Events\OnAfterReload;
+use Kiri\Server\Events\OnBeforeReload;
 use Swoole\Server;
 
 
diff --git a/Handler/OnServerWorker.php b/Handler/OnServerWorker.php
index ed4f2ad..6036072 100644
--- a/Handler/OnServerWorker.php
+++ b/Handler/OnServerWorker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 use Exception;
 use Kiri\Abstracts\Config;
@@ -8,13 +8,13 @@ use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
 use Kiri\Kiri;
 use Kiri\Annotation\Inject;
-use Server\Events\OnAfterWorkerStart;
-use Server\Events\OnBeforeWorkerStart;
-use Server\Events\OnTaskerStart as OnTaskStart;
-use Server\Events\OnWorkerError;
-use Server\Events\OnWorkerExit;
-use Server\Events\OnWorkerStart;
-use Server\Events\OnWorkerStop;
+use Kiri\Server\Events\OnAfterWorkerStart;
+use Kiri\Server\Events\OnBeforeWorkerStart;
+use Kiri\Server\Events\OnTaskerStart as OnTaskStart;
+use Kiri\Server\Events\OnWorkerError;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnWorkerStop;
 use Swoole\Server;
 use Swoole\Timer;
 
diff --git a/Server.php b/Server.php
index f88fe5f..731ffe6 100644
--- a/Server.php
+++ b/Server.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Server;
+namespace Kiri\Server;
 
 use Exception;
-use Http\Handler\Abstracts\HttpService;
-use Http\Handler\Router;
+use Kiri\Message\Handler\Abstracts\HttpService;
+use Kiri\Message\Handler\Router;
 use Kiri\Abstracts\Config;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
@@ -13,7 +13,7 @@ use Kiri\Kiri;
 use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use Server\Events\OnShutdown;
+use Kiri\Server\Events\OnShutdown;
 use Swoole\Coroutine;
 
 
diff --git a/ServerCommand.php b/ServerCommand.php
index 29f577a..82f6fb2 100644
--- a/ServerCommand.php
+++ b/ServerCommand.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Server;
+namespace Kiri\Server;
 
 
 use Exception;
diff --git a/ServerManager.php b/ServerManager.php
index 16f096c..4f202ed 100644
--- a/ServerManager.php
+++ b/ServerManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server;
+namespace Kiri\Server;
 
 use Exception;
 use Kiri\Abstracts\Component;
@@ -13,22 +13,22 @@ use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
-use Server\Abstracts\BaseProcess;
-use Server\Contract\OnCloseInterface;
-use Server\Contract\OnConnectInterface;
-use Server\Contract\OnDisconnectInterface;
-use Server\Contract\OnHandshakeInterface;
-use Server\Contract\OnMessageInterface;
-use Server\Contract\OnPacketInterface;
-use Server\Contract\OnProcessInterface;
-use Server\Contract\OnReceiveInterface;
-use Server\Events\OnServerBeforeStart;
-use Server\Handler\OnPipeMessage;
-use Server\Handler\OnServer;
-use Server\Handler\OnServerManager;
-use Server\Handler\OnServerReload;
-use Server\Handler\OnServerWorker;
-use Server\Tasker\OnServerTask;
+use Kiri\Server\Abstracts\BaseProcess;
+use Kiri\Server\Contract\OnCloseInterface;
+use Kiri\Server\Contract\OnConnectInterface;
+use Kiri\Server\Contract\OnDisconnectInterface;
+use Kiri\Server\Contract\OnHandshakeInterface;
+use Kiri\Server\Contract\OnMessageInterface;
+use Kiri\Server\Contract\OnPacketInterface;
+use Kiri\Server\Contract\OnProcessInterface;
+use Kiri\Server\Contract\OnReceiveInterface;
+use Kiri\Server\Events\OnServerBeforeStart;
+use Kiri\Server\Handler\OnPipeMessage;
+use Kiri\Server\Handler\OnServer;
+use Kiri\Server\Handler\OnServerManager;
+use Kiri\Server\Handler\OnServerReload;
+use Kiri\Server\Handler\OnServerWorker;
+use Kiri\Server\Tasker\OnServerTask;
 use Swoole\Http\Server as HServer;
 use Swoole\Process;
 use Swoole\Server;
diff --git a/ServerProviders.php b/ServerProviders.php
index 9137e72..2f65359 100644
--- a/ServerProviders.php
+++ b/ServerProviders.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Server;
+namespace Kiri\Server;
 
 
 use Exception;
diff --git a/State.php b/State.php
index 0c1f473..98508c3 100644
--- a/State.php
+++ b/State.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server;
+namespace Kiri\Server;
 
 use Exception;
 use Kiri\Abstracts\Component;
diff --git a/SwooleServerInterface.php b/SwooleServerInterface.php
index cf5a536..53e4ca7 100644
--- a/SwooleServerInterface.php
+++ b/SwooleServerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server;
+namespace Kiri\Server;
 
 
 use Swoole\Server;
diff --git a/Tasker/AsyncTaskExecute.php b/Tasker/AsyncTaskExecute.php
index 592ef07..e99408e 100644
--- a/Tasker/AsyncTaskExecute.php
+++ b/Tasker/AsyncTaskExecute.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Server\Tasker;
+namespace Kiri\Server\Tasker;
 
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\HashMap;
 use Kiri\Kiri;
 use ReflectionException;
-use Server\Contract\OnTaskInterface;
-use Server\SwooleServerInterface;
+use Kiri\Server\Contract\OnTaskInterface;
+use Kiri\Server\SwooleServerInterface;
 
 
 /**
diff --git a/Tasker/OnServerTask.php b/Tasker/OnServerTask.php
index d765b0d..f2d0594 100644
--- a/Tasker/OnServerTask.php
+++ b/Tasker/OnServerTask.php
@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Server\Tasker;
+namespace Kiri\Server\Tasker;
 
 
 use Kiri\Annotation\Inject;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\ConfigException;
-use Server\Contract\OnTaskInterface;
+use Kiri\Server\Contract\OnTaskInterface;
 use Swoole\Server;
 
 
diff --git a/TraitServer.php b/TraitServer.php
index dc20d1f..33d2ff7 100644
--- a/TraitServer.php
+++ b/TraitServer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Server;
+namespace Kiri\Server;
 
 trait TraitServer
 {
diff --git a/composer.json b/composer.json
index 8d2ca7f..c3ae6e4 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Server\\": "./"
+            "Kiri\\Server\\": "./"
         }
     }
 }