修复 Workerman Gateway 兼容性 (#469)

* 修复 Workerman Gateway 兼容性 * 修复测试
imiphp · Feb 10, 2023 · 66e6c0a · 66e6c0a
1 parent bb426d4
commit 66e6c0a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/src/Components/workerman-gateway/src/Swoole/Listener/AppRunListener.php b/src/Components/workerman-gateway/src/Swoole/Listener/AppRunListener.php
@@ -25,6 +25,11 @@ public function handle(EventParam $e): void
             if ($registerAddress = Config::get('@app.mainServer.workermanGateway.registerAddress'))
             {
                 Gateway::$registerAddress = $registerAddress;
+                // @phpstan-ignore-next-line
+                if (isset(Gateway::$persistentConnection))
+                {
+                    Gateway::$persistentConnection = false;
+                }
             }
         }
     }

diff --git a/src/Components/workerman-gateway/src/Swoole/Server/Business/TcpBusinessServer.php b/src/Components/workerman-gateway/src/Swoole/Server/Business/TcpBusinessServer.php
@@ -67,6 +67,11 @@ protected function initGatewayWorker(): void
             if (isset($workermanGatewayConfig['registerAddress']))
             {
                 Gateway::$registerAddress = $workermanGatewayConfig['registerAddress'];
+                // @phpstan-ignore-next-line
+                if (isset(Gateway::$persistentConnection))
+                {
+                    Gateway::$persistentConnection = false;
+                }
             }
 
             Coroutine::create(function () use ($workermanGatewayConfig) {

diff --git a/src/Components/workerman-gateway/src/Swoole/Server/Business/WebSocketBusinessServer.php b/src/Components/workerman-gateway/src/Swoole/Server/Business/WebSocketBusinessServer.php
@@ -67,6 +67,11 @@ protected function initGatewayWorker(): void
             if (isset($workermanGatewayConfig['registerAddress']))
             {
                 Gateway::$registerAddress = $workermanGatewayConfig['registerAddress'];
+                // @phpstan-ignore-next-line
+                if (isset(Gateway::$persistentConnection))
+                {
+                    Gateway::$persistentConnection = false;
+                }
             }
 
             Coroutine::create(function () use ($workermanGatewayConfig) {

diff --git a/src/Components/workerman-gateway/src/Workerman/Listener/AppRunListener.php b/src/Components/workerman-gateway/src/Workerman/Listener/AppRunListener.php
@@ -27,6 +27,11 @@ public function handle(EventParam $e): void
                 if (isset($item['configs']['registerAddress']))
                 {
                     Gateway::$registerAddress = $item['configs']['registerAddress'];
+                    // @phpstan-ignore-next-line
+                    if (isset(Gateway::$persistentConnection))
+                    {
+                        Gateway::$persistentConnection = false;
+                    }
                     break;
                 }
             }

diff --git a/src/Components/workerman/src/Server/Base.php b/src/Components/workerman/src/Server/Base.php
@@ -338,6 +338,11 @@ protected function bindEvents(): void
                 if (isset($config['configs']['registerAddress']) && class_exists(Gateway::class))
                 {
                     Gateway::$registerAddress = $config['configs']['registerAddress'];
+                    // @phpstan-ignore-next-line
+                    if (isset(Gateway::$persistentConnection))
+                    {
+                        Gateway::$persistentConnection = false;
+                    }
                 }
 
                 Event::trigger('IMI.WORKERMAN.SERVER.WORKER_START', [