From 27921d0aadbe9e3754ccd8498e893eb8d73c1269 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 May 2021 17:37:32 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/netty/logic/WebSocketLogic.java   |   21 +++++++--------------
 src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java |    6 +++---
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/netty/logic/WebSocketLogic.java b/src/main/java/com/xcong/excoin/netty/logic/WebSocketLogic.java
index 8511435..9cbe9cf 100644
--- a/src/main/java/com/xcong/excoin/netty/logic/WebSocketLogic.java
+++ b/src/main/java/com/xcong/excoin/netty/logic/WebSocketLogic.java
@@ -42,13 +42,6 @@
         responseBean.setType(requestBean.getType());
         responseBean.setStatus(1);
 
-//        String bearerToken = requestBean.getData().toString();
-//        String rsaToken = bearerToken.replace(AppContants.TOKEN_START_WITH, "");
-//        RSA rsa = new RSA(securityProperties.getPrivateKey(), null);
-//        String[] tokens = StrUtil.split(rsa.decryptStr(rsaToken, KeyType.PrivateKey), "_");
-//
-//        Long memberId = Long.parseLong(tokens[0]);
-
         String token = requestBean.getData().toString();
         String redisKey = AppContants.APP_LOGIN_PREFIX + token;
         String loginStr = redisUtils.getString(redisKey);
@@ -94,13 +87,13 @@
             targetChannel.writeAndFlush(NettyTools.webSocketJson(toRes));
         } else {
             // 在redis中保存用户未在线时,给该用户发送的消息条数
-            String key = AppContants.MSG_NOTICE + chat.getTargetId();
-            String value = redisUtils.getString(key);
-            if (StrUtil.isEmpty(value)) {
-                redisUtils.set(key , 1);
-            } else {
-                redisUtils.set(key, Integer.parseInt(value) + 1);
-            }
+//            String key = AppContants.MSG_NOTICE + chat.getTargetId();
+//            String value = redisUtils.getString(key);
+//            if (StrUtil.isEmpty(value)) {
+//                redisUtils.set(key , 1);
+//            } else {
+//                redisUtils.set(key, Integer.parseInt(value) + 1);
+//            }
         }
         chatProducer.sendMsgHistory(chat);
     }
diff --git a/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
index fffc824..0507e7b 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
@@ -50,7 +50,7 @@
             OtcMsgUserListEntity from = new OtcMsgUserListEntity();
             from.setMemberId(toId);
             from.setTargetId(fromId);
-            from.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
+            from.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
             from.setLastMsgTime(new Date());
             otcMsgUserListDao.insert(from);
         }
@@ -61,7 +61,7 @@
             OtcMsgUserListEntity from = new OtcMsgUserListEntity();
             from.setMemberId(toId);
             from.setTargetId(fromId);
-            from.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
+            from.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
             from.setLastMsgTime(new Date());
             otcMsgUserListDao.insert(from);
         } else {
@@ -71,7 +71,7 @@
                 toList.setLastMsgTime(new Date());
                 otcMsgUserListDao.updateById(toList);
             } else {
-                toList.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
+                toList.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
                 toList.setLastMsgTime(new Date());
                 otcMsgUserListDao.updateById(toList);
             }

--
Gitblit v1.9.1