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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -231,7 +231,7 @@ class Events
     {
         // 获取当前会话工单.
         $data = json_decode(self::$redis->HGET('SERVICELOG', $message['conversationId']), true);
-        if (empty($data)) {
+        if (empty($data) || $data['evaluate_id']) {
             return;
         }
         $chat_message = [
@@ -277,12 +277,12 @@ class Events
         // 发送消息.
         if (substr($message['from_id'], 0, 2) === 'KF') {
             // 统计敏感词.
-            $data['alarm_serverSensitive'] += $message['sensitiveNumber'];
+            $data['alarm_serverSensitive'] += (isset($message['sensitiveNumber']) ? intval($message['sensitiveNumber']) : 0);
             $data['serverLastTime'] = time();
             Gateway::sendToClient($data['client_id'], json_encode($chat_message, 256));
         } else {
             // 统计敏感词.
-            $data['alarm_userSensitive'] += $message['sensitiveNumber'];
+            $data['alarm_userSensitive'] += (isset($message['sensitiveNumber']) ? intval($message['sensitiveNumber']) : 0);
             $data['userLastTime'] = time();
             Gateway::sendToClient($data['kf_client_id'], json_encode($chat_message, 256));
         }
@@ -473,6 +473,7 @@ class Events
         self::KFStatusCg($client_id, ['data' => ['uid' => $uid, 'status' => 1]]);
 
         self::SendKFHistoryRecord($client_id, $uid);
+        echo date("Y-m-d H:i:s") . ' - ' . '客服上线-' . $message['name'] . "\n";
 
         return;
     }
@@ -612,7 +613,7 @@ class Events
         $data = [
             'id' => $uid,
             'name' => $message['name'],
-            'avatar' => $message['avatar'],
+            'avatar' => isset($message['avatar']) ? $message['avatar'] : '',
             'website' => $_SESSION['origin'],//$message['website'],
             'browse' => Gateway::browse_info(),
             'system' => Gateway::get_os(),//$message['system'],
@@ -660,7 +661,7 @@ class Events
         $isKefuoff = isset($_SESSION['iskefu']) ? $_SESSION['iskefu'] : 0;
         $uid = isset($_SESSION['uid']) ? $_SESSION['uid'] : false;
 
-        echo "下线：uid: $uid  - cid: $client_id - iskf: $isKefuoff \n";
+        echo date("Y-m-d H:i:s") . ' - ' . "下线：uid: $uid  - cid: $client_id - iskf: $isKefuoff \n";
 
         $isAdmin = self::$redis->sismember('adminList', $client_id);
         if ($isAdmin) {
@@ -687,7 +688,7 @@ class Events
         self::$redis->hdel(self::KFINFOKEY, $uid);
         $uinfo = json_decode($uinfo, true);
         if (empty($uinfo) || empty($group)) {
-            echo "客服发生异常退出\n";
+            echo date("Y-m-d H:i:s") . ' - ' . "客服发生异常退出\n";
             return;
         }
         $user_info = self::$redis->hgetall(self::getKfServiceKey($uid));
@@ -696,7 +697,7 @@ class Events
                 self::MySendMsg($val, json_encode(['message_type' => 'serviceoffline', 'msg' => '客服人员下线!'], 256));
             }
         }
-        echo "客服退出： " . $uid . "\n";
+        echo date("Y-m-d H:i:s") . ' - ' . "客服退出： " . $uid . "\n";
         self::writeLogKfStatus($uid, 0);
         return;
     }
@@ -710,7 +711,7 @@ class Events
         self::$redis->hdel(self::KFINFOKEY, $uid);
         $uinfo = json_decode($uinfo, true);
         if (empty($uinfo)) {
-            echo "客服发生异常退出\n";
+            echo date("Y-m-d H:i:s") . ' - ' . "客服发生异常退出\n";
             return;
         }
         //$user_info = $uinfo['user_info'];
@@ -732,7 +733,7 @@ class Events
         }
 
         $sql = "update `ws_service_log` set `status` = '2',end_time=$now,`servicelog_close_type` = 4   where  start_time>=$starttime  and kf_id=$kfid and  group_id=$group  and  `status`!=2 ";
-        echo "客服退出： " . $uid . "\n";
+        echo date("Y-m-d H:i:s") . ' - ' . "客服退出： " . $uid . "\n";
         self::$db->query($sql);
         self::$db->update('ws_users')->cols(array('online_status' => 0, 'online_connectid' => ''))->where('id=' . $kfid)->query();
         self::$redis->del(self::getKfServiceKey($uid));
@@ -1078,7 +1079,8 @@ class Events
                 'kf_id' => $kfuid,
                 'conversationId' => $serviceid,
                 'serverInfo' => $kfinfo,
-                'kf_name' => $kfinfo['job_name']
+                'kf_name' => $kfinfo['job_name'],
+                'evaluate_id' => 0,
             ]
         ];
         self::MySendMsg($userInfo['client_id'], json_encode($noticeUser, 256));
@@ -1117,6 +1119,7 @@ class Events
                 'user_info' => $userInfo,
                 'conversationId' => $serviceid,
                 'history' => [],
+                'evaluate_id' => 0,
             ]
         ];
         self::MySendMsg($kfinfo['client_id'], json_encode($noticeKf, 256));
@@ -1179,7 +1182,8 @@ class Events
                 'kf_id' => $kfuid,
                 'conversationId' => $serviceid,
                 'serverInfo' => $kfinfo,
-                'kf_name' => $kfinfo['job_name']
+                'kf_name' => $kfinfo['job_name'],
+                'evaluate_id' => isset($data['evaluate_id']) ? intval($data['evaluate_id']) : 0,
             ]
         ];
         self::MySendMsg($userInfo['client_id'], json_encode($noticeUser, 256));
@@ -1191,7 +1195,8 @@ class Events
             'data' => [
                 'user_info' => $userInfo,
                 'conversationId' => $serviceid,
-                'history' => self::getServerChagLog($serviceid)
+                'history' => self::getServerChagLog($serviceid),
+                'evaluate_id' => isset($data['evaluate_id']) ? intval($data['evaluate_id']) : 0,
             ]
         ];
         self::MySendMsg($kfinfo['client_id'], json_encode($noticeKf, 256));

vendor/GatewayWorker_windows/Applications/whisper/Mlogic.php

@@ -104,7 +104,7 @@ class Mlogic
     public static function RedisPing()
     {
         $ret = self::$redis->ping();
-        echo "redisPing: " . date("Y-m-d H:i:s") . ' - ' . $ret . "\n";
+        //echo "redisPing: " . date("Y-m-d H:i:s") . ' - ' . $ret . "\n";
         if (strpos(strtoupper($ret), "PONG") !== false) {
             return true;
         }