|
@@ -47,9 +47,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
|
|
|
@Autowired
|
|
|
private SysUserFeignService sysUserFeignService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
- private RedisCache<String,Object> redisCache;
|
|
|
+ private RedisCache<String, Object> redisCache;
|
|
|
|
|
|
// 验证码有效期
|
|
|
public static final int CODE_EXPIRE = 60 * 5;
|
|
@@ -69,7 +69,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
|
|
|
@Override
|
|
|
public int addMessage(Integer userId, String subject, String content, String receivers, Date triggerTime, MessageSendMode mode, SendStatusEnum status,
|
|
|
- String errorMsg, Integer readStatus, String memo) {
|
|
|
+ String errorMsg, Integer readStatus, String memo, String group) {
|
|
|
SysMessage message = null;
|
|
|
Date date = new Date();
|
|
|
|
|
@@ -99,6 +99,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
message.setErrorMsg(errorMsg);
|
|
|
message.setReadStatus(readStatus);
|
|
|
message.setMemo(memo);
|
|
|
+ message.setGroup(group);
|
|
|
|
|
|
messages.add(message);
|
|
|
}
|
|
@@ -143,7 +144,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
errorMsg = e.getMessage();
|
|
|
LOGGER.warn("消息发送失败", e);
|
|
|
}
|
|
|
- return addMessage(null, subject, content, receivers, triggerTime, mode, status, errorMsg, readStatus, memo) > 0;
|
|
|
+ return addMessage(null, subject, content, receivers, triggerTime, mode, status, errorMsg, readStatus, memo, null) > 0;
|
|
|
}
|
|
|
|
|
|
return false;
|
|
@@ -151,12 +152,13 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
|
|
|
@Override
|
|
|
@Async
|
|
|
- public void sendMessage(MessageSender messageSender, Integer userId, MessageSendMode mode, MessageType type, String receiver, Date triggerTime,
|
|
|
+ public void sendMessage(MessageSender messageSender, Integer userId, MessageSendMode mode, MessageType type, String receivers, Date triggerTime,
|
|
|
Integer readStatus, String url, Object... args) {
|
|
|
|
|
|
- if (StringUtils.isBlank(receiver)) {
|
|
|
+ if (StringUtils.isBlank(receivers)) {
|
|
|
throw new BizException("接收地址不能为空");
|
|
|
}
|
|
|
+ String[] tos = StringUtils.split(receivers, ',');
|
|
|
SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type);
|
|
|
if (messageConfig == null) {
|
|
|
throw new BizException("消息类型错误");
|
|
@@ -168,8 +170,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
if (triggerTime == null || date.after(triggerTime)) {
|
|
|
status = SendStatusEnum.SENDING;
|
|
|
try {
|
|
|
- if (debugMode == true || messageSenderPluginContext.send(messageSender, messageConfig.getDescription(),
|
|
|
- MessageFormatter.arrayFormat(messageConfig.getContent(), args), receiver, url)) {
|
|
|
+ if (debugMode == true
|
|
|
+ || messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
|
|
|
+ MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url)) {
|
|
|
status = SendStatusEnum.SUCCESSED;
|
|
|
} else {
|
|
|
status = SendStatusEnum.FAILED;
|
|
@@ -180,8 +183,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
LOGGER.warn("消息发送失败", e);
|
|
|
}
|
|
|
}
|
|
|
- addMessage(userId, type.getCode(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), receiver, triggerTime, mode, status, errorMsg,
|
|
|
- readStatus, url);
|
|
|
+ addMessage(userId, type.getCode(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), receivers, triggerTime, mode, status, errorMsg,
|
|
|
+ readStatus, url, messageConfig.getGroup());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -209,7 +212,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
LOGGER.warn("消息发送失败", e);
|
|
|
}
|
|
|
}
|
|
|
- addMessage(userId, title, content, receiver, triggerTime, mode, status, errorMsg, readStatus, url);
|
|
|
+ addMessage(userId, title, content, receiver, triggerTime, mode, status, errorMsg, readStatus, url, null);
|
|
|
}
|
|
|
|
|
|
@Override
|