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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -908,7 +908,7 @@ class Events
             if ($last) {
                 $userInfo = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
                 self::BeginOldTalk(self::getkfuid($last['kf_id']), $uid, $last['group_id'], $last['servicelog_id']);
-                print_r([$client_id,$userInfo['client_id']]);
+                print_r([$client_id, $userInfo['client_id']]);
                 if ($client_id == $userInfo['client_id']) {
                     // 查询工单历史会话.
                     $serviceid = $last['servicelog_id'];
@@ -1158,6 +1158,7 @@ class Events
         self::MySendMsg($userInfo['client_id'], json_encode($noticeUser, 256));
 
         // 发送给客服用户信息.
+        $userInfo['intime'] = date("H:i", $userInfo['intime']);
         $noticeKf = [
             'message_type' => 'connect',
             'data' => [