From 74ee2c742592b8cce9632cadab1cc521c83b7b06 Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Thu, 8 Aug 2024 13:16:37 +0800
Subject: [PATCH] =?UTF-8?q?MailAccount=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                               | 1 +
 .../src/main/java/cn/hutool/extra/mail/MailAccount.java    | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f52170d5a..dd5b7e057 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * 【http   】      改进ContentType.get忽略空格（pr#3664@Github）
 * 【http   】      CompressUtil.createExtractor支持tgz自动识别（pr#3674@Github）
 * 【poi    】      ExcelWriter.autoSizeColumn增加可选widthRatio参数，可配置中文字符宽度倍数（pr#3689@Github）
+* 【mail   】      MailAccount增加自定义参数支持（issue#3687@Github）
 
 ### 🐞Bug修复
 * 【core   】      修复因RFC3986理解有误导致的UrlPath处理冒号转义问题（issue#IAAE88@Gitee）
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
index 9ce2a41d0..d8564750c 100755
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
@@ -156,6 +156,13 @@ public class MailAccount implements Serializable {
 	 */
 	public MailAccount(Setting setting) {
 		setting.toBean(this);
+
+		// since 5.8.30, custom property
+		setting.forEach((key, value) -> {
+			if (StrUtil.startWith(key, "mail.")) {
+				this.setCustomProperty(key, value);
+			}
+		});
 	}
 
 	// -------------------------------------------------------------- Constructor end