From f199d202a59ad5fc8a82a752d271f32689ddac0b Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: Mon, 2 May 2022 20:44:48 +0800
Subject: [PATCH] =?UTF-8?q?[update]:=201.=20(framework)=20MailConfig=20-?=
 =?UTF-8?q?=20=E5=88=9D=E5=A7=8B=E5=8C=96=20JavaMailSender=20=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=9B=B4=E6=8E=A5=E5=88=9D=E5=A7=8B=E5=8C=96=20MailAc?=
 =?UTF-8?q?count=20;=202.=20(common)=20MailUtils=20-=20JavaMailSenderImpl?=
 =?UTF-8?q?=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20MailAccount=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/utils/email/MailUtils.java   | 28 ++++-------------
 .../ruoyi/framework/config/MailConfig.java    | 31 ++++++++-----------
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java
index b3e648288..f8688c7b2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java
@@ -29,20 +29,13 @@ import java.util.Properties;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class MailUtils extends MailUtil {
 
-    private static final JavaMailSenderImpl SENDER = SpringUtils.getBean(JavaMailSenderImpl.class);
-
-    /**
-     * 获取邮件发送实例
-     */
-    public static JavaMailSender getSender() {
-        return SENDER;
-    }
+    private static final MailAccount ACCOUNT = SpringUtils.getBean(MailAccount.class);
 
     /**
      * 获取邮件发送实例
      */
     public static MailAccount getMailAccount() {
-        return getMailAccount(null, null);
+        return ACCOUNT;
     }
 
     /**
@@ -52,19 +45,10 @@ public class MailUtils extends MailUtil {
      * @param password 授权码
      */
     public static MailAccount getMailAccount(String username, String password) {
-        Properties properties = SENDER.getJavaMailProperties();
-
-        MailAccount account = new MailAccount();
-        account.setHost(SENDER.getHost());
-        account.setPort(SENDER.getPort());
-        account.setFrom(StringUtils.blankToDefault(username, SENDER.getUsername()));
-        account.setUser(StringUtils.blankToDefault(username, SENDER.getUsername()));
-        account.setPass(StringUtils.blankToDefault(password, SENDER.getPassword()));
-        account.setAuth((Boolean) properties.get("mail.smtp.auth"));
-        account.setDebug((Boolean) properties.get("mail.debug"));
-        account.setStarttlsEnable((Boolean) properties.get("mail.smtp.starttls.enable"));
-
-        return account;
+        ACCOUNT.setFrom(StringUtils.blankToDefault(username, ACCOUNT.getUser()));
+        ACCOUNT.setUser(StringUtils.blankToDefault(username, ACCOUNT.getUser()));
+        ACCOUNT.setPass(StringUtils.blankToDefault(password, ACCOUNT.getPass()));
+        return ACCOUNT;
     }
 
     /**
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java
index 3816da8b2..13eeeec97 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java
@@ -1,13 +1,12 @@
 package com.ruoyi.framework.config;
 
+import cn.hutool.extra.mail.MailAccount;
 import com.ruoyi.framework.config.properties.MailProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
 
 import javax.annotation.Resource;
-import java.util.Properties;
 
 /**
  * JavaMail 配置
@@ -21,25 +20,21 @@ public class MailConfig {
     private MailProperties mailProperties;
 
     /**
-     * 初始化 JavaMailSender
+     * 初始化 MailAccount
      */
     @Bean
     @ConditionalOnProperty(value = "spring.mail.enabled", havingValue = "true")
-    public JavaMailSenderImpl getMailSender() {
-        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-        mailSender.setHost(mailProperties.getHost());
-        mailSender.setPort(mailProperties.getPort());
-        mailSender.setUsername(mailProperties.getUsername());
-        mailSender.setPassword(mailProperties.getPassword());
-
-        Properties props = mailSender.getJavaMailProperties();
-        props.put("mail.transport.protocol", mailProperties.getProtocol());
-        props.put("mail.smtp.auth", mailProperties.getAuth());
-        props.put("mail.smtp.starttls.enable", mailProperties.getStarttlsEnable());
-        props.put("mail.smtp.ssl.trust", mailProperties.getSslTrust());
-        props.put("mail.debug", mailProperties.getDebug());
-
-        return mailSender;
+    public MailAccount mailAccount() {
+        MailAccount account = new MailAccount();
+        account.setUser(mailProperties.getUsername());
+        account.setFrom(mailProperties.getUsername());
+        account.setPass(mailProperties.getPassword());
+        account.setHost(mailProperties.getHost());
+        account.setPort(mailProperties.getPort());
+        account.setAuth(mailProperties.getAuth());
+        account.setDebug(mailProperties.getDebug());
+        account.setStarttlsEnable(mailProperties.getStarttlsEnable());
+        return account;
     }
 
 }