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";
@@ -1022,7 +1022,7 @@ class Events
                 'id' => $userId
             ]
         ];
-        Gateway::sendToClient($kfList[$groupId]['KF'.$kf_id]['client_id'], json_encode($del_message, 256));
+        Gateway::sendToClient($kfList[$groupId][$kf_id]['client_id'], json_encode($del_message, 256));
         unset($del_message);
         // 删除关联.
         if (isset($userToKfNew[$userId])) {
@@ -1802,7 +1802,7 @@ class Events
             if ($v['start_time'] <= $overtime) {
                 $servicelog_id = $v['servicelog_id'];
                 self::$db->query("update `ws_service_log` set `servicelog_close_type` = 2 where `servicelog_id`= '$servicelog_id'");
-                self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], $v['kf_id'], $v['group_id']);
+                self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], 'KF'.$v['kf_id'], $v['group_id']);
                 // 如果小于设定时间前一分钟则给出提示.
             } elseif ($v['start_time'] <= $setOvertime) {
                 $chat_message = [
@@ -1820,7 +1820,7 @@ class Events
                 if ($v['start_time'] <= $unoperated) {
                     $servicelog_id = $v['servicelog_id'];
                     self::$db->query("update `ws_service_log` set `servicelog_close_type` = 1 where `servicelog_id`= '$servicelog_id'");
-                    self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], $v['kf_id'], $v['group_id']);
+                    self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], 'KF'.$v['kf_id'], $v['group_id']);
                     // 如果小于设定时间前一分钟则给出提示.
                 } elseif ($v['start_time'] <= $setUnoperated) {
                     $chat_message = [
@@ -1840,7 +1840,7 @@ class Events
                 $found_key = array_search($v['servicelog_id'], array_column($serviceLog, 'servicelog_id'));
                 $servicelog_id = $v['servicelog_id'];
                 self::$db->query("update `ws_service_log` set `servicelog_close_type` = 1 where `servicelog_id`= '$servicelog_id'");
-                self::serverClose($serviceLog[$found_key]['client_id'], $servicelog_id, $serviceLog[$found_key]['user_id'], $serviceLog[$found_key]['kf_id'], $serviceLog[$found_key]['group_id']);
+                self::serverClose($serviceLog[$found_key]['client_id'], $servicelog_id, $serviceLog[$found_key]['user_id'], 'KF'.$serviceLog[$found_key]['kf_id'], $serviceLog[$found_key]['group_id']);
                 // 如果对话为客服的最后一次对话且时间小于设定时间前一分钟则给出提示.
             } elseif ($v['time_line'] <= $setUnoperated) {
                 $chat_message = [

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();