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

change paths

Browse Source
This commit is contained in:
Looly
2021-09-06 09:58:55 +08:00
parent 3acb81a58a
commit 3b94a2da66
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,13 +4,15 @@ import cn.hutool.core.io.IORuntimeException;
/** /**
* 全局邮件帐户，依赖于邮件配置文件{@link MailAccount#MAIL_SETTING_PATHS} * 全局邮件帐户，依赖于邮件配置文件{@link MailAccount#MAIL_SETTING_PATHS}
* *
* @author looly * @author looly
* *
*/ */
public enum GlobalMailAccount { public enum GlobalMailAccount {
INSTANCE; INSTANCE;
private static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"};
private final MailAccount mailAccount; private final MailAccount mailAccount;
/** /**
@@ -22,7 +24,7 @@ public enum GlobalMailAccount {
/** /**
* 获得邮件帐户 * 获得邮件帐户
* *
* @return 邮件帐户 * @return 邮件帐户
*/ */
public MailAccount getAccount() { public MailAccount getAccount() {
@@ -31,11 +33,11 @@ public enum GlobalMailAccount {
/** /**
* 创建默认帐户 * 创建默认帐户
* *
* @return MailAccount * @return MailAccount
*/ */
private MailAccount createDefaultAccount() { private MailAccount createDefaultAccount() {
for (String mailSettingPath : MailAccount.MAIL_SETTING_PATHS) { for (String mailSettingPath : MAIL_SETTING_PATHS) {
try { try {
return new MailAccount(mailSettingPath); return new MailAccount(mailSettingPath);
} catch (IORuntimeException ignore) { } catch (IORuntimeException ignore) {

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

@@ -37,6 +37,10 @@ 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";
/**
* @deprecated 此公共配置没有公开必要，迁移至GlobalMailAccount#MAIL_SETTING_PATHS
*/
@Deprecated
public static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"}; public static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"};
/** /**