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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -461,7 +461,7 @@ class Events
 
         $loginstate = self::$logic->userIsLogin($client_id, $uid, $group);
         if ($loginstate == 1) {
-            self::MySendMsg($oldcontid, (json_encode(['message_type' => 'reLoginErr', 'msg' => '正在登陆中，请稍后...'], 256)));
+            self::MySendMsg($client_id, (json_encode(['message_type' => 'reLoginErr', 'msg' => '正在登陆中，请稍后...'], 256)));
             Gateway::closeCurrentClient();
             return;
         }
@@ -1079,7 +1079,7 @@ class Events
      * @param $client_id 服务ID
      * @param $message 数据
      */
-    private static function toRobot($message)
+    private static function toRobot($client_id, $message)
     {
         $groups_id = $message['data']['groups_id'];
         $robot_name = $message['data']['robot_name'];