From cb1e59cdcfc3cab213fb36397a1c8f46068cc2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Thu, 12 Aug 2021 14:35:28 +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

---
 .../{OnServerDefault.php => OnServer.php}     | 27 +-----------
 Server/Manager/OnServerReload.php             | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+), 25 deletions(-)
 rename Server/Manager/{OnServerDefault.php => OnServer.php} (59%)
 create mode 100644 Server/Manager/OnServerReload.php

diff --git a/Server/Manager/OnServerDefault.php b/Server/Manager/OnServer.php
similarity index 59%
rename from Server/Manager/OnServerDefault.php
rename to Server/Manager/OnServer.php
index c6e87554..ff8f09c3 100644
--- a/Server/Manager/OnServerDefault.php
+++ b/Server/Manager/OnServer.php
@@ -3,16 +3,9 @@
 namespace Server\Manager;
 
 use Annotation\Inject;
-use Exception;
 use Server\Abstracts\Server;
-use Server\Constant;
-use Server\Events\OnAfterReload;
-use Server\Events\OnAfterRequest;
-use Server\Events\OnBeforeReload;
 use Server\Events\OnShutdown;
 use Server\Events\OnStart;
-use Server\SInterface\PipeMessage;
-use Kiri\Event;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 
@@ -21,7 +14,7 @@ use Kiri\Exception\ConfigException;
  * Class OnServerDefault
  * @package Server\Manager
  */
-class OnServerDefault extends Server
+class OnServer extends Server
 {
 
 	/**
@@ -43,6 +36,7 @@ class OnServerDefault extends Server
 	}
 
 
+	
 	/**
 	 * @param \Swoole\Server $server
 	 */
@@ -53,21 +47,4 @@ class OnServerDefault extends Server
 
 
 
-	/**
-	 * @param \Swoole\Server $server
-	 */
-	public function onBeforeReload(\Swoole\Server $server)
-	{
-		$this->eventDispatch->dispatch(new OnBeforeReload($server));
-	}
-
-
-	/**
-	 * @param \Swoole\Server $server
-	 */
-	public function onAfterReload(\Swoole\Server $server)
-	{
-		$this->eventDispatch->dispatch(new OnAfterReload($server));
-	}
-
 }
diff --git a/Server/Manager/OnServerReload.php b/Server/Manager/OnServerReload.php
new file mode 100644
index 00000000..0e1594a0
--- /dev/null
+++ b/Server/Manager/OnServerReload.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Server\Manager;
+
+use Annotation\Inject;
+use Kiri\Events\EventDispatch;
+use Server\Events\OnAfterReload;
+use Server\Events\OnBeforeReload;
+use Swoole\Server;
+
+
+/**
+ *
+ */
+class OnServerReload
+{
+
+
+	/**
+	 * @var EventDispatch
+	 */
+	#[Inject(EventDispatch::class)]
+	public EventDispatch $eventDispatch;
+
+
+	/**
+	 * @param Server $server
+	 */
+	public function onBeforeReload(Server $server)
+	{
+		$this->eventDispatch->dispatch(new OnBeforeReload($server));
+	}
+
+
+	/**
+	 * @param Server $server
+	 */
+	public function onAfterReload(Server $server)
+	{
+		$this->eventDispatch->dispatch(new OnAfterReload($server));
+	}
+
+}