Merge branch 'master' of zcb/kmall-pt-general into master

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1145,8 +1145,8 @@ function openWebSocket() {
         //无法使用wss，浏览器打开WebSocket时报错
         //ws对应http、wss对应https。
         // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
-        webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/"+storeId);
-        // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
+        // webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/"+storeId);
+        webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');
         }

kmall-admin/src/main/webapp/userLogin.html

@@ -129,8 +129,8 @@
                 this.src = "captcha.jpg?t=" + $.now();
             },
             login: function (event) {
-                // var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=" + vm.machineCode+"&loginType=2"; //TODO  新增加一个机器码;
-                var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=0z4kBPFEve0=&loginType=2"; //TODO  新增加一个机器码;
+                var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=" + vm.machineCode+"&loginType=2"; //TODO  新增加一个机器码;
+                // var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=0z4kBPFEve0=&loginType=2"; //TODO  新增加一个机器码;
                 sessionStorage.removeItem("permsSet");
                 var code = sessionStorage.getItem("machineCode");
                 if(!code){