From 0b4a5ba3c0b4bea9974ed27fcb61c20a99850126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 4 Sep 2020 01:05:33 +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

---
 Database/Connection.php              | 2 --
 Database/DatabasesProviders.php      | 2 +-
 HttpServer/Abstracts/Callback.php    | 4 ++--
 HttpServer/Events/OnAfterReload.php  | 2 +-
 HttpServer/Events/OnBeforeReload.php | 2 +-
 HttpServer/Events/OnClose.php        | 2 +-
 HttpServer/Events/OnConnect.php      | 2 +-
 HttpServer/Events/OnFinish.php       | 2 +-
 HttpServer/Events/OnHandshake.php    | 2 +-
 HttpServer/Events/OnManagerStart.php | 2 +-
 HttpServer/Events/OnManagerStop.php  | 2 +-
 HttpServer/Events/OnMessage.php      | 2 +-
 HttpServer/Events/OnPacket.php       | 2 +-
 HttpServer/Events/OnPipeMessage.php  | 2 +-
 HttpServer/Events/OnReceive.php      | 2 +-
 HttpServer/Events/OnRequest.php      | 2 +-
 HttpServer/Events/OnShutdown.php     | 4 ++--
 HttpServer/Events/OnStart.php        | 2 +-
 HttpServer/Events/OnTask.php         | 2 +-
 HttpServer/Events/OnWorkerError.php  | 4 ++--
 HttpServer/Events/OnWorkerExit.php   | 2 +-
 HttpServer/Events/OnWorkerStart.php  | 2 +-
 HttpServer/Events/OnWorkerStop.php   | 2 +-
 HttpServer/Route/Router.php          | 2 +-
 HttpServer/Server.php                | 2 +-
 HttpServer/ServerProviders.php       | 2 +-
 System/Abstracts/BaseApplication.php | 2 +-
 System/Abstracts/Config.php          | 2 +-
 System/Cache/Memcached.php           | 2 +-
 System/Cache/Redis.php               | 2 +-
 30 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/Database/Connection.php b/Database/Connection.php
index f6dba9b4..29795404 100644
--- a/Database/Connection.php
+++ b/Database/Connection.php
@@ -14,10 +14,8 @@ use Database\Mysql\Schema;
 use Database\Orm\Select;
 use Exception;
 use PDO;
-use Snowflake\Config;
 use Snowflake\Event;
 use Snowflake\Exception\ComponentException;
-use Snowflake\Exception\ConfigException;
 use Snowflake\Snowflake;
 
 /**
diff --git a/Database/DatabasesProviders.php b/Database/DatabasesProviders.php
index 5c1d1884..aeadc4f4 100644
--- a/Database/DatabasesProviders.php
+++ b/Database/DatabasesProviders.php
@@ -8,9 +8,9 @@ use Exception;
 use Snowflake\Abstracts\Component;
 use Snowflake\Abstracts\Providers;
 use Snowflake\Application;
-use Snowflake\Config;
 use Snowflake\Exception\ConfigException;
 use Snowflake\Snowflake;
+use Snowflake\Abstracts\Config;
 
 /**
  * Class DatabasesProviders
diff --git a/HttpServer/Abstracts/Callback.php b/HttpServer/Abstracts/Callback.php
index 92374247..06697e5f 100644
--- a/HttpServer/Abstracts/Callback.php
+++ b/HttpServer/Abstracts/Callback.php
@@ -1,14 +1,14 @@
 <?php
 
 
-namespace HttpServer\Events\Abstracts;
+namespace HttpServer\Abstracts;
 
 
 use Exception;
 use HttpServer\Application;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
-use Snowflake\Config;
+use Snowflake\Abstracts\Config;
 use Snowflake\Error\Logger;
 use Snowflake\Event;
 use Snowflake\Exception\ConfigException;
diff --git a/HttpServer/Events/OnAfterReload.php b/HttpServer/Events/OnAfterReload.php
index 0eb21971..e79817a4 100644
--- a/HttpServer/Events/OnAfterReload.php
+++ b/HttpServer/Events/OnAfterReload.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Event;
 use Snowflake\Exception\ComponentException;
 use Snowflake\Snowflake;
diff --git a/HttpServer/Events/OnBeforeReload.php b/HttpServer/Events/OnBeforeReload.php
index b63de94f..43083e70 100644
--- a/HttpServer/Events/OnBeforeReload.php
+++ b/HttpServer/Events/OnBeforeReload.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 use Swoole\Server;
diff --git a/HttpServer/Events/OnClose.php b/HttpServer/Events/OnClose.php
index ae16fb18..23d66935 100644
--- a/HttpServer/Events/OnClose.php
+++ b/HttpServer/Events/OnClose.php
@@ -4,7 +4,7 @@
 namespace HttpServer\Events;
 
 
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use HttpServer\Route\Annotation\Annotation;
 use HttpServer\Route\Annotation\Tcp;
 use HttpServer\Route\Annotation\Websocket as AWebsocket;
diff --git a/HttpServer/Events/OnConnect.php b/HttpServer/Events/OnConnect.php
index 9dc1bb72..e7cbcdd8 100644
--- a/HttpServer/Events/OnConnect.php
+++ b/HttpServer/Events/OnConnect.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 use Swoole\Server;
diff --git a/HttpServer/Events/OnFinish.php b/HttpServer/Events/OnFinish.php
index fc28441b..ff24f26d 100644
--- a/HttpServer/Events/OnFinish.php
+++ b/HttpServer/Events/OnFinish.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Swoole\Server;
 
 class OnFinish extends Callback
diff --git a/HttpServer/Events/OnHandshake.php b/HttpServer/Events/OnHandshake.php
index 80d7d3b8..d6c2b7c6 100644
--- a/HttpServer/Events/OnHandshake.php
+++ b/HttpServer/Events/OnHandshake.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use HttpServer\Route\Annotation\Websocket as AWebsocket;
 use Snowflake\Snowflake;
 use Swoole\Http\Request as SRequest;
diff --git a/HttpServer/Events/OnManagerStart.php b/HttpServer/Events/OnManagerStart.php
index 308e8964..a37aafaa 100644
--- a/HttpServer/Events/OnManagerStart.php
+++ b/HttpServer/Events/OnManagerStart.php
@@ -4,7 +4,7 @@
 namespace HttpServer\Events;
 
 
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 use Swoole\Server;
diff --git a/HttpServer/Events/OnManagerStop.php b/HttpServer/Events/OnManagerStop.php
index f7f730aa..133f0e19 100644
--- a/HttpServer/Events/OnManagerStop.php
+++ b/HttpServer/Events/OnManagerStop.php
@@ -4,7 +4,7 @@
 namespace HttpServer\Events;
 
 
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 use Swoole\Server;
diff --git a/HttpServer/Events/OnMessage.php b/HttpServer/Events/OnMessage.php
index 10b0e6c1..3ced0140 100644
--- a/HttpServer/Events/OnMessage.php
+++ b/HttpServer/Events/OnMessage.php
@@ -4,7 +4,7 @@
 namespace HttpServer\Events;
 
 
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use HttpServer\Route\Annotation\Websocket as AWebsocket;
 use Snowflake\Event;
 use Snowflake\Snowflake;
diff --git a/HttpServer/Events/OnPacket.php b/HttpServer/Events/OnPacket.php
index d0f41842..f09c8857 100644
--- a/HttpServer/Events/OnPacket.php
+++ b/HttpServer/Events/OnPacket.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Closure;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Core\JSON;
 use Snowflake\Event;
 use Snowflake\Snowflake;
diff --git a/HttpServer/Events/OnPipeMessage.php b/HttpServer/Events/OnPipeMessage.php
index af7e0562..64325df0 100644
--- a/HttpServer/Events/OnPipeMessage.php
+++ b/HttpServer/Events/OnPipeMessage.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Event;
 use Snowflake\Exception\ComponentException;
 use Snowflake\Snowflake;
diff --git a/HttpServer/Events/OnReceive.php b/HttpServer/Events/OnReceive.php
index efac27f1..9cf0fd1c 100644
--- a/HttpServer/Events/OnReceive.php
+++ b/HttpServer/Events/OnReceive.php
@@ -4,7 +4,7 @@
 namespace HttpServer\Events;
 
 
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Core\JSON;
 use Snowflake\Event;
 use Snowflake\Snowflake;
diff --git a/HttpServer/Events/OnRequest.php b/HttpServer/Events/OnRequest.php
index fe4146c0..8a065857 100644
--- a/HttpServer/Events/OnRequest.php
+++ b/HttpServer/Events/OnRequest.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use HttpServer\Http\Context;
 use HttpServer\Http\Request as HRequest;
 use HttpServer\Http\Response as HResponse;
diff --git a/HttpServer/Events/OnShutdown.php b/HttpServer/Events/OnShutdown.php
index 97a7f73b..06a91481 100644
--- a/HttpServer/Events/OnShutdown.php
+++ b/HttpServer/Events/OnShutdown.php
@@ -5,10 +5,10 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
-use Snowflake\Config;
+use Snowflake\Abstracts\Config;
 use Snowflake\Core\JSON;
 use Snowflake\Error\Logger;
 use Snowflake\Event;
diff --git a/HttpServer/Events/OnStart.php b/HttpServer/Events/OnStart.php
index 5549dfa6..73599a8a 100644
--- a/HttpServer/Events/OnStart.php
+++ b/HttpServer/Events/OnStart.php
@@ -4,7 +4,7 @@
 namespace HttpServer\Events;
 
 
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 use Swoole\Server;
diff --git a/HttpServer/Events/OnTask.php b/HttpServer/Events/OnTask.php
index 503e640f..21207577 100644
--- a/HttpServer/Events/OnTask.php
+++ b/HttpServer/Events/OnTask.php
@@ -4,7 +4,7 @@
 namespace HttpServer\Events;
 
 
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use HttpServer\IInterface\Task as ITask;
 use Snowflake\Event;
 use Snowflake\Snowflake;
diff --git a/HttpServer/Events/OnWorkerError.php b/HttpServer/Events/OnWorkerError.php
index e85d9ddf..e00aeb54 100644
--- a/HttpServer/Events/OnWorkerError.php
+++ b/HttpServer/Events/OnWorkerError.php
@@ -5,8 +5,8 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
-use Snowflake\Config;
+use HttpServer\Abstracts\Callback;
+use Snowflake\Abstracts\Config;
 use Snowflake\Exception\ConfigException;
 use Swoole\Server;
 
diff --git a/HttpServer/Events/OnWorkerExit.php b/HttpServer/Events/OnWorkerExit.php
index 9ed807f7..b525b0bc 100644
--- a/HttpServer/Events/OnWorkerExit.php
+++ b/HttpServer/Events/OnWorkerExit.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 
 /**
  * Class OnWorkerExit
diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php
index aace07d3..662056cd 100644
--- a/HttpServer/Events/OnWorkerStart.php
+++ b/HttpServer/Events/OnWorkerStart.php
@@ -5,7 +5,7 @@ namespace HttpServer\Events;
 
 
 use Exception;
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 use HttpServer\Route\Annotation\Websocket as AWebsocket;
 use HttpServer\Service\Http;
 use HttpServer\Service\Websocket;
diff --git a/HttpServer/Events/OnWorkerStop.php b/HttpServer/Events/OnWorkerStop.php
index 7eb531c2..143e6a4c 100644
--- a/HttpServer/Events/OnWorkerStop.php
+++ b/HttpServer/Events/OnWorkerStop.php
@@ -4,7 +4,7 @@
 namespace HttpServer\Events;
 
 
-use HttpServer\Events\Abstracts\Callback;
+use HttpServer\Abstracts\Callback;
 
 class OnWorkerStop extends Callback
 {
diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php
index 3a887cc3..574bf9f4 100644
--- a/HttpServer/Route/Router.php
+++ b/HttpServer/Route/Router.php
@@ -11,7 +11,7 @@ use HttpServer\IInterface\RouterInterface;
 use HttpServer\Application;
 use HttpServer\Route\Annotation\Annotation;
 use ReflectionException;
-use Snowflake\Config;
+use Snowflake\Abstracts\Config;
 use Snowflake\Core\JSON;
 use Snowflake\Exception\ConfigException;
 use Snowflake\Exception\NotFindClassException;
diff --git a/HttpServer/Server.php b/HttpServer/Server.php
index 30fbe845..98f8986d 100644
--- a/HttpServer/Server.php
+++ b/HttpServer/Server.php
@@ -16,7 +16,7 @@ use HttpServer\Service\Packet;
 use HttpServer\Service\WebSocket;
 use Exception;
 use ReflectionException;
-use Snowflake\Config;
+use Snowflake\Abstracts\Config;
 use Snowflake\Core\ArrayAccess;
 use Snowflake\Event;
 use Snowflake\Exception\ComponentException;
diff --git a/HttpServer/ServerProviders.php b/HttpServer/ServerProviders.php
index ef125acb..9781d094 100644
--- a/HttpServer/ServerProviders.php
+++ b/HttpServer/ServerProviders.php
@@ -8,7 +8,7 @@ use Exception;
 use HttpServer\Server;
 use Snowflake\Abstracts\Component;
 use Snowflake\Abstracts\Providers;
-use Snowflake\Config;
+use Snowflake\Abstracts\Config;
 use Snowflake\Exception\ConfigException;
 use Snowflake\Snowflake;
 
diff --git a/System/Abstracts/BaseApplication.php b/System/Abstracts/BaseApplication.php
index 70329d93..de0a87f6 100644
--- a/System/Abstracts/BaseApplication.php
+++ b/System/Abstracts/BaseApplication.php
@@ -17,7 +17,7 @@ use HttpServer\Server;
 use Snowflake\Annotation\Annotation;
 use Snowflake\Cache\Memcached;
 use Snowflake\Cache\Redis;
-use Snowflake\Config;
+use Snowflake\Abstracts\Config;
 use Snowflake\Di\Service;
 use Snowflake\Error\ErrorHandler;
 use Snowflake\Error\Logger;
diff --git a/System/Abstracts/Config.php b/System/Abstracts/Config.php
index f4651614..856a5058 100644
--- a/System/Abstracts/Config.php
+++ b/System/Abstracts/Config.php
@@ -6,7 +6,7 @@
  * Time: 11:50
  */
 
-namespace Snowflake;
+namespace Snowflake\Abstracts;
 
 use Exception;
 use Snowflake\Exception\ConfigException;
diff --git a/System/Cache/Memcached.php b/System/Cache/Memcached.php
index f4598463..84ee4e08 100644
--- a/System/Cache/Memcached.php
+++ b/System/Cache/Memcached.php
@@ -5,7 +5,7 @@ namespace Snowflake\Cache;
 
 use Exception;
 use Snowflake\Abstracts\Component;
-use Snowflake\Config;
+use Snowflake\Abstracts\Config;
 use Snowflake\Event;
 use Snowflake\Exception\ConfigException;
 use Snowflake\Snowflake;
diff --git a/System/Cache/Redis.php b/System/Cache/Redis.php
index 256b5a4c..6946a9ca 100644
--- a/System/Cache/Redis.php
+++ b/System/Cache/Redis.php
@@ -10,7 +10,7 @@ namespace Snowflake\Cache;
 
 use Exception;
 use Snowflake\Abstracts\Component;
-use Snowflake\Config;
+use Snowflake\Abstracts\Config;
 use Snowflake\Event;
 use Snowflake\Exception\ConfigException;
 use Snowflake\Exception\RedisConnectException;