This commit is contained in:
Looly 2021-09-08 12:09:31 +08:00
parent 9223811716
commit 5ae924b9c6
3 changed files with 2 additions and 8 deletions

View File

@ -200,7 +200,7 @@ public class FileWriter extends FileWrapper{
try (PrintWriter writer = getPrintWriter(isAppend)){ try (PrintWriter writer = getPrintWriter(isAppend)){
for (T t : list) { for (T t : list) {
if (null != t) { if (null != t) {
writer.print(t.toString()); writer.print(t);
printNewLine(writer, lineSeparator); printNewLine(writer, lineSeparator);
writer.flush(); writer.flush();
} }

View File

@ -11,8 +11,6 @@ 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;
/** /**
@ -37,7 +35,7 @@ public enum GlobalMailAccount {
* @return MailAccount * @return MailAccount
*/ */
private MailAccount createDefaultAccount() { private MailAccount createDefaultAccount() {
for (String mailSettingPath : MAIL_SETTING_PATHS) { for (String mailSettingPath : MailAccount.MAIL_SETTING_PATHS) {
try { try {
return new MailAccount(mailSettingPath); return new MailAccount(mailSettingPath);
} catch (IORuntimeException ignore) { } catch (IORuntimeException ignore) {

View File

@ -37,10 +37,6 @@ 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"};
/** /**