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

application/common/KfjkLogic.php

@@ -8,7 +8,7 @@
 
 namespace App\common;
 
-use app\admin\model\Kfonline;
+use app\admin\model\Kfonline as KfonlineModel;
 use app\admin\model\Users;
 use think\Db;
 
@@ -92,7 +92,7 @@ class KfjkLogic
                 $groupuserArray[$val['id']] = $val['id'];
             }
         }
-        $statusArr = (new Kfonline())->getOnlineAll($onlinestatus);
+        $statusArr = (new KfonlineModel())->getOnlineAll($onlinestatus);
         $return = array_intersect($groupuserArray, $statusArr);
         return $return;
     }

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -578,7 +578,7 @@ class Events
         }
 
         if (isset($kfList[$message['group']][$message['uid']])) {
-            Gateway::sendToCurrentClient(json_encode(['type' => 'reLoginErr', 'msg' => '你的账号已经登陆过，请先退出再登陆'], 256));
+            Gateway::sendToCurrentClient(json_encode(['message_type' => 'reLoginErr', 'msg' => '你的账号已经登陆过，请先退出再登陆'], 256));
             Gateway::closeCurrentClient();
             return;
         }