From 4275decc05921073a6f2c35783458cf337fd452b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Mon, 6 Sep 2021 16:22:15 +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/Worker/OnWorkerStart.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/http-server/Worker/OnWorkerStart.php b/http-server/Worker/OnWorkerStart.php index 352e9afe..8e1c8efb 100644 --- a/http-server/Worker/OnWorkerStart.php +++ b/http-server/Worker/OnWorkerStart.php @@ -43,7 +43,7 @@ class OnWorkerStart implements EventDispatcherInterface { $isWorker = $event->workerId < $event->server->setting['worker_num']; - $this->interpretDirectory(); + $this->interpretDirectory($isWorker); if ($isWorker) { ServerManager::setEnv('environmental', Kiri::WORKER); Kiri::getFactory()->getRouter()->_loader(); @@ -82,9 +82,16 @@ class OnWorkerStart implements EventDispatcherInterface * @throws ReflectionException * @throws Exception */ - private function interpretDirectory() + private function interpretDirectory($isWorker) { $di = Kiri::getDi(); + + $namespace = array_filter(explode('\\', Router::getNamespace())); + + $namespace = APP_PATH . implode('/', $namespace); + + $this->annotation->read(APP_PATH . 'app', 'App', $isWorker ? [] : [$namespace]); + $fileLists = $this->annotation->read(APP_PATH . 'app'); foreach ($fileLists->runtime(APP_PATH . 'app') as $class) { foreach (NoteManager::getTargetNote($class) as $value) {