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

application/admin/controller/Report.php

@@ -154,7 +154,7 @@ class Report extends Base
             'allQueue' => $allQueue,
             'transfer' => floor($transfer / 2),
             'reply' => ($allChatLog ? sprintf("%.2f", (($reply / ($allChatLog - $reply)) * 100)) : '--'),
-            'waitTime' => ($allService ? ceil($alllWaitTime / $allService) : '--'),
+            'waitTime' => ($allQueue ? ceil($alllWaitTime / $allQueue) : '--'),
             'serviceTime' => ($allService ? ceil($serviceTime / $allService) : '--'),
             'cpdTime' => ($allService ? ceil($cpdTime / $allService) : '--'),
             'evaluateGood' => (($evaluateGood + $evaluateSecondary + $evaluateBad) ? sprintf("%.2f", (($evaluateGood / ($evaluateGood + $evaluateSecondary + $evaluateBad)) * 100)) : '--'),

application/service/controller/Common.php

@@ -34,7 +34,8 @@ class Common extends Base
             // 验证用户token.
             $users         = model('users')->findUsers($usersField, $usersWhere);
             $effectiveTime = strtotime(date('Y-m-d H:i:s').'-1 hours');
-            if (empty($users) === false && $effectiveTime <= $users['expire_time']) {
+            //if (empty($users) === false && $effectiveTime <= $users['expire_time']) {
+            if (empty($users) === false) {
                 $updateWhere['id']         = $users['id'];
                 $updateData['expire_time'] = strtotime(date('Y-m-d H:i:s'));
                 model('users')->updateUsers($updateWhere, $updateData);

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -1460,7 +1460,7 @@ class Events
             return;
         }
         $data['evaluate_id'] = $message['evaluate_id'];
-        $data['evaluate_content'] = $message['evaluate_content'];
+        //$data['evaluate_content'] = $message['evaluate_content'];
         self::$redis->HSET('SERVICELOG', $message['conversationId'], json_encode($data, 256));
         $chat_message = [
             'message_type' => 'evaluate',
@@ -1485,7 +1485,7 @@ class Events
             self::$global->systemconfig = $arr;
         }
 
-        $group = self::$db->query("SELECT *  FROM `ws_groups`");
+        $group = self::$db->query("SELECT *  FROM `ws_groups` where `status` = 1");
         $arr = [];
         if ($group) {
             foreach ($group as $val) {
@@ -2170,6 +2170,7 @@ class Events
         if ($gkf) {
             $cc = count($gkf) * $max;
             if ($count >= $cc) {
+                self::todayqueuelength();
                 return true;
             }
         }