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/logic/WebSocketLogic.java

@@ -83,7 +83,7 @@
        if (targetChannel != null) {
            chat.setIsSelf(2);
            ResponseBean toRes = ResponseBean.ok(chat);
            res.setType(2);
            toRes.setType(2);
            targetChannel.writeAndFlush(NettyTools.webSocketJson(toRes));
        } else {
            // 在redis中保存用户未在线时，给该用户发送的消息条数