mirror of
https://gitee.com/dromara/hutool.git
synced 2025-07-31 16:11:50 +08:00
优化全局邮箱账户初始化逻辑
This commit is contained in:
parent
870ea9a329
commit
219150b5a0
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user