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; } }