zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化全局邮箱账户初始化逻辑

Browse Source
This commit is contained in:
neko
2020-09-24 01:57:58 +08:00
committed by GitHub
parent 870ea9a329
commit 219150b5a0
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
hutool-extra/src/main/java/cn/hutool/extra/mail/GlobalMailAccount.java
View File

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