ff

application/admin/view/accounts/addlabel.html

@@ -74,7 +74,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/accounts/editlabel.html

@@ -74,7 +74,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/accounts/label.html

@@ -108,7 +108,7 @@
         layer.confirm('确认删除此标签?', {icon: 3, title:'提示'}, function(index){
             //do something
             $.getJSON("{:url('accounts/delLabel')}", {'id' : id}, function(res){
-              let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+              let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
               socket.onopen = function(res) {
                 console.log('握手成功');
                 socket.send(JSON.stringify({

application/admin/view/groups/addgroup.html

@@ -80,7 +80,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/groups/editgroup.html

@@ -80,7 +80,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket('wss://' + config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/groups/index.html

@@ -122,7 +122,7 @@
         layer.confirm('确认删除此分组?', {icon: 3, title:'提示'}, function(index){
             //do something
             $.getJSON("{:url('groups/delGroup')}", {'id' : id}, function(res){
-              let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+              let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
               socket.onopen = function(res) {
                 console.log('握手成功');
                 socket.send(JSON.stringify({

application/admin/view/index/index.html

@@ -349,7 +349,7 @@
   let host = getLocation.split('/admin')[0];
   //let apiToken = hex_md5('customer-service'+date+host);
   let apiToken = hex_md5('customer-service'+host);
-  let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+  let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
   socket.onopen = function(res) {
     console.log('握手成功');
     // 登录

application/admin/view/login/aaaa.html

@@ -29,7 +29,7 @@ aaaaaaaaaaaaaaaaaaaaaaa
     var t=setTimeout("aaaa()",time);
   }
   function aaaa() {
-    let socket = new WebSocket('ws://' + config.socket);
+    let socket = new WebSocket(config.socket);
     socket.onopen = function(res) {
       n++;
       console.log('--------------',accounts[n]['account_name'])

application/admin/view/reportForm/index.html

@@ -332,7 +332,7 @@
     let getLocation = window.location.href;
     let host = getLocation.split('/admin')[0];
     let apiToken = hex_md5('customer-service'+date+host);
-    let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+    let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
     socket.onopen = function(res) {
         console.log('握手成功');
         // 登录

application/admin/view/system/addwelcome.html

@@ -136,7 +136,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/system/basics.html

@@ -287,7 +287,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/system/conversation.html

@@ -177,7 +177,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/system/editwelcome.html

@@ -137,7 +137,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/system/reply.html

@@ -80,7 +80,7 @@
     }
 
     function showSuccess(res){
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/system/welcoming.html

@@ -110,7 +110,7 @@
       layer.confirm('确认删除此欢迎语吗?', {icon: 3, title:'提示'}, function(index){
         //do something
         $.getJSON("{:url('system/delWelcome')}", {'id' : id}, function(res){
-          let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+          let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
           socket.onopen = function(res) {
             console.log('握手成功');
             socket.send(JSON.stringify({

application/admin/view/users/edituser.html

@@ -236,7 +236,7 @@
 
     function showSuccess(res){
 
-      let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+      let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
       socket.onopen = function(res) {
         console.log('握手成功');
         socket.send(JSON.stringify({

application/admin/view/users/index.html

@@ -173,7 +173,7 @@
         layer.confirm('确认删除此客服?', {icon: 3, title:'提示'}, function(index){
             //do something
             $.getJSON("{:url('users/delUser')}", {'id' : id}, function(res){
-              let socket = new WebSocket('ws://' + config.socket+'?apiToken=' + apiToken);
+              let socket = new WebSocket(config.socket+'?apiToken=' + apiToken);
               socket.onopen = function(res) {
                 console.log('握手成功');
                 socket.send(JSON.stringify({

application/config.php

@@ -21,9 +21,9 @@ return [
     'salt' => '~NickBai!@#',
 
     // socket server
-    'socket' => 'ky.281570.com:9101',
+    'socket' => 'wss://ky.281570.com:9101',
 
-    // 管理员登录时间
+   // 管理员登录时间
     'save_time' => 86400,
 
 
@@ -41,10 +41,10 @@ return [
     'exception_tmpl' => '',
     'http_exception_template' => [
         // 定义404错误的重定向页面地址
-        '404' => APP_PATH.'404.html',
+        '404' => APP_PATH . '404.html',
         // 还可以定义其它的HTTP status
-        '401' => APP_PATH.'404.html',
-        '403' => APP_PATH.'404.html',
+        '401' => APP_PATH . '404.html',
+        '403' => APP_PATH . '404.html',
     ],
 
     // 应用调试模式

public/static/customer/js/whisper-cli.js

@@ -14,7 +14,7 @@ var commChat = 1;
 if(config != undefined && config.socket != undefined){
 
     // 创建一个Socket实例
-    var socket = new WebSocket('ws://' + config.socket+'?apiToken=8444fb09eec653b322a4ad74b836aed0');
+    var socket = new WebSocket(config.socket+'?apiToken=8444fb09eec653b322a4ad74b836aed0');
 
     // 加锁
     lockTextarea();

public/static/customer/js/whisper-mobile.js

@@ -12,7 +12,7 @@ var commChat = 1;
 if(config != undefined && config.socket != undefined){
 
     // 创建一个Socket实例
-    var socket = new WebSocket('ws://' + config.socket);
+    var socket = new WebSocket(config.socket);
 
     // 加锁
     lockInput();

public/static/service/js/whisper.js

@@ -6,7 +6,7 @@ var uinfo = {
 };
 
 // 创建一个Socket实例
-var socket = new WebSocket('ws://' + socket_server+'?apiToken=8444fb09eec653b322a4ad74b836aed0');
+var socket = new WebSocket('wss://' + socket_server+'?apiToken=8444fb09eec653b322a4ad74b836aed0');
 
 // 打开Socket
 socket.onopen = function (res) {