From 4880c4fc4ce966211e216fd5e7fe76972c1b3b91 Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Mon, 21 Feb 2022 15:09:19 +0800 Subject: [PATCH] =?UTF-8?q?[manager]fixBug=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=9C=AA=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usthe/manager/component/alerter/DispatchAlarm.java | 8 ++++++-- .../main/java/com/usthe/manager/service/MailService.java | 3 +-- .../com/usthe/manager/service/impl/MailServiceImpl.java | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java b/manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java index a83c7af..5c563b3 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java +++ b/manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java @@ -11,6 +11,7 @@ import com.usthe.manager.service.MailService; import com.usthe.manager.service.MonitorService; import com.usthe.manager.service.NoticeConfigService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.mail.javamail.JavaMailSender; @@ -41,6 +42,9 @@ public class DispatchAlarm { private RestTemplate restTemplate; private MailService mailService; + @Value("${spring.mail.username}") + private String emailFromUser; + public DispatchAlarm(AlerterWorkerPool workerPool, AlerterDataQueue dataQueue, JavaMailSender javaMailSender, NoticeConfigService noticeConfigService, AlertService alertService, MonitorService monitorService, RestTemplate restTemplate, MailService mailService) { @@ -148,12 +152,12 @@ public class DispatchAlarm { MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage,true,"UTF-8"); messageHelper.setSubject("TanCloud探云-监控告警"); //设置发件人Email - messageHelper.setFrom("gongchao@tancloud.cn"); + messageHelper.setFrom(emailFromUser); //设定收件人Email messageHelper.setTo(receiver.getEmail()); messageHelper.setSentDate(new Date()); //构建邮件模版 - String process = mailService.buildHTMLTemplate(alert); + String process = mailService.buildAlertHtmlTemplate(alert); //设置邮件内容模版 messageHelper.setText(process,true); javaMailSender.send(mimeMessage); diff --git a/manager/src/main/java/com/usthe/manager/service/MailService.java b/manager/src/main/java/com/usthe/manager/service/MailService.java index 3fb835b..62c4830 100644 --- a/manager/src/main/java/com/usthe/manager/service/MailService.java +++ b/manager/src/main/java/com/usthe/manager/service/MailService.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Service; * @author 花城 * @version 1.0 * @date 2022/2/19 6:11 下午 - * @Description */ public interface MailService { @@ -20,5 +19,5 @@ public interface MailService { * @param alert 告警信息 * @return 邮件内容 */ - String buildHTMLTemplate(Alert alert); + String buildAlertHtmlTemplate(Alert alert); } diff --git a/manager/src/main/java/com/usthe/manager/service/impl/MailServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/MailServiceImpl.java index 8f37032..6beceab 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/MailServiceImpl.java +++ b/manager/src/main/java/com/usthe/manager/service/impl/MailServiceImpl.java @@ -26,8 +26,8 @@ public class MailServiceImpl implements MailService { private TemplateEngine templateEngine; @Override - public String buildHTMLTemplate(final Alert alert) { - //引入thymeleaf上下文参数渲染页面 + public String buildAlertHtmlTemplate(final Alert alert) { + // 引入thymeleaf上下文参数渲染页面 Context context = new Context(); context.setVariable("target",alert.getTarget()); context.setVariable("ID",alert.getMonitorId());