Skip to content

W
wecloud_im_server
Commit 89ead4c4 by Future
Options

代码调试

parent 8012f99b
Showing with 39 additions and 39 deletions
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
...@@ -139,56 +139,56 @@ public class NormalChatAction { ...@@ -139,56 +139,56 @@ public class NormalChatAction {
channelSender.sendMsgLocal((NioSocketChannel) request.getSenderChannel(), responseModel); channelSender.sendMsgLocal((NioSocketChannel) request.getSenderChannel(), responseModel);
return; return;
} }
// Map<Long, ImConversationMembers> memberMap = membersList.stream().collect(Collectors.toMap(ImConversationMembers::getFkClientId, member -> member)); Map<Long, ImConversationMembers> memberMap = membersList.stream().collect(Collectors.toMap(ImConversationMembers::getFkClientId, member -> member));
// 判断为单聊 // 判断为单聊
// if (ChatTypeEnum.SINGLE.getCode().equals(conversation.getChatType())) { if (ChatTypeEnum.SINGLE.getCode().equals(conversation.getChatType())) {
// // 判断是否被拉黑逻辑 // 判断是否被拉黑逻辑
// if (black(reqId, imClientSender, membersList, request.getSenderChannel())) { if (black(reqId, imClientSender, membersList, request.getSenderChannel())) {
// return; return;
// } }
//
// if (!friend(reqId, imClientSender, data.getToConversation(), membersList, request.getSenderChannel())) {
// return;
// }
// }
// if (ChatTypeEnum.NORMAL_GROUP.getCode().equals(conversation.getChatType())) { if (!friend(reqId, imClientSender, data.getToConversation(), membersList, request.getSenderChannel())) {
// if (beKickOut(reqId, imClientSender, membersList, request.getSenderChannel())) { return;
// return; }
// } }
// if (muted(conversation, reqId, imClientSender, membersList, memberMap, request.getSenderChannel())) {
// return; if (ChatTypeEnum.NORMAL_GROUP.getCode().equals(conversation.getChatType())) {
// } if (beKickOut(reqId, imClientSender, membersList, request.getSenderChannel())) {
// if (baned(conversation, reqId, imClientSender, membersList, request.getSenderChannel())) { return;
// return; }
// } if (muted(conversation, reqId, imClientSender, membersList, memberMap, request.getSenderChannel())) {
// } return;
}
if (baned(conversation, reqId, imClientSender, membersList, request.getSenderChannel())) {
return;
}
}
// 消息内容校验 // 消息内容校验
// if (!checkMsg(imClientSender, conversation, reqId, data, request.getSenderChannel(), memberMap)) { if (!checkMsg(imClientSender, conversation, reqId, data, request.getSenderChannel(), memberMap)) {
// return; return;
// } }
ImMessageOnlineSend imMessageOnlineSend = assembleImMessageOnlineSend(data, imClientSender, imApplication.getId()); ImMessageOnlineSend imMessageOnlineSend = assembleImMessageOnlineSend(data, imClientSender, imApplication.getId());
// 入库 保存收件箱 // 入库 保存收件箱
batchSaveInbox(imApplication, conversation, imMessageOnlineSend.getMsgId(), membersList); batchSaveInbox(imApplication, conversation, imMessageOnlineSend.getMsgId(), membersList);
// 入库成功后 判断是否是临时会话 如果是，双方会话display状态是否是1(显示)，如果不是，需要修改为是 // 入库成功后 判断是否是临时会话 如果是，双方会话display状态是否是1(显示)，如果不是，需要修改为是
// if (ChatTypeEnum.TEMP.getCode().equals(conversation.getChatType())) { if (ChatTypeEnum.TEMP.getCode().equals(conversation.getChatType())) {
// // 木有只有私聊一种临时会话类型 // 木有只有私聊一种临时会话类型
// List<ImConversationMembers> tempMemberToUpdate = Lists.newArrayList(); List<ImConversationMembers> tempMemberToUpdate = Lists.newArrayList();
// for (ImConversationMembers members : membersList) { for (ImConversationMembers members : membersList) {
// if (members.getDisplayStatus() == 0) { if (members.getDisplayStatus() == 0) {
// members.setDisplayStatus(1); members.setDisplayStatus(1);
// tempMemberToUpdate.add(members); tempMemberToUpdate.add(members);
// } }
// } }
// if (CollectionUtils.isNotEmpty(tempMemberToUpdate)) { if (CollectionUtils.isNotEmpty(tempMemberToUpdate)) {
// imConversationMembersService.updateBatchById(tempMemberToUpdate); imConversationMembersService.updateBatchById(tempMemberToUpdate);
// } }
// } }
// String key = "push_" + conversation.getId(); // String key = "push_" + conversation.getId();
// String value = redisUtils.getKey(key); // String value = redisUtils.getKey(key);
// final Boolean isPush = false; // final Boolean isPush;
// if (StringUtils.isBlank(value)) { // if (StringUtils.isBlank(value)) {
// isPush = Boolean.TRUE; // isPush = Boolean.TRUE;
// redisUtils.addKey(key, "1", Duration.ofMinutes(5)); // redisUtils.addKey(key, "1", Duration.ofMinutes(5));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment