Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

xiaoyong931011

2021-05-28 ba00b9ce351642f3f70bc7ff24646c921bfb47cb

 src/main/java/com/xcong/excoin/netty/handler/WebSocketServerHandler.java

@@ -78,7 +78,7 @@
                content = ((TextWebSocketFrame) frame).text();
                if (content.contains(Contans.HEART_BEAT)) {
                    resetTimes(ctx.channel());
                    ctx.channel().writeAndFlush(NettyTools.webSocketBytes(Contans.HEART_BEAT));
//                    ctx.channel().writeAndFlush(NettyTools.webSocketBytes(Contans.HEART_BEAT));
                } else {
                    SpringContextHolder.getBean(MsgDispatch.class).webSocketDispatch(ctx, content);
                }