From 728f95492fc8a1690285fd251631000c910ec9ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Mon, 6 Sep 2021 14:20:04 +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

---
 http-server/Server.php                |  4 ++--
 http-server/Worker/OnServerWorker.php |  8 ++++----
 http-server/Worker/OnWorkerStart.php  | 21 ++++++++++++++-------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/http-server/Server.php b/http-server/Server.php
index 76393c41..866f4416 100644
--- a/http-server/Server.php
+++ b/http-server/Server.php
@@ -11,7 +11,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Error\LoggerProcess;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
-use Kiri\Rpc\Service;
+use Kiri\Rpc\RpcProvider;
 use Server\Events\OnShutdown;
 use Swoole\Runtime;
 
@@ -75,7 +75,7 @@ class Server extends HttpService
 
 		$rpcService = Config::get('rpc', []);
 		if (!empty($rpcService)) {
-			Service::addRpcListener($this->manager, $rpcService);
+			RpcProvider::addRpcListener($this->manager, $rpcService);
 		}
 
 		$processes = array_merge($this->process, Config::get('processes', []));
diff --git a/http-server/Worker/OnServerWorker.php b/http-server/Worker/OnServerWorker.php
index a275c7b6..f323eb08 100644
--- a/http-server/Worker/OnServerWorker.php
+++ b/http-server/Worker/OnServerWorker.php
@@ -49,10 +49,10 @@ class OnServerWorker extends \Server\Abstracts\Server
     }
 
 
-    /**
-     * @param $workerId
-     * @throws \Exception
-     */
+	/**
+	 * @param OnBeforeWorkerStart $worker
+	 * @throws Exception
+	 */
     public function setConfigure(OnBeforeWorkerStart $worker)
     {
         ServerManager::setEnv('worker', $worker->workerId);
diff --git a/http-server/Worker/OnWorkerStart.php b/http-server/Worker/OnWorkerStart.php
index 3f8c8f93..16dae0c7 100644
--- a/http-server/Worker/OnWorkerStart.php
+++ b/http-server/Worker/OnWorkerStart.php
@@ -19,25 +19,32 @@ class OnWorkerStart implements EventDispatcherInterface
 {
 
 
+	/**
+	 * @var Annotation
+	 */
     #[Inject(Annotation::class)]
     public Annotation $annotation;
 
 
+	/**
+	 * @var Router
+	 */
     #[Inject(Router::class)]
     public Router $router;
 
 
-    /**
-     * @param object $event
-     * @return object|void
-     * @throws \Kiri\Exception\ConfigException
-     * @throws \ReflectionException
-     */
+	/**
+	 * @param object $event
+	 * @return void
+	 * @throws ConfigException
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
     public function dispatch(object $event)
     {
         $isWorker = $event->workerId < $event->server->setting['worker_num'];
 
-        $this->annotation->read(APP_PATH . 'app', 'App', $isWorker ? [] : [CONTROLLER_PATH]);
+        $this->annotation->read(APP_PATH . 'app', 'App');
         $this->interpretDirectory();
         if ($isWorker) {
             ServerManager::setEnv('environmental', Kiri::WORKER);