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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -473,7 +473,8 @@ class Events
         $uid = intval($message['uid']);
         $group = intval($message['group']);
 
-        if (!isset(self::$global->groupmap[$group])) {
+        $last = self::UserHasOldTalk($uid);
+        if (!isset(self::$global->groupmap[$group])&&!$last) {
             self::MySendMsg($client_id, (json_encode(['message_type' => 'reLoginErr', 'msg' => '不存在客服组....'], 256)));
             return  true;
             //Gateway::closeCurrentClient();
@@ -496,7 +497,6 @@ class Events
             Gateway::closeCurrentClient();
             return;
         }
-        $last = self::UserHasOldTalk($uid);
 
         $onlinekf = self::getOnlineKfData($group, 1);
         if (empty($onlinekf)&&empty($last)) {
@@ -803,7 +803,7 @@ class Events
         }
 
         $allkfgkarr = self::getWorkKfData();
-        if (empty($allkfgkarr)) {
+        if (empty($allkfgkarr)&&!$last) {
             return;
         }
 
@@ -988,13 +988,13 @@ class Events
         $kfinfo = json_decode(self::$redis->hget(self::KFINFOKEY, $kfuid), true);
         $kfUsers = json_decode($kfinfo['user_info'], true);
         foreach ($kfUsers as $key => $value) {
-            if ($value == $uid) {
+            if ($value == $serviceid) {
                 // 删除之前的当前用户连接
                 unset($kfUsers[$key]);
             }
         }
         // 增加现在用户的连接到客服
-        $kfUsers[$userInfo['client_id']] = $uid;
+        $kfUsers[$userInfo['client_id']] = $serviceid;
         $kfinfo['user_info'] = $kfUsers;
         // 将数据存入redis
         self::$redis->hset('KFINFO', $kfuid, json_encode($kfinfo, 256));