From 3b94a2da66fe709954415d2f0fc70eb1f4502a51 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Mon, 6 Sep 2021 09:58:55 +0800
Subject: [PATCH] change paths

---
 .../java/cn/hutool/extra/mail/GlobalMailAccount.java   | 10 ++++++----
 .../main/java/cn/hutool/extra/mail/MailAccount.java    |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/GlobalMailAccount.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/GlobalMailAccount.java
index 4690f52a6..92df1e97f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/GlobalMailAccount.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/GlobalMailAccount.java
@@ -4,13 +4,15 @@ import cn.hutool.core.io.IORuntimeException;
 
 /**
  * 全局邮件帐户，依赖于邮件配置文件{@link MailAccount#MAIL_SETTING_PATHS}
- * 
+ *
  * @author looly
  *
  */
 public enum GlobalMailAccount {
 	INSTANCE;
 
+	private static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"};
+
 	private final MailAccount mailAccount;
 
 	/**
@@ -22,7 +24,7 @@ public enum GlobalMailAccount {
 
 	/**
 	 * 获得邮件帐户
-	 * 
+	 *
 	 * @return 邮件帐户
 	 */
 	public MailAccount getAccount() {
@@ -31,11 +33,11 @@ public enum GlobalMailAccount {
 
 	/**
 	 * 创建默认帐户
-	 * 
+	 *
 	 * @return MailAccount
 	 */
 	private MailAccount createDefaultAccount() {
-		for (String mailSettingPath : MailAccount.MAIL_SETTING_PATHS) {
+		for (String mailSettingPath : MAIL_SETTING_PATHS) {
 			try {
 				return new MailAccount(mailSettingPath);
 			} catch (IORuntimeException ignore) {
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 925550241..03f1df589 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
@@ -37,6 +37,10 @@ public class MailAccount implements Serializable {
 	private static final String MAIL_DEBUG = "mail.debug";
 	private static final String SPLIT_LONG_PARAMS = "mail.mime.splitlongparameters";
 
+	/**
+	 * @deprecated 此公共配置没有公开必要，迁移至GlobalMailAccount#MAIL_SETTING_PATHS
+	 */
+	@Deprecated
 	public static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"};
 
 	/**