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

application/admin/controller/Robot.php

@@ -33,14 +33,14 @@ class Robot extends Base
             $result = model('Robot')->selectJoin($field, $join, $where, $offset, $limit);
             foreach ($result as $key => $vo) {
                 // 优化显示状态.
-                if(1 === $vo['robot_status']) {
+                if(1 == $vo['robot_status']) {
                     $result[$key]['robot_status'] = '<span style="color: #2fbe1b">启用</span>';
                 } else {
                     $result[$key]['robot_status'] = '<span style="color: red">禁用</span>';
                 }
 
                 // 优化显示热点问题.
-                if (1 === $vo['robot_host']) {
+                if (1 == $vo['robot_host']) {
                     $result[$key]['robot_host'] = '<span style="color: #2fbe1b">是</span>';
                 } else {
                     $result[$key]['robot_host'] = '<span style="color: red">否</span>';

application/admin/controller/Sensitivec.php

@@ -28,7 +28,7 @@ class Sensitivec extends Base
 
             foreach ($result as $key => $vo) {
                 // 优化显示状态.
-                if(1 === $vo['sensitivewords_status']) {
+                if(1 == $vo['sensitivewords_status']) {
                     $result[$key]['sensitivewords_status'] = '<span style="color: #2fbe1b">启用</span>';
                 } else {
                     $result[$key]['sensitivewords_status'] = '<span style="color: red">禁用</span>';

application/admin/view/index/index.html

@@ -103,7 +103,7 @@
                 <h5>当前会话</h5>
             </div>
             <div class="ibox-title" id="current2" style="width: 100px; cursor:pointer; background: #eee" onclick="current(2)">
-                <h5>在线客服</h5>
+                <h5>登陆客服</h5>
             </div>
             <div class="ibox-title" style="width: calc(100% - 200px); background: #eee;">
             </div>
@@ -182,13 +182,13 @@
                         </div>
                     </div>
                     <div class="form-group" style="margin-left: 40px">
-                        <label>报警状态：</label>
+                        <label>登陆状态：</label>
                         <div class="input-group col-sm-4 layui-form" style="width: 120px;">
                             <select lay-verify="required" lay-filter="alarm"  name="type2" id="type2">
                                 <option value="">所有状态</option>
                                 <option value="1">在线状态</option>
-                                <option value="2">休息状态</option>
-                                <option value="3">隐身状态</option>
+                                <option value="3">休息状态</option>
+                                <option value="2">隐身状态</option>
                             </select>
                         </div>
                     </div>
@@ -218,11 +218,11 @@
                         <thead>
                         <th data-field="uidname">客服</th>
                         <th data-field="hhl">当前会话量</th>
-                        <th data-field="jdl">接待量</th>
-                        <th data-field="pjhysc">平均会话时长</th>
-                        <th data-field="cpl">参评率</th>
-                        <th data-field="mydl">满意度率</th>
-                        <th data-field="pjxysc">平均响应时长</th>
+                        <th data-field="jdl">今日接待量</th>
+                        <th data-field="pjhysc">今日平均会话时长</th>
+                        <th data-field="cpl">今日参评率</th>
+                        <th data-field="mydl">今日满意度</th>
+                        <th data-field="pjxysc">今日平均响应时长</th>
                         <th data-field="jrxxsc">今日休息时长</th>
                         <th data-field="fxx">发消息</th>
                         </thead>

application/index/controller/Alarm.php

@@ -30,7 +30,7 @@ class Alarm extends Common
             $type                   = input('get.type');
             $where['servicelog_id'] = $conversationId;
             // 获取数据.
-            if ($type === '1') {
+            if ($type == '1') {
                 $field = ['alarm_userSensitive'];
                 $alarm = model('Alarm')->findAlarm($field, $where);
                 // 修改或新增数据.

application/index/controller/Register.php

@@ -114,6 +114,7 @@ class Register extends Common
                 if ($old['status'] != 1) {
                     return json(['code' => 0, 'data' => [], 'msg' => '禁止登陆']);
                 }
+                Db::name('accounts')->where(['token' => $token])->update(['last_login_time' => time()]);
                 return json(['code' => 1, 'data' => ['id' => $old['id'], 'name' => $old['account_name'], 'token' => $old['token'], 'avatar' => $avatar], 'msg' => '注册成功']);
             }
         }
@@ -121,6 +122,7 @@ class Register extends Common
 
         $old = Db::name('accounts')->where(['account_name' => $nowuid])->find();
         if ($old) {
+            Db::name('accounts')->where(['account_name' => $nowuid])->update(['last_login_time' => time()]);
             return json(['code' => 1, 'data' => ['id' => $old['id'], 'name' => $nowuid, 'token' => $old['token'], 'avatar' => $avatar], 'msg' => '注册成功']);
         }
 

application/service/controller/History.php

@@ -84,7 +84,7 @@ class History extends Common
             $evaluate        = model('Evaluate')->getEvaluate();
             foreach ($serviceLog as $k => $v) {
                 foreach ($evaluate as $va) {
-                    if ($v->evaluate_id === $va->evaluate_id) {
+                    if ($v->evaluate_id == $va->evaluate_id) {
                         $serviceLog[$k]->evaluate_name = $va->evaluate_name;
                     }
                 }
@@ -153,13 +153,13 @@ class History extends Common
             // 会话超时.
             $cvtOvertime = 0;
             foreach ($systemconfig as $v) {
-                if ($v['systemconfig_enName'] === 'verifyReturnTime') {
+                if ($v['systemconfig_enName'] == 'verifyReturnTime') {
                     if ($v['systemconfig_data'] < $alarm['alarm_corresponding']) {
                         $verifyReturnTime = 1;
                     }
                 }
 
-                if ($v['systemconfig_enName'] === 'verifyAllTime') {
+                if ($v['systemconfig_enName'] == 'verifyAllTime') {
                     if ($v['systemconfig_data'] < $alarm['alarm_cvtOvertime']) {
                         $cvtOvertime = 1;
                     }

application/service/controller/Login.php

@@ -32,10 +32,10 @@ class Login extends Controller
             return json(['code' => -3, 'data' => '', 'msg' => '此账号已禁用']);
         }
 
-        $has = db('kfonline')->where('uid','KF'.$user['id'])->select();
+        /*$has = db('kfonline')->where('uid','KF'.$user['id'])->select();
         if(!empty($has)){
             return json(['code' => -4, 'data' => '', 'msg' => '此账号已登录']);
-        }
+        }*/
 
         if(md5($password . config('salt')) != $user['user_pwd']){
             return json(['code' => -2, 'data' => '', 'msg' => '密码错误']);

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -80,7 +80,7 @@ class Events
         }
 
         // 定时统计数据
-        if (0 === $worker->id) {
+        if (0 == $worker->id) {
 
             self::writeLogKfStatus(0, 0, 0);
 
@@ -106,7 +106,7 @@ class Events
             });
 
             // 检查对话时效给出.
-            Timer::add(60, function () {
+            Timer::add(6, function () {
                 self::overTime();
             });
 
@@ -392,12 +392,16 @@ class Events
                 // 客服关闭会话.
                 case 'kfCloseUser':
                     $userId = $message['data']['to_id'];
+                    $kfId = $message['data']['kf_id'];
+                    $groupId = $message['data']['group_id'];
                     $client = Gateway::getClientIdByUid($userId);
+                    $servicelog_id = $message['data']['conversationId'];
+                    self::$db->query("update `ws_service_log` set `servicelog_close_type` = 3 where `servicelog_id`= '$servicelog_id'");
                     if (!empty($client)) {
                         $clientId = $client['0'];
-                        $servicelog_id = $message['data']['conversationId'];
-                        self::$db->query("update `ws_service_log` set `servicelog_close_type` = 3 where `servicelog_id`= '$servicelog_id'");
-                        self::serverClose($clientId, $servicelog_id);
+                        self::serverClose($clientId, $servicelog_id, $userId, $kfId, $groupId);
+                    } else {
+                        self::closeUser($servicelog_id, $userId, $kfId, $groupId);
                     }
                     break;
                 // 客服更改状态.
@@ -455,7 +459,7 @@ class Events
             'data' => [],
         ];
         $nowkfid = isset($_SESSION['uid']) ? $_SESSION['uid'] : 0;
-        $fromgrouupid = isset($_SESSION['uid']) ? $_SESSION['group'] : 0;
+        $fromgrouupid = isset($_SESSION['group']) ? $_SESSION['group'] : 0;
 
         if (empty($fromgrouupid) || empty($nowkfid)) {
             return $return;
@@ -465,7 +469,7 @@ class Events
         $groupnamemap = self::$global->groupmap;
 
 
-        if (!$kfs || empty($nowkfid)) {
+        if (!$kfs || empty($groupnamemap)) {
             return $return;
         }
 
@@ -473,7 +477,7 @@ class Events
 
         foreach ($kfs as $gruop => $users) {
             foreach ($users as $uid => $uinfo) {
-                if ($uid != $nowkfid && $fromgrouupid == $gruop) {
+                if ($uid != $nowkfid && $fromgrouupid == $gruop && $uinfo['status'] == 1) {
                     $ret[] = ['groupid' => $gruop, 'groupname' => $groupnamemap[$gruop], 'kfuid' => $uid, 'kfname' => $uinfo['name'], 'kfjobname' => $uinfo['job_name']];
                 }
             }
@@ -622,9 +626,10 @@ class Events
         }
 
         if (isset($kfList[$message['group']][$message['uid']])) {
-            Gateway::sendToCurrentClient(json_encode(['message_type' => 'reLoginErr', 'msg' => '你的账号已经登陆过，请先退出再登陆'], 256));
-            Gateway::closeCurrentClient();
-            return;
+            $oldcontid = $kfList[$message['group']][$message['uid']]['client_id'];
+            Gateway::sendToClient($oldcontid, (json_encode(['message_type' => 'reLoginErr', 'msg' => '你的账号在其它登陆，本次下线'], 256)));
+            Gateway::closeClient($oldcontid);
+            sleep(3);
         }
 
         // 如果该客服未在内存中记录则记录
@@ -875,14 +880,18 @@ class Events
         $kfuid = -1;
         $krclient_id = 0;
         $kfgroup = -1;
+        $istalking = 1;
 
         $userToKf = $userToKfNew = self::$global->userToKf;
         if (isset($userToKfNew[$uid])) {
             $kfuid = isset($userToKfNew[$uid]['1']) ? $userToKfNew[$uid]['1'] : -1;
             $krclient_id = isset(Gateway::getClientIdByUid($kfuid)['0']) ? Gateway::getClientIdByUid($kfuid)['0'] : 0;
+
+            /*用户可能意外掉线，还可以再连上来的情况下，暂不删除些关联，待公单关闭时再删除
             unset($userToKfNew[$uid]);
             do {
             } while (!self::$global->cas('userToKf', $userToKf, $userToKfNew));
+            */
         }
 
         $uidSimpleList = $uidSimpleListNew = self::$global->uidSimpleList;
@@ -909,6 +918,7 @@ class Events
                 }
             }
             if ($ischange) {
+                $istalking = 0;
                 do {
                 } while (!self::$global->cas('userList', $userList, $userListNew));
                 Gateway::sendToGroup('group_' . $kfgroup, json_encode(['message_type' => 'kfqueuelength', 'leng' => $group_wait_count], 256));
@@ -954,6 +964,27 @@ class Events
             }
         }
 
+
+    }
+
+
+    /**
+     * 客服结束会话
+     *
+     * tips: 未有$client_id的关闭
+     */
+    public static function closeUser($servicelog_id, $userId, $kf_id, $groupId)
+    {
+        $userToKf = $userToKfNew = self::$global->userToKf;
+        $kfList = $userToKfNew = self::$global->kfList;
+        $del_message = [
+            'message_type' => 'delUser',
+            'data' => [
+                'id' => $userId
+            ]
+        ];
+        Gateway::sendToClient($kfList[$groupId]['KF'.$kf_id]['client_id'], json_encode($del_message, 256));
+        unset($del_message);
     }
 
 
@@ -964,7 +995,7 @@ class Events
      * tips: 当服务端主动退出的时候，会出现 exit status 9.原因是：服务端主动断开之后，连接的客户端会走这个方法，而短时间内进程
      * 需要处理这多的逻辑，又有cas操作，导致进程退出会超时，然后会被内核杀死，从而报出错误 9.实际对真正的业务没有任何的影响。
      */
-    public static function serverClose($client_id, $servicelog_id)
+    public static function serverClose($client_id, $servicelog_id, $userId, $kf_id, $groupId)
     {
         // 返回.
         $chat_message = [
@@ -981,6 +1012,24 @@ class Events
         //echo "客户退出：". $sql ."\n";
         self::$db->query($sql);
         $isServiceUserOut = false;
+        $noticeIs = 0;
+
+        $userToKf = $userToKfNew = self::$global->userToKf;
+        $kfList = $userToKfNew = self::$global->kfList;
+        $del_message = [
+            'message_type' => 'delUser',
+            'data' => [
+                'id' => $userId
+            ]
+        ];
+        Gateway::sendToClient($kfList[$groupId]['KF'.$kf_id]['client_id'], json_encode($del_message, 256));
+        unset($del_message);
+        // 删除关联.
+        if (isset($userToKfNew[$userId])) {
+            unset($userToKfNew[$userId]);
+            do {
+            } while (!self::$global->cas('userToKf', $userToKf, $userToKfNew));
+        }
 
         // 修改会话时长
         $serviceLog = self::$db->query("select `start_time`,`intime` from `ws_service_log` where `servicelog_id`= '$servicelog_id'");
@@ -1022,14 +1071,6 @@ class Events
                     $outUser = self::$db->query("select `user_id`,`group_id` from `ws_service_log` where `client_id`= '" . $client_id . "'");
                     // 通知 客服删除退出的用户
                     if (!empty($outUser)) {
-                        $del_message = [
-                            'message_type' => 'delUser',
-                            'data' => [
-                                'id' => $outUser['0']['user_id']
-                            ]
-                        ];
-                        Gateway::sendToClient($vo['client_id'], json_encode($del_message, 256));
-                        unset($del_message);
 
                         // 尝试分配新会员进入服务
                         self::userOfflineTask($outUser['0']['group_id']);
@@ -1221,8 +1262,32 @@ class Events
                     }
                     break;
                 case -2:
+                    $waitMsg = '暂时没有客服上班,请稍后再咨询。';
+                    // 逐一通知
+                    foreach (self::$global->userList as $vo) {
+
+                        $waitMessage = [
+                            'message_type' => 'wait',
+                            'data' => [
+                                'content' => $waitMsg,
+                            ]
+                        ];
+                        Gateway::sendToClient($vo['client_id'], json_encode($waitMessage, 256));
+                    }
                     break;
                 case -3:
+                    $waitMsg = '暂时没有客服上班,请稍后再咨询。';
+                    // 逐一通知
+                    foreach (self::$global->userList as $vo) {
+
+                        $waitMessage = [
+                            'message_type' => 'wait',
+                            'data' => [
+                                'content' => $waitMsg,
+                            ]
+                        ];
+                        Gateway::sendToClient($vo['client_id'], json_encode($waitMessage, 256));
+                    }
                     break;
                 case -4:
                     // 逐一通知
@@ -1363,7 +1428,7 @@ class Events
 
                 case -1:
                     $waitMsg = '暂时没有客服上班,请稍后再咨询。';
-                    Gateway::sendToClient($client_id, json_encode(['message_type' => "noservice", 'data' => ['content' => $waitMsg]], 256));
+                    Gateway::sendToClient($client_id, json_encode(['message_type' => "notice", 'content' => $waitMsg], 256));
                     Gateway::closeClient($client_id);
                     return;
                     break;
@@ -1711,7 +1776,7 @@ class Events
             }
         }
         // 查询未断开的工单.
-        $serviceLog = self::$db->query("SELECT `servicelog_id`,`client_id`,`start_time` FROM `ws_service_log` WHERE `status`='1' OR `status`='3'");
+        $serviceLog = self::$db->query("SELECT `servicelog_id`,`client_id`,`start_time`,`user_id`,`kf_id`,`group_id` FROM `ws_service_log` WHERE `status`='1' OR `status`='3'");
         $whereOr = '1=0';
         foreach ($serviceLog as $k => $v) {
             if ($k == 0) {
@@ -1732,14 +1797,30 @@ class Events
         $setUnoperated = strtotime('-' . (self::$global->unoperated['systemconfig_data'] - 60) . ' second');
         $unoperated = strtotime('-' . (self::$global->unoperated['systemconfig_data']) . ' second');
         $noResponse = strtotime('-' . (self::$global->noResponse['systemconfig_data']) . ' second');
-        // 访客静默超时.
         foreach ($serviceLog as $k => $v) {
+            // 会话超时关闭.
+            if ($v['start_time'] <= $overtime) {
+                $servicelog_id = $v['servicelog_id'];
+                self::$db->query("update `ws_service_log` set `servicelog_close_type` = 2 where `servicelog_id`= '$servicelog_id'");
+                self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], $v['kf_id'], $v['group_id']);
+                // 如果小于设定时间前一分钟则给出提示.
+            } elseif ($v['start_time'] <= $setOvertime) {
+                $chat_message = [
+                    'message_type' => 'overtime',
+                    'data' => [
+                        'content' => self::$global->overtime['systemconfig_content'],
+                    ]
+                ];
+                Gateway::sendToClient($v['client_id'], json_encode($chat_message, 256));
+            }
+
+            // 访客静默超时.
+            // 如果没有说一句话.
             if (!strlen(array_search($v['servicelog_id'], array_column($chatLog, 'servicelog_id')))) {
-                // 如果小于设定时间则关闭会话.
                 if ($v['start_time'] <= $unoperated) {
                     $servicelog_id = $v['servicelog_id'];
                     self::$db->query("update `ws_service_log` set `servicelog_close_type` = 1 where `servicelog_id`= '$servicelog_id'");
-                    self::serverClose($v['client_id'], $servicelog_id);
+                    self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], $v['kf_id'], $v['group_id']);
                     // 如果小于设定时间前一分钟则给出提示.
                 } elseif ($v['start_time'] <= $setUnoperated) {
                     $chat_message = [
@@ -1752,17 +1833,16 @@ class Events
                 }
             }
         }
-        // 循环检测会话时效,会话超时关闭.
+        // 访客静默超时.如果说了话
         foreach ($chatLog as $k => $v) {
-            $toWho = substr($v['to_id'], 0, 2);
             // 如果对话为客服的最后一次对话且时间小于设定时间则结束工单.
-            if ($v['time_line'] <= $overtime) {
+            if ($v['time_line'] <= $unoperated) {
                 $found_key = array_search($v['servicelog_id'], array_column($serviceLog, 'servicelog_id'));
                 $servicelog_id = $v['servicelog_id'];
-                self::$db->query("update `ws_service_log` set `servicelog_close_type` = 2 where `servicelog_id`= '$servicelog_id'");
-                self::serverClose($serviceLog[$found_key]['client_id'], $servicelog_id);
+                self::$db->query("update `ws_service_log` set `servicelog_close_type` = 1 where `servicelog_id`= '$servicelog_id'");
+                self::serverClose($serviceLog[$found_key]['client_id'], $servicelog_id, $serviceLog[$found_key]['user_id'], $serviceLog[$found_key]['kf_id'], $serviceLog[$found_key]['group_id']);
                 // 如果对话为客服的最后一次对话且时间小于设定时间前一分钟则给出提示.
-            } elseif ($v['time_line'] <= $setOvertime) {
+            } elseif ($v['time_line'] <= $setUnoperated) {
                 $chat_message = [
                     'message_type' => 'overtime',
                     'data' => [