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

application/admin/controller/Report.php

@@ -129,7 +129,7 @@ class Report extends Base
             ],
         ];
         $transfer = model('ServiceturnLog')->countSlg($transferWhere);
-        // 问答比.
+        // 答问比.
         $replyWhere['time_line'] = [
             'between',
             [
@@ -294,7 +294,7 @@ class Report extends Base
         return $return;
     }
 
-  
+
     /**
      * 时间分割
      *

application/admin/view/report/index.html

@@ -67,7 +67,7 @@
                     </div>
                     <div class="ibox-content" style="font-size: 12px; padding: 5px 20px 5px; height: 45px; line-height: 3;">
                         <div style="justify-content: center; display: flex">
-                            <div style="text-align: right;">问答比</div>
+                            <div style="text-align: right;">答问比</div>
                             <div style="margin-left: 20px; text-align: right;">{$reply}%</div>
                         </div>
                     </div>

application/index/controller/Alarm.php

@@ -28,6 +28,7 @@ class Alarm extends Common
         try {
             $conversationId         = input('get.conversationId');
             $type                   = input('get.type');
+            $number                 = input('get.number');
             $where['servicelog_id'] = $conversationId;
             // 获取数据.
             if ($type == '1') {
@@ -35,11 +36,11 @@ class Alarm extends Common
                 $alarm = model('Alarm')->findAlarm($field, $where);
                 // 修改或新增数据.
                 if (empty($alarm) === true) {
-                    $data['alarm_userSensitive'] = 1;
+                    $data['alarm_userSensitive'] = intval($number);
                     $data['servicelog_id']       = $conversationId;
                     model('Alarm')->addAlarm($data);
                 } else {
-                    $data['alarm_userSensitive'] = ($alarm['alarm_userSensitive'] + 1);
+                    $data['alarm_userSensitive'] = ($alarm['alarm_userSensitive'] + intval($number));
                     model('Alarm')->updateAlarm($where, $data);
                 }
             } else {
@@ -47,11 +48,11 @@ class Alarm extends Common
                 $alarm = model('Alarm')->findAlarm($field, $where);
                 // 修改或新增数据.
                 if (empty($alarm) === true) {
-                    $data['alarm_serverSensitive'] = 1;
+                    $data['alarm_serverSensitive'] = intval($number);
                     $data['servicelog_id']         = $conversationId;
                     model('Alarm')->addAlarm($data);
                 } else {
-                    $data['alarm_serverSensitive'] = ($alarm['alarm_serverSensitive'] + 1);
+                    $data['alarm_serverSensitive'] = ($alarm['alarm_serverSensitive'] + intval($number));
                     model('Alarm')->updateAlarm($where, $data);
                 }
             }//end if

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -201,13 +201,13 @@ class Events
      */
     public static function onMessage($client_id, $message)
     {
-        if ($message == '{"type":"ping"}') {
+        /*if ($message == '{"type":"ping"}') {
             Gateway::sendToCurrentClient('{"type":"pong"}');
             return;
         } else {
-            echo "onMessage: " . $message . "\r\n";
-            print_r([self::$global->kfList, self::$global->userList, self::$global->uidSimpleList, self::$global->userToKf]);
-        }
+            //echo "onMessage: " . $message . "\r\n";
+            //print_r([self::$global->kfList, self::$global->userList, self::$global->uidSimpleList, self::$global->userToKf]);
+        }*/
 
         $message = json_decode($message, true);
         if (isset($message['type'])) {