|
@@ -3,7 +3,6 @@ package cn.reghao.devops.mgr.admin.service;
|
|
|
import cn.reghao.devops.mgr.admin.db.repository.WebhookRepository;
|
|
import cn.reghao.devops.mgr.admin.db.repository.WebhookRepository;
|
|
|
import cn.reghao.devops.mgr.admin.service.notifier.ding.DingMsg;
|
|
import cn.reghao.devops.mgr.admin.service.notifier.ding.DingMsg;
|
|
|
import cn.reghao.devops.mgr.admin.service.notifier.ding.DingNotify;
|
|
import cn.reghao.devops.mgr.admin.service.notifier.ding.DingNotify;
|
|
|
-import cn.reghao.devops.mgr.admin.service.notifier.email.EmailMsg;
|
|
|
|
|
import cn.reghao.devops.mgr.admin.model.vo.NotifyType;
|
|
import cn.reghao.devops.mgr.admin.model.vo.NotifyType;
|
|
|
import cn.reghao.devops.mgr.admin.model.po.Webhook;
|
|
import cn.reghao.devops.mgr.admin.model.po.Webhook;
|
|
|
import cn.reghao.devops.mgr.admin.service.notifier.Notify;
|
|
import cn.reghao.devops.mgr.admin.service.notifier.Notify;
|
|
@@ -42,13 +41,6 @@ public class NotifyService {
|
|
|
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) {
|
|
|
|
|
- /*Webhook notifyReceiver = webhookRepository.findByTypeAndSetdefaultIsTrue(NotifyType.email.getName());
|
|
|
|
|
- if (notifyReceiver != null) {
|
|
|
|
|
- receiver = notifyReceiver.getUrl();
|
|
|
|
|
- EmailMsg emailMsg = (EmailMsg) msg;
|
|
|
|
|
- threadPool.execute(new NotifyTask<>(sysMessageService, emailNotify, receiver, emailMsg));
|
|
|
|
|
- }*/
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -56,9 +48,6 @@ public class NotifyService {
|
|
|
if (msg instanceof DingMsg) {
|
|
if (msg instanceof DingMsg) {
|
|
|
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) {
|
|
|
|
|
- /*EmailMsg emailMsg = (EmailMsg) msg;
|
|
|
|
|
- threadPool.execute(new NotifyTask<>(sysMessageService, emailNotify, receiver, emailMsg));*/
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|