Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Customer-Service

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -199,8 +199,8 @@ class Events
      */
     public static function onMessage($client_id, $message)
     {
-        if ($message == '{"type":"ping"}' || $message == '{"type":"pong"}') {
-            //Gateway::sendToCurrentClient('{"type":"pong"}');
+        if ($message == '{"type":"ping"}') {
+            Gateway::sendToCurrentClient('{"type":"pong"}');
             return;
         } else {
             //echo "onMessage: " . $message . "\r\n";

vendor/GatewayWorker_windows/Applications/whisper/start_gateway.php

@@ -36,9 +36,9 @@ $gateway->startPort = 2900;
 $gateway->registerAddress = '127.0.0.1:1238';
 
 // 心跳间隔
-$gateway->pingInterval = 10;
+//$gateway->pingInterval = 10;
 // 心跳数据
-$gateway->pingData = '{"message_type":"ping"}';
+//$gateway->pingData = '{"message_type":"ping"}';
 
 
 // 当客户端连接上来时，设置连接的onWebSocketConnect，即在websocket握手时的回调
@@ -52,7 +52,7 @@ $gateway->onConnect = function ($connection) {
 
 
         if ($getToken !== $apiToken) {
-             //$connection->close();
+            //$connection->close();
             // return;
         }
         $_SESSION['remotip'] = $connection->getRemoteIp();