modify

Helius

2021-05-27 f659a0e80789375275902e31add792ede6380ec9

 src/main/java/com/xcong/excoin/netty/logic/WebSocketLogic.java

@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.configurations.properties.SecurityProperties;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.netty.bean.ChatRequest;
import com.xcong.excoin.netty.bean.RequestBean;
import com.xcong.excoin.netty.bean.ResponseBean;
@@ -48,8 +49,18 @@
//
//        Long memberId = Long.parseLong(tokens[0]);

        String token = requestBean.getData().toString();
        String redisKey = AppContants.APP_LOGIN_PREFIX + token;
        String loginStr = redisUtils.getString(redisKey);
        if (StrUtil.isBlank(loginStr)) {
            ResponseBean res = ResponseBean.fail();
            res.setType(requestBean.getType());
            channel.writeAndFlush(NettyTools.webSocketBytes(JSONObject.toJSONString(res)));
            return;
        }

        Long memberId = Long.parseLong(requestBean.getData().toString());
        MemberEntity loginUser = JSONObject.parseObject(loginStr, MemberEntity.class);
        Long memberId = loginUser.getId();

        channel.writeAndFlush(NettyTools.webSocketBytes(JSONObject.toJSONString(responseBean)));
        ChannelManager.addWsChannel(channel, memberId);
@@ -65,17 +76,27 @@

    public void sendMsg(RequestBean requestBean) {
        String chatStr = requestBean.getData().toString();
        log.info("接收到的消息:{}", chatStr);
        ChatRequest chat = JSONObject.parseObject(chatStr, ChatRequest.class);

        Channel channel = ChannelManager.findWebSocketChannel(requestBean.getChannelId());
        ResponseBean res = ResponseBean.ok(chat);
        chat.setTimestamp(System.currentTimeMillis());
        res.setType(2);
        channel.writeAndFlush(NettyTools.webSocketJson(res));

        // 判断是否在线
        Channel targetChannel = ChannelManager.findWsChannel(Long.parseLong(chat.getTo()));
        Channel targetChannel = ChannelManager.findWsChannel(chat.getTargetId());
        if (targetChannel != null) {
            targetChannel.writeAndFlush(NettyTools.webSocketBytes(JSONObject.toJSONString(ResponseBean.ok(chat))));
            chat.setIsSelf(2);
            ResponseBean toRes = ResponseBean.ok(chat);
            res.setType(2);
            targetChannel.writeAndFlush(NettyTools.webSocketJson(toRes));

            chatProducer.sendMsgHistory(chat);
        } else {
            // 在redis中保存用户未在线时，给该用户发送的消息条数
            String key = AppContants.MSG_NOTICE + chat.getTo();
            String key = AppContants.MSG_NOTICE + chat.getTargetId();
            String value = redisUtils.getString(key);
            if (StrUtil.isEmpty(value)) {
                redisUtils.set(key , 1);