From 6786b313b5d02e1165be861852dedcc3a67b304d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Fri, 3 Dec 2021 14:46:38 +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 --- ServerManager.php | 18 ++---------------- Tasker/AsyncTaskExecute.php | 7 ------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/ServerManager.php b/ServerManager.php index a81c9c9..a7fb3a1 100644 --- a/ServerManager.php +++ b/ServerManager.php @@ -3,6 +3,7 @@ namespace Server; use Exception; +use Kiri\Abstracts\BaseObject; use Kiri\Abstracts\Config; use Kiri\Di\Container; use Kiri\Error\Logger; @@ -41,7 +42,7 @@ use Swoole\WebSocket\Server as WServer; * Class OnServerManager * @package Http\Service */ -class ServerManager +class ServerManager extends BaseObject { @@ -59,14 +60,6 @@ class ServerManager #[Inject(Logger::class)] public Logger $logger; - - /** - * @var State - */ - #[Inject(State::class)] - public State $state; - - /** @var array */ public array $ports = []; @@ -76,13 +69,6 @@ class ServerManager private Server|null $server = null; - /** - * @var Container - */ - #[Inject(ContainerInterface::class)] - public ContainerInterface $container; - - const DEFAULT_EVENT = [ Constant::WORKER_START => [OnServerWorker::class, 'onWorkerStart'], Constant::WORKER_EXIT => [OnServerWorker::class, 'onWorkerExit'], diff --git a/Tasker/AsyncTaskExecute.php b/Tasker/AsyncTaskExecute.php index f0ef74c..8fe9179 100644 --- a/Tasker/AsyncTaskExecute.php +++ b/Tasker/AsyncTaskExecute.php @@ -27,13 +27,6 @@ class AsyncTaskExecute extends BaseObject public ?SwooleServerInterface $server = null; - /** - * @var Container - */ - #[Inject(ContainerInterface::class)] - public ContainerInterface $container; - - private HashMap $hashMap;