|
@@ -27,7 +27,7 @@ public class NotifyService {
|
|
|
private final DingNotify dingNotify;
|
|
private final DingNotify dingNotify;
|
|
|
private final EmailNotify emailNotify;
|
|
private final EmailNotify emailNotify;
|
|
|
private final NotifyReceiverRepository notifyReceiverRepository;
|
|
private final NotifyReceiverRepository notifyReceiverRepository;
|
|
|
- private SysMessageService sysMessageService;
|
|
|
|
|
|
|
+ private final SysMessageService sysMessageService;
|
|
|
|
|
|
|
|
public NotifyService(DingNotify dingNotify, EmailNotify emailNotify,
|
|
public NotifyService(DingNotify dingNotify, EmailNotify emailNotify,
|
|
|
NotifyReceiverRepository notifyReceiverRepository, SysMessageService sysMessageService) {
|
|
NotifyReceiverRepository notifyReceiverRepository, SysMessageService sysMessageService) {
|
|
@@ -40,14 +40,14 @@ public class NotifyService {
|
|
|
public <T> void notify(T msg) {
|
|
public <T> void notify(T msg) {
|
|
|
String receiver;
|
|
String receiver;
|
|
|
if (msg instanceof DingMsg) {
|
|
if (msg instanceof DingMsg) {
|
|
|
- NotifyReceiver notifyReceiver = notifyReceiverRepository.findByType(NotifyType.webhook.getName());
|
|
|
|
|
|
|
+ NotifyReceiver notifyReceiver = notifyReceiverRepository.findByTypeAndSetdefaultIsTrue(NotifyType.webhook.getName());
|
|
|
if (notifyReceiver != null) {
|
|
if (notifyReceiver != null) {
|
|
|
receiver = notifyReceiver.getUrl();
|
|
receiver = notifyReceiver.getUrl();
|
|
|
DingMsg dingMsg = (DingMsg) msg;
|
|
DingMsg dingMsg = (DingMsg) msg;
|
|
|
threadPool.execute(new NotifyTask<>(sysMessageService, dingNotify, receiver, dingMsg));
|
|
threadPool.execute(new NotifyTask<>(sysMessageService, dingNotify, receiver, dingMsg));
|
|
|
}
|
|
}
|
|
|
} else if (msg instanceof EmailMsg) {
|
|
} else if (msg instanceof EmailMsg) {
|
|
|
- NotifyReceiver notifyReceiver = notifyReceiverRepository.findByType(NotifyType.email.getName());
|
|
|
|
|
|
|
+ NotifyReceiver notifyReceiver = notifyReceiverRepository.findByTypeAndSetdefaultIsTrue(NotifyType.email.getName());
|
|
|
if (notifyReceiver != null) {
|
|
if (notifyReceiver != null) {
|
|
|
receiver = notifyReceiver.getUrl();
|
|
receiver = notifyReceiver.getUrl();
|
|
|
EmailMsg emailMsg = (EmailMsg) msg;
|
|
EmailMsg emailMsg = (EmailMsg) msg;
|
|
@@ -71,7 +71,7 @@ public class NotifyService {
|
|
|
* @date 2021-06-23 上午9:29
|
|
* @date 2021-06-23 上午9:29
|
|
|
*/
|
|
*/
|
|
|
static class NotifyTask<T> implements Runnable {
|
|
static class NotifyTask<T> implements Runnable {
|
|
|
- private SysMessageService sysMessageService;
|
|
|
|
|
|
|
+ private final SysMessageService sysMessageService;
|
|
|
private final Notify<T> notify;
|
|
private final Notify<T> notify;
|
|
|
private final String receiver;
|
|
private final String receiver;
|
|
|
private final T msg;
|
|
private final T msg;
|