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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -719,8 +719,10 @@ class Events
         $uinfo = self::$redis->hget(self::KFINFOKEY, $uid);
         self::$redis->hdel(self::KFINFOKEY, $uid);
         $uinfo = json_decode($uinfo, true);
+        self::writeLogKfStatus($uid, 0);
+
         if (empty($uinfo) || empty($group)) {
-            echo date("Y-m-d H:i:s") . ' - ' . "客服发生异常退出\n";
+            echo date("Y-m-d H:i:s") . ' - ' . "客服发生异常退出." . print_r([$client_id, $uid, $group, $uinfo], true) . "\n";
             return;
         }
         $user_info = self::$redis->hgetall(self::getKfServiceKey($uid));
@@ -729,8 +731,7 @@ class Events
                 self::MySendMsg($val, json_encode(['message_type' => 'serviceoffline', 'msg' => '客服人员下线!'], 256));
             }
         }
-        //echo date("Y-m-d H:i:s") . ' - ' . "客服退出： " . $uid . "\n";
-        self::writeLogKfStatus($uid, 0);
+
         return;
     }
 

vendor/GatewayWorker_windows/Applications/whisper/Mlogic.php

@@ -66,7 +66,7 @@ class Mlogic
         }
 
         $conf = require(self::$configPath . 'database.php');
-        self::$db = new \Workerman\MySQL\Connection($conf['hostname'], $conf['hostport'], $conf['username'], $conf['password'], $conf['database']);
+        self::$db = new \Workerman\MySQL\Connection($conf['hostname'], $conf['hostport'], $conf['username'], $conf['password'], $conf['database'], $conf['charset']);
 
 
         return self::$db;