From fb41a49a20bd6f75fd1cfbde5f25919166e09e68 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 23 Sep 2025 11:57:12 +0800
Subject: [PATCH] 重置修复
---
trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 ecf553c..8b340df 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
@@ -43,12 +43,14 @@
mailSender.setHost(PropertiesUtil.getProperty("email.host"));
Properties javaMailProperties = new Properties();
javaMailProperties.setProperty("mail.smtp.port", "465");
- javaMailProperties.setProperty("mail.smtp.starttls.enable", "true");
+ 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");
mailSender.setJavaMailProperties(javaMailProperties);
mailMessage = new SimpleMailMessage();
mailMessage.setFrom(PropertiesUtil.getProperty("email.from"));
@@ -61,6 +63,34 @@
freeMarkerConfigurer.setFreemarkerSettings(settings);
}
+ /*@Override
+ 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.auth", "true");
+ javaMailProperties.setProperty("mail.smtp.ssl.enable", "true");
+ javaMailProperties.setProperty("mail.smtp.ssl.protocols", "TLSv1.2");
+ javaMailProperties.setProperty("mail.smtp.ssl.enable", "true");
+
+ javaMailProperties.setProperty("mail.debug", "true");
+ mailSender.setJavaMailProperties(javaMailProperties);
+ mailMessage = new SimpleMailMessage();
+ mailMessage.setFrom(PropertiesUtil.getProperty("email.from"));
+ freeMarkerConfigurer = new FreeMarkerConfigurer();
+ freeMarkerConfigurer.setTemplateLoaderPath("classpath:email/ftl");
+ Properties settings = new Properties();
+ settings.setProperty("template_update_delay", "1800");
+ settings.setProperty("default_encoding", "UTF-8");
+ settings.setProperty("locale", "zh_CN");
+ freeMarkerConfigurer.setFreemarkerSettings(settings);
+ freeMarkerConfigurer.afterPropertiesSet();
+ }*/
+
@Override
public void send(EmailMessage emailMessage) {
try {
--
Gitblit v1.9.3