feat: 增加全量刷新聊天记录、修复BUG

Author: JiHongYuan

chat-client/src/main/java/org/github/jhy/chat/client/gui/controller/MainController.java

@@ -70,11 +70,9 @@ private void refreshMessage(String to, EventMessage eventMessage) {
             // 增量刷新
             if (to.equals(selectedTo)) {
                 App.refreshUI(() -> jsObject.call("refreshMessage", JSON.toString(eventMessage)));
+            } else if (eventMessage == null) {
+                App.refreshUI(() -> jsObject.call("refreshMessageList", JSON.toString(userMessageMap.get(selectedTo))));
             }
-            // TODO 全量刷新
-            // else if (eventMessage == null) {
-            //    jsObject.call("refreshMessage", objectMapper.writeValueAsString(userMessageMap.get(to)));
-            // }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -106,17 +104,17 @@ public void initialize() {
         initializeGUI();
 
         if (initialized) return;
-        service.submit(() -> {
-            while (!Thread.interrupted()) {
-                try {
-                    EventMessage eventMessage = ApplicationContext.MESSAGE_QUEUE.take();
+
+        service.scheduleAtFixedRate(() -> {
+            try {
+                EventMessage eventMessage = ApplicationContext.MESSAGE_QUEUE.poll();
+                if(eventMessage != null){
                     App.refreshUI(() -> invokeMessageRefresh(eventMessage));
-                } catch (InterruptedException e) {
-                    log.error(e.getMessage(), e);
-                    Thread.currentThread().interrupt();
                 }
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
             }
-        });
+        }, 0, 3, TimeUnit.SECONDS);
         // TODO 刷新用户会把页面选中刷新
         service.scheduleAtFixedRate(this::refreshUserList, 0, 180, TimeUnit.SECONDS);
 

chat-client/src/main/java/org/github/jhy/chat/client/handler/EventMessageCodec.java

@@ -18,10 +18,11 @@ public class EventMessageCodec extends MessageToMessageCodec<ByteBuf, EventMessa
 
     @Override
     protected void encode(ChannelHandlerContext ctx, EventMessage msg, List<Object> out) {
+        EventMessage rst = msg.copy();
         if (msg.getBody() != null) {
-            msg.setBody(JSON.toString(msg.getBody()));
+            rst.setBody(JSON.toString(msg.getBody()));
         }
-        String str = JSON.toString(msg);
+        String str = JSON.toString(rst);
         out.add(Unpooled.copiedBuffer(str, CharsetUtil.UTF_8));
     }
 

chat-client/src/main/resources/view/MainView.html

@@ -35,12 +35,16 @@
         element.innerHTML = strHtml;
     }
 
+    function refreshMessageList(messageList) {
+        $("#talk-text").html("");
+        messageList = eval(messageList);
+        for (let i = 0; i < messageList.length; i++) {
+            refreshMessage(JSON.stringify(messageList[i]));
+        }
+    }
+
     function refreshMessage(message) {
         message = JSON.parse(message);
-
-        app.info("from： " + message.from);
-        app.info("currUser： " + currUser.name);
-
         let strHtml;
         if(message.from === currUser.name){
             strHtml =
@@ -88,6 +92,8 @@
             selected = id;
             $(".user").css("border", "none");
             $(this).css("border", "1px solid #000");
+
+            app.refreshMessage("-1");
         }
         $("#talk-text").html("");
     })

chat-common/src/main/java/org/github/jhy/chat/common/EventMessage.java

@@ -56,4 +56,14 @@ public static EventMessage builderEventType(String msgId, EventType eventType) {
                 .build();
     }
 
+    public EventMessage copy(){
+        EventMessage rst = new EventMessage();
+        rst.setMsgId(this.getMsgId());
+        rst.setFrom(this.getFrom());
+        rst.setTo(this.getTo());
+        rst.setEventType(this.getEventType());
+        rst.setSendTime(this.getSendTime());
+        return rst;
+    }
+
 }

chat-common/src/main/java/org/github/jhy/chat/common/JSON.java

@@ -1,6 +1,7 @@
 package org.github.jhy.chat.common;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
@@ -9,7 +10,8 @@
  */
 public class JSON {
 
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+            .configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);;
 
     public static <T> T parseObject(String obj, Class<T> clazz) {
         try {

chat-server/src/main/java/org/github/jhy/chat/server/netty/handler/MessageHandler.java

@@ -29,8 +29,6 @@ public class MessageHandler {
     private static final ChatUserRegister chatUserRegister = new ChatUserRegister();
 
     public void handlerActive(ChannelHandlerContext ctx) {
-        Channel channel = ctx.channel();
-        channelClientRegister.register(channel.id().asShortText(), channel);
     }
 
     public void handlerInactive(ChannelHandlerContext ctx) {
@@ -40,8 +38,6 @@ public void handlerInactive(ChannelHandlerContext ctx) {
     }
 
     public void handlerCaught(ChannelHandlerContext ctx, Throwable cause) {
-        Channel channel = ctx.channel();
-        channelClientRegister.unRegister(channel.id().asShortText());
         log.error(cause.getMessage(), cause);
     }
 
@@ -107,17 +103,19 @@ public void handlerRequest(ChannelHandlerContext ctx, EventMessage msg, EventMes
                 return;
             }
 
-            UserSession userSession;
-            if ((userSession = chatUserRegister.get(msg.getFrom())) != null) {
-                userSession.setStatus(UserStatus.ONLINE);
+            UserSession session;
+            if ((session = chatUserRegister.get(msg.getFrom())) != null) {
+                session.setStatus(UserStatus.ONLINE);
             } else {
-                userSession = new UserSession();
-                userSession.setSessionId(ctx.channel().id().asShortText());
-                userSession.setUsername(msg.getFrom());
-                userSession.setStatus(UserStatus.OFFLINE);
+                session = new UserSession();
+                session.setSessionId(ctx.channel().id().asShortText());
+                session.setUsername(msg.getFrom());
+                session.setStatus(UserStatus.OFFLINE);
             }
             retMsg.setBody(new Message(Constants.SUCCESS));
-            chatUserRegister.register(msg.getFrom(), userSession);
+
+            chatUserRegister.register(msg.getFrom(), session);
+            channelClientRegister.register(session.getSessionId(), ctx.channel());
         }
 
         @Override