Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-06-19 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7

 zq-erp/src/main/resources/static/demoPage/soketLoginTest.html

@@ -82,7 +82,8 @@
                console.log("您的浏览器支持WebSocket");
                //实现化WebSocket对象，指定要连接的服务器地址与端口  建立连接

                var socketUrl="ws://localhost:8080/webSocketServer?userId=123";
                //var socketUrl="ws://test.hive.jyymatrix.cc/webSocketServer?userId=123";
                var socketUrl="ws://192.168.0.6:8080/webSocketServer?userId=123";
                console.log(socketUrl);
                if(socket!=null){
                    socket.close();