lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-06-28 13:34:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1114 from akiyamaneko/email_simplify

Browse Source 
优化全局邮箱账户初始化逻辑
This commit is contained in:
Golden Looly 2020-09-25 11:32:51 +08:00 committed by GitHub
commit 3846985acd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 25 deletions
Show Stats 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 { try {
mailAccount = new MailAccount(MailAccount.MAIL_SETTING_PATH); return new MailAccount(mailSettingPath);
} catch (IORuntimeException e) {
//ignore
}
// 寻找config/mailAccount.setting
if(null == mailAccount) {
try {
mailAccount = new MailAccount(MailAccount.MAIL_SETTING_PATH2);
} 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;
} }
} }

4
hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
View File

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