优化邮件处理逻辑

framework-email/src/main/java/com/chelvc/framework/email/DefaultEmailHandler.java

@@ -1,6 +1,5 @@
 package com.chelvc.framework.email;
 
-import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.function.Consumer;
@@ -30,11 +29,6 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Slf4j
 public class DefaultEmailHandler implements EmailHandler {
-    /**
-     * 空邮件附件数组
-     */
-    private static final MimeBodyPart[] EMPTY_ATTACHMENT_ARRAY = new MimeBodyPart[0];
-
     private final Session session;
 
     public DefaultEmailHandler(@NonNull Session session) {
@@ -48,7 +42,7 @@ public class DefaultEmailHandler implements EmailHandler {
      * @param attachments 邮件附件数组
      * @return 邮件消息对象
      */
-    private Message body2message(@NonNull Body body, @NonNull MimeBodyPart... attachments) {
+    private Message body2message(Body body, MimeBodyPart... attachments) {
         Message message = new MimeMessage(this.session);
         String username = this.session.getProperty("username");
         String nickname = this.session.getProperty("nickname");
@@ -84,16 +78,6 @@ public class DefaultEmailHandler implements EmailHandler {
         return message;
     }
 
-    @Override
-    public boolean send(@NonNull Body body) {
-        return this.send(body, EMPTY_ATTACHMENT_ARRAY);
-    }
-
-    @Override
-    public boolean send(@NonNull Body body, @NonNull File... attachments) {
-        return this.send(body, EmailContextHolder.part(attachments));
-    }
-
     @Override
     public boolean send(@NonNull Body body, @NonNull MimeBodyPart... attachments) {
         Message message = this.body2message(body, attachments);

framework-email/src/main/java/com/chelvc/framework/email/EmailHandler.java

@@ -8,6 +8,7 @@ import javax.mail.internet.MimeBodyPart;
 import javax.mail.search.SearchTerm;
 
 import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.email.context.EmailContextHolder;
 
 /**
  * 邮件操作接口
@@ -22,7 +23,9 @@ public interface EmailHandler {
      * @param body 邮件消息体对象
      * @return true/false
      */
-    boolean send(Body body);
+    default boolean send(Body body) {
+        return this.send(body, new MimeBodyPart[0]);
+    }
 
     /**
      * 发送邮件
@@ -31,7 +34,9 @@ public interface EmailHandler {
      * @param attachments 邮件附件数组
      * @return true/false
      */
-    boolean send(Body body, File... attachments);
+    default boolean send(Body body, File... attachments) {
+        return this.send(body, EmailContextHolder.part(attachments));
+    }
 
     /**
      * 发送邮件