Merge branch 'master' of https://gitee.com/rowger_217/im-system

hs-im-server/im-tcp/im-tcp.iml

@@ -7,6 +7,7 @@
         <sourceRoots>
           <root url="file://$MODULE_DIR$/src/main/java" />
           <root url="file://$MODULE_DIR$/src/main/resources" />
+          <root url="file://$MODULE_DIR$/target/generated-sources/annotations" />
         </sourceRoots>
       </configuration>
     </facet>

hs-im-server/im-tcp/src/main/resources/web.html

@@ -410,7 +410,7 @@
     //如果浏览器支持WebSocket
     if (window.WebSocket) {
         //参数就是与服务器连接的地址
-        socket = new WebSocket("ws://192.168.1.117:19000/ws");
+        socket = new WebSocket("ws://119.45.242.222:29001/ws");
 
         //客户端收到服务器消息的时候就会执行这个回调方法
         socket.onmessage = function (event) {