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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -343,8 +343,8 @@ class Events
 
         $loginstate = self::$logic->userIsLogin($client_id, $uid, $group);
         if ($loginstate == 1) {
-            self::MySendMsg($oldcontid, (json_encode(['message_type' => 'reLoginErr', 'msg' => '正在登陆中，请稍后...'], 256)));
-            Gateway::closeClient($oldcontid);
+            self::MySendMsg($client_id, (json_encode(['message_type' => 'reLoginErr', 'msg' => '正在登陆中，请稍后...'], 256)));
+            Gateway::closeClient($client_id);
             return;
         }