wangli/im-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix: 修复注释信息

Browse Source
This commit is contained in:
zuoqinbo 2023-11-17 16:44:58 +08:00
parent 69098d7b9c
commit 35bc5e05e7
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
im-center-server/src/main/java/cn/axzo/im/service/AccountService.java
View File

@ -225,7 +225,7 @@ public class AccountService {
userAccountAll.addAll(userAccountRespList);
} else {
if (appTypeEnum == AppTypeEnum.SYSTEM) {
log.warn("PersonId=[" + accountAbsentQuery.getPersonId() + "],不允许创建AppType=[system]账户!");
//log.warn("PersonId=[" + accountAbsentQuery.getPersonId() + "],不允许创建AppType=[system]账户!");
continue;
}
UserAccountReq userAccountReq = new UserAccountReq();

12
im-center-server/src/main/java/cn/axzo/im/service/MessageService.java
View File

@ -198,7 +198,7 @@ public class MessageService {
}
});
} else {
log.warn("sendBatchMessage发送IM消息异常,不存在personId=[" + sourcePersonId + "]的IM账户");
log.warn("发送IM消息异常,不存在personId=[" + sourcePersonId + "]的IM账户");
}
}
List<List<String>> personPage = Lists.partition(toPersonIMList, msgSendPersonOfOneBatch);
@ -230,7 +230,6 @@ public class MessageService {
unregisterAccountSets.forEach(unregisterAccount -> {
MessageDispatchResp messageDispatchResp = buildMessageDispatchResp(null, fromAccId,
unregisterAccount, null, appType, batchResponse.getTimetag(), null);
// messageDispatchRespList.add(messageDispatchResp);暂时不返回 msg-center判断有误 20231103
});
}
} else {
@ -255,7 +254,7 @@ public class MessageService {
if (StringUtils.isNotBlank(toImAccount)) {
String[] personIdAndAppType = toImAccount.split("_");
String env = environment.getProperty("spring.profiles.active");
if(StringUtils.isNotEmpty(personIdAndAppType[0])){
if (StringUtils.isNotEmpty(personIdAndAppType[0])) {
messageDispatchResp.setPersonId(personIdAndAppType[0].replace(env, ""));
}
if (personIdAndAppType.length > 1) {
@ -286,8 +285,7 @@ public class MessageService {
MessageDispatchResp messageDispatchResp = buildMessageDispatchResp(null,
messageRequest.getFrom(), null,
personId, appType.getCode(), 0L, "unregistered");
// messageDispatchRespList.add(messageDispatchResp); 暂时不返回 msg-center判断有误 20231103
log.warn("接收用户账户[" + personId + "],appType[" + appType.getCode() + "],未注册IM账户,不进行消息发送!");
log.warn("用户personId=[" + personId + "],appType[" + appType.getCode() + "],未注册IM账户,不进行消息发送!");
continue;
}
accountRegisterList.forEach(accountRegister -> {
@ -315,11 +313,11 @@ public class MessageService {
}
private void insertImMessage(List<MessageDispatchResp> messageRespList, String messageBody) {
if (CollectionUtils.isNotEmpty(messageRespList)) {
if (CollectionUtils.isEmpty(messageRespList)) {
return;
}
String requestId = UUID.randomUUID().toString().replace("-", "");
log.info("IM消息发送成功保持到数据库:{},请求信息:{}", messageBody, JSONUtil.toJsonStr(messageRespList));
log.info("IM消息发送成功保持到数据库:{},请求Body信息:{}", JSONUtil.toJsonStr(messageRespList), messageBody);
CompletableFuture.runAsync(() -> messageRespList.forEach(messageDispatchResp -> {
MessageHistory messageHistory = new MessageHistory();
messageHistory.setBizId(requestId);