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

application/admin/controller/Messages.php

@@ -73,7 +73,7 @@ class Messages extends Base
                         $result[$key]['image'] = $img;
                     }
                 }
-                
+
                 // 优化时间
                 if(null != $vo['add_time']){
                     $result[$key]['add_time'] = date('Y-m-d H:m:s',$result[$key]['add_time']);

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/admin/view/kfnotice/index.html

@@ -105,7 +105,7 @@
                         <!--</div>-->
                     <!--</div>-->
 
-                    <div class="form-group" style="margin-left: 10px;">
+                    <div class="form-group">
                         <input type="text" class="form-control" id="txttext" name="txttext" placeholder="文本" style="height: 30px;">
                     </div>
 

application/admin/view/system/conversation.html

@@ -85,7 +85,7 @@
                         <div class="ibox-title">
                         </div>
                         <div class="form-group" style="flex-wrap: wrap; display: flex">
-                            <p style="width: 100%; margin-left: 20px; color: #9c9c9c; margin-bottom: 15px; font-size: 15px;">设置会话回合数后，会话回合数低于设置的值时，访客端右上角评价按钮隐藏，所有系统邀评都不触发。</p>
+                            <p style="width: 100%; margin-left: 20px; color: #9c9c9c; margin-bottom: 15px; font-size: 15px;">设置会话回合数后，会话聊天条数没超过设置的值时，访客端右上角评价按钮隐藏，所有系统邀评都不触发。系统消息条数不计算在内。</p>
                             <label class="col-sm-3 control-label">起始值：</label>
                             <div class="input-group col-sm-1" style="width: 45px">
                                 <input type="text" class="form-control" name="round" required="" aria-required="true" value="{$systemconfig[4]['systemconfig_data']}">

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);

application/service/model/Services.php

@@ -6,17 +6,27 @@ use think\Model;
 class Services extends Model
 {
     //检测token
+//    function checktoken($token){
+//        $user = db('users')->where('token', $token)->find();
+//        if(!empty($user)){
+//            $time = time()-$user['expire_time'];
+//            if($time<3600){
+//                db('users')->where('id', $user['id'])->update(['expire_time' => time()]);
+//                $user_id = explode('/',base64_decode($token))['2'];
+//                return $user_id;
+//            }else{
+//                return -1;
+//            }
+//        }
+//        return -1;
+//    }
+
     function checktoken($token){
         $user = db('users')->where('token', $token)->find();
         if(!empty($user)){
-            $time = time()-$user['expire_time'];
-            if($time<3600){
-                db('users')->where('id', $user['id'])->update(['expire_time' => time()]);
-                $user_id = explode('/',base64_decode($token))['2'];
-                return $user_id;
-            }else{
-                return -1;
-            }
+            db('users')->where('id', $user['id'])->update(['expire_time' => time()]);
+            $user_id = explode('/',base64_decode($token))['2'];
+            return $user_id;
         }
         return -1;
     }

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) {