From 321312d637c24486bdfa853391318fab80eb5ebd Mon Sep 17 00:00:00 2001 From: Faye Lin <49775184+lingyufei@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:09:00 +0800 Subject: [PATCH 1/2] Fix an error when sey the type of a reply message --- .../common/chat/service/strategy/msg/TextMsgHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java index 8ee9279..5b1662d 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java @@ -120,7 +120,7 @@ public class TextMsgHandler extends AbstractMsgHandler { TextMsgResp.ReplyMsg replyMsgVO = new TextMsgResp.ReplyMsg(); replyMsgVO.setId(replyMessage.getId()); replyMsgVO.setUid(replyMessage.getFromUid()); - replyMessage.setType(replyMessage.getType()); + replyMsgVO.setType(replyMessage.getType()); replyMsgVO.setBody(MsgHandlerFactory.getStrategyNoNull(replyMessage.getType()).showReplyMsg(replyMessage)); User replyUser = userCache.getUserInfo(replyMessage.getFromUid()); replyMsgVO.setUsername(replyUser.getName()); From 099eb46fb3205c12848d364843f929bf2aa4bf2d Mon Sep 17 00:00:00 2001 From: Faye Lin <49775184+lingyufei@users.noreply.github.com> Date: Fri, 8 Sep 2023 13:20:13 +0800 Subject: [PATCH 2/2] Fix an error in checkRecall --- .../abin/mallchat/common/chat/service/impl/ChatServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java index e78b0ab..150fce8 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java @@ -290,7 +290,7 @@ public class ChatServiceImpl implements ChatService { private void checkRecall(Long uid, Message message) { AssertUtil.isNotEmpty(message, "消息有误"); - AssertUtil.notEqual(message.getType(), MessageTypeEnum.RECALL, "消息无法撤回"); + AssertUtil.notEqual(message.getType(), MessageTypeEnum.RECALL.getType(), "消息无法撤回"); boolean hasPower = iRoleService.hasPower(uid, RoleEnum.CHAT_MANAGER); if (hasPower) { return;