[manager]fixBug自定义邮件服务器未生效
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user