From 27b949dd9d62f68c74d8a12729c4de5fdcc414c9 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Tue, 18 Jun 2024 23:27:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(messaging/mail):=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8F=91=E4=BB=B6?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #5
---
 .../starter/messaging/mail/core/MailConfig.java    | 14 ++++++++++++++
 .../starter/messaging/mail/util/MailUtils.java     |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfig.java b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfig.java
index ffc975ba..5157f548 100644
--- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfig.java
+++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfig.java
@@ -62,6 +62,11 @@ public class MailConfig {
      */
     private String password;
 
+    /**
+     * 发件人
+     */
+    private String from;
+
     /**
      * 是否启用 SSL 连接
      */
@@ -121,6 +126,14 @@ public class MailConfig {
         this.password = password;
     }
 
+    public String getFrom() {
+        return from;
+    }
+
+    public void setFrom(String from) {
+        this.from = from;
+    }
+
     public boolean isSslEnabled() {
         return sslEnabled;
     }
@@ -157,6 +170,7 @@ public class MailConfig {
     public Properties toJavaMailProperties() {
         Properties javaMailProperties = new Properties();
         javaMailProperties.putAll(this.getProperties());
+        javaMailProperties.put("mail.from", this.getFrom());
         javaMailProperties.put("mail.smtp.auth", true);
         javaMailProperties.put("mail.smtp.ssl.enable", this.isSslEnabled());
         if (this.isSslEnabled()) {
diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java
index c65e2d68..08f937ef 100644
--- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java
+++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java
@@ -164,7 +164,8 @@ public class MailUtils {
         MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, StandardCharsets.UTF_8
             .displayName());
         // 设置基本信息
-        messageHelper.setFrom(mailSender.getUsername());
+        messageHelper.setFrom(CharSequenceUtil.blankToDefault(mailSender.getJavaMailProperties()
+            .getProperty("mail.from"), mailSender.getUsername()));
         messageHelper.setSubject(subject);
         messageHelper.setText(content, isHtml);
         // 设置收信人