Browse Source

'修改转接用户不给欢迎语'

Ethan 6 years ago
parent
commit
001c66794e

+ 3 - 3
application/admin/view/index/index.html

@@ -373,9 +373,9 @@
     };
     };
 
 
     socket.onclose = function(res) {
     socket.onclose = function(res) {
-      layer.alert('实时监控断开', {
-        title: '友情提示', icon: 1, closeBtn: 0
-      }, function(){});
+      layer.alert('实时监控连接失败', {
+        title: '错误提示', icon: 2, closeBtn: 0
+      }, '');
     };
     };
 
 
 
 

+ 51 - 0
application/admin/view/login/aaaa.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache">
+    <meta http-equiv="Expires" content="0">
+    <title>后台登录</title>
+    <link href="__CSS__/login.css" type="text/css" rel="stylesheet">
+    <link rel="shortcut icon" href="__IMG__/favicon.ico">
+</head>
+<body>
+aaaaaaaaaaaaaaaaaaaaaaa
+<script src="__JS__/jquery.min.js" type="text/javascript"></script>
+<script src="__JS__/layui/layui.js" type="text/javascript"></script>
+
+<script>
+  let config = {
+    socket: '{$socket}',
+  };
+  var accounts = JSON.stringify({$accounts});
+  var accounts = JSON.parse(accounts);
+  console.log(accounts);
+  var i = 0;
+  var n = -1;
+  let time = 0;
+  for (i;i<=100;i++) {
+    time += 2000;
+    var t=setTimeout("aaaa()",time);
+  }
+  function aaaa() {
+    let socket = new WebSocket('ws://' + config.socket);
+    socket.onopen = function(res) {
+      n++;
+      console.log('--------------',accounts[n]['account_name'])
+      // 登录
+      let login_data = JSON.stringify({
+        type: 'userInit',
+        data:  {
+          uid: accounts[n]['id'],
+          name: accounts[n]['account_name'],
+          avatar: '',
+          group: 1,
+        }
+      });
+      socket.send(login_data);
+    }
+  }
+</script>
+</body>
+</html>

+ 3 - 3
vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -905,7 +905,7 @@ class Events
     }
     }
 
 
     //开启一个会话
     //开启一个会话
-    private static function BeginTalk($kfuid, $uid, $group, $serviceid = 0, $userInfo = false)
+    private static function BeginTalk($kfuid, $uid, $group, $serviceid = 0, $userInfo = false, $isChangeKF=0)
     {
     {
 
 
         $serviceid = intval($serviceid);
         $serviceid = intval($serviceid);
@@ -972,7 +972,7 @@ class Events
         self::MySendMsg($userInfo['client_id'], json_encode($noticeUser, 256));
         self::MySendMsg($userInfo['client_id'], json_encode($noticeUser, 256));
 
 
         $sayHello = (self::$global->replay)['2'];
         $sayHello = (self::$global->replay)['2'];
-        if (!empty($sayHello) && 1 == $sayHello['status']) {
+        if (!empty($sayHello) && 1 == $sayHello['status'] && !$isChangeKF) {
             $chat_message = [
             $chat_message = [
                 'message_type' => 'chatMessage',
                 'message_type' => 'chatMessage',
                 'data' => [
                 'data' => [
@@ -1546,7 +1546,7 @@ class Events
         ///更新redis数据
         ///更新redis数据
         self::updteKfTasksByservicd($fromkfuid, $serviceid, $user_info['client_id'], 0);
         self::updteKfTasksByservicd($fromkfuid, $serviceid, $user_info['client_id'], 0);
 
 
-        self:: BeginTalk($toukfid, $uid, $groupidto, 0, $user_info);
+        self:: BeginTalk($toukfid, $uid, $groupidto, 0, $user_info, 1);
         self::servicetrutoother('OUT', $fromkfuid, $toukfid, $serviceid, $uid);
         self::servicetrutoother('OUT', $fromkfuid, $toukfid, $serviceid, $uid);
         $newUserInfo = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
         $newUserInfo = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
         self::servicetrutoother('IN', $toukfid, $fromkfuid, $newUserInfo['serverid'], $uid);
         self::servicetrutoother('IN', $toukfid, $fromkfuid, $newUserInfo['serverid'], $uid);