feat: 全局格式化代码

ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java

@@ -44,7 +44,7 @@ public class MailConfig {
         account.setConnectionTimeout(0);
     }
 
-    public String getKey(String key){
+    public String getKey(String key) {
         return configService.getConfigValue("mail", key);
     }
 }

ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/utils/Mail.java

@@ -36,6 +36,10 @@ public class Mail implements Builder<MimeMessage> {
      * 邮箱帐户信息以及一些客户端配置信息
      */
     private final MailAccount mailAccount;
+    /**
+     * 正文、附件和图片的混合部分
+     */
+    private final Multipart multipart = new MimeMultipart();
     /**
      * 收件人列表
      */
@@ -64,10 +68,6 @@ public class Mail implements Builder<MimeMessage> {
      * 是否为HTML
      */
     private boolean isHtml;
-    /**
-     * 正文、附件和图片的混合部分
-     */
-    private final Multipart multipart = new MimeMultipart();
     /**
      * 是否使用全局会话，默认为false
      */
@@ -78,6 +78,25 @@ public class Mail implements Builder<MimeMessage> {
      */
     private PrintStream debugOutput;
 
+    /**
+     * 构造，使用全局邮件帐户
+     */
+    public Mail() {
+        this(GlobalMailAccount.INSTANCE.getAccount());
+    }
+
+    /**
+     * 构造
+     *
+     * @param mailAccount 邮件帐户，如果为null使用默认配置文件的全局邮件配置
+     */
+    public Mail(MailAccount mailAccount) {
+        mailAccount = (null != mailAccount) ? mailAccount : GlobalMailAccount.INSTANCE.getAccount();
+        this.mailAccount = mailAccount.defaultIfEmpty();
+    }
+
+    // --------------------------------------------------------------- Constructor start
+
     /**
      * 创建邮件客户端
      *
@@ -96,25 +115,6 @@ public class Mail implements Builder<MimeMessage> {
     public static Mail create() {
         return new Mail();
     }
-
-    // --------------------------------------------------------------- Constructor start
-
-    /**
-     * 构造，使用全局邮件帐户
-     */
-    public Mail() {
-        this(GlobalMailAccount.INSTANCE.getAccount());
-    }
-
-    /**
-     * 构造
-     *
-     * @param mailAccount 邮件帐户，如果为null使用默认配置文件的全局邮件配置
-     */
-    public Mail(MailAccount mailAccount) {
-        mailAccount = (null != mailAccount) ? mailAccount : GlobalMailAccount.INSTANCE.getAccount();
-        this.mailAccount = mailAccount.defaultIfEmpty();
-    }
     // --------------------------------------------------------------- Constructor end
 
     // --------------------------------------------------------------- Getters and Setters start

ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/utils/MailAccount.java

@@ -18,9 +18,9 @@ import java.util.Properties;
  * @author Luxiaolei
  */
 public class MailAccount implements Serializable {
+    public static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"};
     @Serial
     private static final long serialVersionUID = -6937313421815719204L;
-
     private static final String MAIL_PROTOCOL = "mail.transport.protocol";
     private static final String SMTP_HOST = "mail.smtp.host";
     private static final String SMTP_PORT = "mail.smtp.port";
@@ -28,7 +28,6 @@ public class MailAccount implements Serializable {
     private static final String SMTP_TIMEOUT = "mail.smtp.timeout";
     private static final String SMTP_CONNECTION_TIMEOUT = "mail.smtp.connectiontimeout";
     private static final String SMTP_WRITE_TIMEOUT = "mail.smtp.writetimeout";
-
     // SSL
     private static final String STARTTLS_ENABLE = "mail.smtp.starttls.enable";
     private static final String SSL_ENABLE = "mail.smtp.ssl.enable";
@@ -36,17 +35,16 @@ public class MailAccount implements Serializable {
     private static final String SOCKET_FACTORY = "mail.smtp.socketFactory.class";
     private static final String SOCKET_FACTORY_FALLBACK = "mail.smtp.socketFactory.fallback";
     private static final String SOCKET_FACTORY_PORT = "smtp.socketFactory.port";
-
-    // System Properties
-    private static final String SPLIT_LONG_PARAMS = "mail.mime.splitlongparameters";
     //private static final String ENCODE_FILE_NAME = "mail.mime.encodefilename";
     //private static final String CHARSET = "mail.mime.charset";
-
+    // System Properties
+    private static final String SPLIT_LONG_PARAMS = "mail.mime.splitlongparameters";
     // 其他
     private static final String MAIL_DEBUG = "mail.debug";
-
-    public static final String[] MAIL_SETTING_PATHS = new String[]{"config/mail.setting", "config/mailAccount.setting", "mail.setting"};
-
+    /**
+     * 自定义的其他属性，此自定义属性会覆盖默认属性
+     */
+    private final Map<String, Object> customProperty = new HashMap<>();
     /**
      * SMTP服务器域名
      */
@@ -71,7 +69,6 @@ public class MailAccount implements Serializable {
      * 发送方，遵循RFC-822标准
      */
     private String from;
-
     /**
      * 是否打开调试模式，调试模式会显示与邮件服务器通信过程，默认不开启
      */
@@ -88,7 +85,6 @@ public class MailAccount implements Serializable {
      * 对于文件名是否使用{@link #charset}编码，默认为 {@code true}
      */
     private boolean encodefilename = true;
-
     /**
      * 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。它将纯文本连接升级为加密连接（TLS或SSL）， 而不是使用一个单独的加密通信端口。
      */
@@ -97,12 +93,10 @@ public class MailAccount implements Serializable {
      * 使用 SSL安全连接
      */
     private Boolean sslEnable;
-
     /**
      * SSL协议，多个协议用空格分隔
      */
     private String sslProtocols;
-
     /**
      * 指定实现javax.net.SocketFactory接口的类的名称,这个类将被用于创建SMTP的套接字
      */
@@ -115,7 +109,6 @@ public class MailAccount implements Serializable {
      * 指定的端口连接到在使用指定的套接字工厂。如果没有设置,将使用默认端口
      */
     private int socketFactoryPort = 465;
-
     /**
      * SMTP超时时长，单位毫秒，缺省值不超时
      */
@@ -129,11 +122,6 @@ public class MailAccount implements Serializable {
      */
     private long writeTimeout;
 
-    /**
-     * 自定义的其他属性，此自定义属性会覆盖默认属性
-     */
-    private final Map<String, Object> customProperty = new HashMap<>();
-
     // -------------------------------------------------------------- Constructor start
 
     /**
@@ -654,6 +642,6 @@ public class MailAccount implements Serializable {
     @Override
     public String toString() {
         return "MailAccount [host=" + host + ", port=" + port + ", auth=" + auth + ", user=" + user + ", pass=" + (StrUtil.isEmpty(this.pass) ? "" : "******") + ", from=" + from + ", startttlsEnable="
-            + starttlsEnable + ", socketFactoryClass=" + socketFactoryClass + ", socketFactoryFallback=" + socketFactoryFallback + ", socketFactoryPort=" + socketFactoryPort + "]";
+                + starttlsEnable + ", socketFactoryClass=" + socketFactoryClass + ", socketFactoryFallback=" + socketFactoryFallback + ", socketFactoryPort=" + socketFactoryPort + "]";
     }
 }

ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/utils/MailUtils.java

@@ -389,7 +389,7 @@ public class MailUtils {
         }
 
         return isSingleton ? Session.getDefaultInstance(mailAccount.getSmtpProps(), authenticator) //
-            : Session.getInstance(mailAccount.getSmtpProps(), authenticator);
+                : Session.getInstance(mailAccount.getSmtpProps(), authenticator);
     }
 
     // ------------------------------------------------------------------------------------------------------------------------ Private method start