From 7c88c486d893e618b518cd545e7a66a66937b36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 20 Jul 2021 11:31:09 +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 --- System/Abstracts/BaseApplication.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/System/Abstracts/BaseApplication.php b/System/Abstracts/BaseApplication.php index 9c58f01f..653dc497 100644 --- a/System/Abstracts/BaseApplication.php +++ b/System/Abstracts/BaseApplication.php @@ -18,15 +18,12 @@ use HttpServer\Http\Response; use HttpServer\HttpFilter; use HttpServer\Route\Router; use HttpServer\Server; -use HttpServer\Service\Http; -use HttpServer\Service\Packet; -use HttpServer\Service\Receive; -use HttpServer\Service\Websocket; use HttpServer\Shutdown; use JetBrains\PhpStorm\Pure; use Kafka\Producer; use Kafka\TaskContainer; use ReflectionException; +use Server\ServerManager; use Snowflake\Aop; use Snowflake\Async; use Snowflake\Cache\Redis; @@ -38,8 +35,8 @@ use Snowflake\Event; use Snowflake\Exception\InitException; use Snowflake\Exception\NotFindClassException; use Snowflake\Jwt\Jwt; -use Snowflake\Pool\Pool; use Snowflake\Pool\Connection; +use Snowflake\Pool\Pool; use Snowflake\Pool\Redis as SRedis; use Snowflake\Snowflake; use Swoole\Table; @@ -385,12 +382,11 @@ abstract class BaseApplication extends Service /** - * @return Http|Packet|Receive|Websocket|null - * @throws Exception + * @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null */ - public function getSwoole(): Packet|Websocket|Receive|Http|null + public function getSwoole(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null { - return $this->getServer()->getServer(); + return ServerManager::getContext()->getServer(); }