From 742641b00fb5472c72aaec6b3915016600d0acbb Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 19 Dec 2025 18:58:53 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java
index 2243293..dbdbab6 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -36,21 +37,19 @@
private FreeMarkerConfigurer freeMarkerConfigurer;
@Override
- public void afterPropertiesSet() {
+ public void afterPropertiesSet() throws Exception {
mailSender = new JavaMailSenderImpl();
mailSender.setUsername(PropertiesUtil.getProperty("email.username"));
mailSender.setPassword(PropertiesUtil.getProperty("email.password"));
mailSender.setHost(PropertiesUtil.getProperty("email.host"));
Properties javaMailProperties = new Properties();
javaMailProperties.setProperty("mail.smtp.port", "465");
- javaMailProperties.setProperty("mail.smtp.starttls.enable", "false");
+
javaMailProperties.setProperty("mail.smtp.auth", "true");
- javaMailProperties.setProperty("mail.debug", "true");
- javaMailProperties.setProperty("mail.smtp.ssl.protocols", "TLSv1.2");
- javaMailProperties.setProperty("mail.smtp.host", "smtp.gmail.com");
- javaMailProperties.setProperty("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
- javaMailProperties.setProperty("mail.smtp.socketFactory.port", "465");
javaMailProperties.setProperty("mail.smtp.ssl.enable", "true");
+ javaMailProperties.setProperty("mail.smtp.ssl.protocols", "TLSv1.2");
+
+ javaMailProperties.setProperty("mail.debug", "true");
mailSender.setJavaMailProperties(javaMailProperties);
mailMessage = new SimpleMailMessage();
mailMessage.setFrom(PropertiesUtil.getProperty("email.from"));
@@ -61,6 +60,7 @@
settings.setProperty("default_encoding", "UTF-8");
settings.setProperty("locale", "zh_CN");
freeMarkerConfigurer.setFreemarkerSettings(settings);
+ freeMarkerConfigurer.afterPropertiesSet();
}
@Override
@@ -87,9 +87,7 @@
messageHelper.addAttachment(MimeUtility.encodeWord(emailMessage.getFilename()), rarfile);
}
this.mailSender.send(mailMsg);// 发送
- } catch (MessagingException e) {
- logger.error(e.getMessage(), e);
- } catch (UnsupportedEncodingException e) {
+ } catch (MessagingException | UnsupportedEncodingException e) {
logger.error(e.getMessage(), e);
}
}
@@ -106,9 +104,7 @@
Template tpl = this.freeMarkerConfigurer.getConfiguration().getTemplate(ftlname);
// 加入map到模板中 输出对应变量
html = FreeMarkerTemplateUtils.processTemplateIntoString(tpl, map);
- } catch (IOException e) {
- e.printStackTrace();
- } catch (TemplateException e) {
+ } catch (IOException | TemplateException e) {
e.printStackTrace();
}
return html;
--
Gitblit v1.9.3