OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[manager]fixBug自定义邮件服务器未生效

Browse Source
This commit is contained in:
tomsun28
2022-02-21 15:09:19 +08:00
parent 0a9ed1112a
commit 4880c4fc4c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java
View File

@@ -11,6 +11,7 @@ import com.usthe.manager.service.MailService;
import com.usthe.manager.service.MonitorService; import com.usthe.manager.service.MonitorService;
import com.usthe.manager.service.NoticeConfigService; import com.usthe.manager.service.NoticeConfigService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSender;
@@ -41,6 +42,9 @@ public class DispatchAlarm {
private RestTemplate restTemplate; private RestTemplate restTemplate;
private MailService mailService; private MailService mailService;
@Value("${spring.mail.username}")
private String emailFromUser;
public DispatchAlarm(AlerterWorkerPool workerPool, AlerterDataQueue dataQueue, public DispatchAlarm(AlerterWorkerPool workerPool, AlerterDataQueue dataQueue,
JavaMailSender javaMailSender, NoticeConfigService noticeConfigService, JavaMailSender javaMailSender, NoticeConfigService noticeConfigService,
AlertService alertService, MonitorService monitorService, RestTemplate restTemplate, MailService mailService) { AlertService alertService, MonitorService monitorService, RestTemplate restTemplate, MailService mailService) {
@@ -148,12 +152,12 @@ public class DispatchAlarm {
MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage,true,"UTF-8"); MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage,true,"UTF-8");
messageHelper.setSubject("TanCloud探云-监控告警"); messageHelper.setSubject("TanCloud探云-监控告警");
//设置发件人Email //设置发件人Email
messageHelper.setFrom("gongchao@tancloud.cn"); messageHelper.setFrom(emailFromUser);
//设定收件人Email //设定收件人Email
messageHelper.setTo(receiver.getEmail()); messageHelper.setTo(receiver.getEmail());
messageHelper.setSentDate(new Date()); messageHelper.setSentDate(new Date());
//构建邮件模版 //构建邮件模版
String process = mailService.buildHTMLTemplate(alert); String process = mailService.buildAlertHtmlTemplate(alert);
//设置邮件内容模版 //设置邮件内容模版
messageHelper.setText(process,true); messageHelper.setText(process,true);
javaMailSender.send(mimeMessage); javaMailSender.send(mimeMessage);

3
manager/src/main/java/com/usthe/manager/service/MailService.java
View File

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
* @author 花城 * @author 花城
* @version 1.0 * @version 1.0
* @date 2022/2/19 6:11 下午 * @date 2022/2/19 6:11 下午
* @Description
*/ */
public interface MailService { public interface MailService {
@@ -20,5 +19,5 @@ public interface MailService {
* @param alert 告警信息 * @param alert 告警信息
* @return 邮件内容 * @return 邮件内容
*/ */
String buildHTMLTemplate(Alert alert); String buildAlertHtmlTemplate(Alert alert);
} }

4
manager/src/main/java/com/usthe/manager/service/impl/MailServiceImpl.java
View File

@@ -26,8 +26,8 @@ public class MailServiceImpl implements MailService {
private TemplateEngine templateEngine; private TemplateEngine templateEngine;
@Override @Override
public String buildHTMLTemplate(final Alert alert) { public String buildAlertHtmlTemplate(final Alert alert) {
//引入thymeleaf上下文参数渲染页面 // 引入thymeleaf上下文参数渲染页面
Context context = new Context(); Context context = new Context();
context.setVariable("target",alert.getTarget()); context.setVariable("target",alert.getTarget());
context.setVariable("ID",alert.getMonitorId()); context.setVariable("ID",alert.getMonitorId());