From ad597f433afb0e4ead989aa8a30133fe40d3b98c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 02 Oct 2025 00:05:41 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java |   40 +++++-----------------------------------
 1 files changed, 5 insertions(+), 35 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 71ccee9..3e3038f 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
@@ -44,14 +44,13 @@
         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.smtp.ssl.enable", "true");
+
+        javaMailProperties.setProperty("mail.debug", "true");
         mailSender.setJavaMailProperties(javaMailProperties);
         mailMessage = new SimpleMailMessage();
         mailMessage.setFrom(PropertiesUtil.getProperty("email.from"));
@@ -62,37 +61,8 @@
         settings.setProperty("default_encoding", "UTF-8");
         settings.setProperty("locale", "zh_CN");
         freeMarkerConfigurer.setFreemarkerSettings(settings);
-
         freeMarkerConfigurer.afterPropertiesSet();
     }
-
-    /*@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) {

--
Gitblit v1.9.3