change paths

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

View File

@@ -11,6 +11,8 @@ import cn.hutool.core.io.IORuntimeException;
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;
/** /**
@@ -35,7 +37,7 @@ 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) {

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"};
/** /**