From 219150b5a0cacc8d338a7f7c45c9d6f458e4ed75 Mon Sep 17 00:00:00 2001
From: neko <52202080+akiyamaneko@users.noreply.github.com>
Date: Thu, 24 Sep 2020 01:57:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=B4=A6=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hutool/extra/mail/GlobalMailAccount.java  | 26 +++----------------
 1 file changed, 4 insertions(+), 22 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 f881aeb29..417441b9f 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
@@ -3,7 +3,7 @@ package cn.hutool.extra.mail;
 import cn.hutool.core.io.IORuntimeException;
 
 /**
- * 全局邮件帐户，依赖于邮件配置文件{@link MailAccount#MAIL_SETTING_PATH}或{@link MailAccount#MAIL_SETTING_PATH2}
+ * 全局邮件帐户，依赖于邮件配置文件{@link MailAccount#MAIL_SETTING_PATHS}
  * 
  * @author looly
  *
@@ -35,31 +35,13 @@ public enum GlobalMailAccount {
 	 * @return MailAccount
 	 */
 	private MailAccount createDefaultAccount() {
-		MailAccount mailAccount = null;
-		try {
-			mailAccount = new MailAccount(MailAccount.MAIL_SETTING_PATH);
-		} catch (IORuntimeException e) {
-			//ignore
-		}
-		
-		// 寻找config/mailAccount.setting
-		if(null == mailAccount) {
+		for (String mailSettingPath : MailAccount.MAIL_SETTING_PATHS) {
 			try {
-				mailAccount = new MailAccount(MailAccount.MAIL_SETTING_PATH2);
+				return new MailAccount(mailSettingPath);
 			} catch (IORuntimeException e) {
 				//ignore
 			}
 		}
-		
-		// 寻找mail.setting
-		if(null == mailAccount) {
-			try {
-				mailAccount = new MailAccount(MailAccount.MAIL_SETTING_PATH3);
-			} catch (IORuntimeException e) {
-				//ignore
-			}
-		}
-		
-		return mailAccount;
+		return null;
 	}
 }

From a33f6958862211d6c82cd48697c4b737ad723915 Mon Sep 17 00:00:00 2001
From: neko <52202080+akiyamaneko@users.noreply.github.com>
Date: Thu, 24 Sep 2020 01:58:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=B4=A6=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hutool/extra/mail/MailAccount.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 8641c990d..199c79368 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
@@ -32,9 +32,7 @@ public class MailAccount implements Serializable {
 	private static final String MAIL_DEBUG = "mail.debug";
 	private static final String SPLIT_LONG_PARAMS = "mail.mime.splitlongparameters";
 
-	public static final String MAIL_SETTING_PATH = "config/mail.setting";
-	public static final String MAIL_SETTING_PATH2 = "config/mailAccount.setting";
-	public static final String MAIL_SETTING_PATH3 = "mail.setting";
+	public static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"};
 
 	/**
 	 * SMTP服务器域名