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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -115,9 +115,7 @@ class Events
         }
         unset($advertisement);
 
-        $infos = $_SERVER;
-        unset($infos['GATEWAY_ADDR'], $infos['GATEWAY_PORT']);
-        self::$redis->hset(self::WEBSOCKALLUSER, $client_id, json_encode(array_merge(['time' => date('H:i:s')], $infos)));
+        self::$redis->hset(self::WEBSOCKALLUSER, $client_id, json_encode(['time' => date('H:i:s'), 'ip' => $_SERVER['REMOTE_ADDR'] . ':' . $_SERVER['REMOTE_PORT']]));
     }
 
     /**
@@ -1180,7 +1178,7 @@ class Events
     //获取工单最后20条聊天记录
     private static function getServerChagLog($sericeId, $limit = 20)
     {
-        $ret = self::$db->select('from_id,from_name,to_id,to_name,content')->from('ws_chat_log')->where('servicelog_id=:sid')->bindValues(array('sid' => $sericeId))->orderByDESC(['id'])->limit($limit)->query();
+        $ret = self::$db->select('from_id,from_name,to_id,to_name,content,time_line')->from('ws_chat_log')->where('servicelog_id=:sid')->bindValues(array('sid' => $sericeId))->orderByASC(['id'])->limit($limit)->query();
         if ($ret) {
             rsort($ret);
         }
@@ -1438,7 +1436,7 @@ class Events
                 'time' => date('H:i'),
             ]
         ];
-        Gateway::sendToClient($message['client_id'], json_encode($chat_message, 256));
+        Gateway::sendToCurrentClient(json_encode($chat_message, 256));
     }