open-source/MallChat
1
0
Fork 0
mirror of https://github.com/zongzibinbin/MallChat.git synced 2026-03-15 23:23:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhongzb
2023-09-12 22:41:25 +08:00
parent 2cd03adbe9 d7ac839fd6
commit a1a1c4061b
36 changed files with 2691 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java
View File

@@ -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;

2
mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java
View File

@@ -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());