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

application/admin/controller/Sensitivec.php

@@ -53,15 +53,20 @@ class Sensitivec extends Base
     public function addsensitive(){
     	if(request()->isPost()){
 
-            $param = input('post.');
-
-            $has = db('sensitivewords')->field('sensitivewords_id')->where('sensitivewords_word', $param['sensitivewords_word'])->find();
-            if(!empty($has)){
+            $param     = input('post.');
+            $findWhere = [
+                'sensitivewords_word' => $param['sensitivewords_word'],
+                'sensitivewords_for'  => $param['sensitivewords_for'],
+            ];
+
+            $has = db('sensitivewords')->field('sensitivewords_id')->where($findWhere)->find();
+            if (empty($has) === false) {
                 return json(['code' => -1, 'data' => '', 'msg' => '该敏感词已经存在']);
             }
 
-			$param['sensitivewords_time'] = date('Y-m-d H:i:s');
-			$param['sensitivewords_uid']  = session('user_id');
+            $param['sensitivewords_time'] = date('Y-m-d H:i:s');
+            $param['sensitivewords_uid']  = session('user_id');
+
             try {
                 db('sensitivewords')->insert($param);
             } catch(\Exception $e) {

application/admin/view/sensitivec/addsensitive.html

@@ -22,6 +22,7 @@
                 <div class="ibox-content">
                     <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('Sensitivec/addsensitive')}">
 
+                        <input style="display: none" id="type" name="sensitivewords_for" value=""/>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">内容：</label>
                             <div class="input-group col-sm-4">
@@ -71,6 +72,9 @@
 <script src="__JS__/jquery.form.js"></script>
 <script type="text/javascript">
     const myHost = "http://" + window.location.host;
+    const type = getQueryVariable('type');
+    $('#type').val(type);
+
     layui.use(['form', 'upload'], function(){
         var form = layui.form;
 
@@ -82,7 +86,16 @@
         //     $("#robotgroups_id").val(value.value);
         // });
     });
-
+    function getQueryVariable(variable)
+    {
+      var query = window.location.search.substring(1);
+      var vars = query.split("&");
+      for (var i=0;i<vars.length;i++) {
+        var pair = vars[i].split("=");
+        if(pair[0] == variable){return pair[1];}
+      }
+      return(false);
+    }
     layui.use(['form', 'upload'], function(){
         var form = layui.form;
     });

application/admin/view/sensitivec/index.html

@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="ibox-content">
-            <a href="/admin/sensitivec/addsensitive.html">
+            <a id="add" href="/admin/sensitivec/addsensitive.html?type=2">
                 <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新 增</strong>
                 </button>
             </a>
@@ -92,9 +92,11 @@
         if (id == 1) {
             $("#current1").css("background","#eee");
             $("#current2").css("background","#fff");
+            $("#add").attr('href','/admin/sensitivec/addsensitive.html?type=1');
         } else if (id == 2) {
             $("#current2").css({"background":"#eee"});
             $("#current1").css({"background":"#fff"});
+            $("#add").attr('href','/admin/sensitivec/addsensitive.html?type=2');
         }
         initTable()
     }

application/service/controller/Words.php

@@ -184,11 +184,11 @@ class Words extends Common
                 'status'      => input('post.status'),
                 'update_time' => date('Y-m-d H:i:s'),
             ];
-            $deleteResult  = model('Words')->addWords($userWordsData);
+            $addResult     = model('Words')->addWords($userWordsData);
 
             // 参数返回.
-            if (empty($deleteResult) === false) {
-                return json(['code' => 1, 'data' => [], 'msg' => '成功']);
+            if (empty($addResult) === false) {
+                return json(['code' => 1, 'data' => ['id' => $addResult], 'msg' => '成功']);
             } else {
                 return json(['code' => 1, 'data' => [], 'msg' => 1]);
             }

application/service/model/Words.php

@@ -73,7 +73,7 @@ class Words extends Model
      */
     public function addWords($data)
     {
-        $result = $this->insert($data);
+        $result = $this->insertGetId($data);
 
         return $result;
 

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -106,7 +106,7 @@ class Events
             });
 
             // 检查对话时效给出.
-            Timer::add(60, function () {
+            Timer::add(6, function () {
                 self::overTime();
             });
 
@@ -1789,7 +1789,7 @@ class Events
         //$chatLog = self::$db->query("SELECT `servicelog_id`,MAX(`time_line`) FROM `ws_chat_log` WHERE ".$whereOr." group by `servicelog_id`");
         $chatLog = self::$db->query("
                 select * from ws_chat_log as a where  time_line=(
-                  select max(b.time_line) from ws_chat_log as b where a.servicelog_id = b.servicelog_id and (" . $whereOr . ") group by servicelog_id
+                  select max(b.time_line) from ws_chat_log as b where a.servicelog_id = b.servicelog_id and from_id not like 'KF%' and (" . $whereOr . ") group by servicelog_id
                 )
             ");
         $setOvertime = strtotime('-' . (self::$global->overtime['systemconfig_data'] - 60) . ' second');
@@ -1813,7 +1813,6 @@ class Events
                 ];
                 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) {