diff --git a/sms4j-Email-plugin/sms4j-Email-api/src/main/java/org/dromara/email/api/MailClient.java b/sms4j-Email-plugin/sms4j-Email-api/src/main/java/org/dromara/email/api/MailClient.java index b1308bf0..fb38ab6b 100644 --- a/sms4j-Email-plugin/sms4j-Email-api/src/main/java/org/dromara/email/api/MailClient.java +++ b/sms4j-Email-plugin/sms4j-Email-api/src/main/java/org/dromara/email/api/MailClient.java @@ -1,5 +1,7 @@ package org.dromara.email.api; +import org.dromara.email.comm.entity.MailMessage; + import java.io.InputStream; import java.lang.String; import java.util.List; @@ -87,6 +89,15 @@ public interface MailClient { */ void sendEmail(List mailAddress, String title, String body,List cc,List bcc,Map files); + /** + * sendEmail + *

发送邮件,可以通过对象构造群体发送或者单体发送,取决于添加进去的收件人,同时可以添加 + * 密送人,抄送人,附件等参数 + * @param mailMessage 发送邮件参数对象 + * @author :Wind + */ + void sendEmail(MailMessage mailMessage); + /** * sendHtml *

读取模板发送html邮件,无正文 diff --git a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/entity/MailMessage.java b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/entity/MailMessage.java similarity index 98% rename from sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/entity/MailMessage.java rename to sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/entity/MailMessage.java index eb53aa11..04319fd8 100644 --- a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/entity/MailMessage.java +++ b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/entity/MailMessage.java @@ -1,4 +1,4 @@ -package org.dromara.email.core.entity; +package org.dromara.email.comm.entity; import lombok.Getter; diff --git a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java b/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java index a2b31c66..c449e1c9 100644 --- a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java +++ b/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java @@ -7,6 +7,7 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import org.dromara.email.api.MailClient; import org.dromara.email.api.Parameter; +import org.dromara.email.comm.entity.MailMessage; import org.dromara.email.comm.errors.MailException; import org.dromara.email.comm.utils.HtmlUtil; import org.dromara.email.comm.utils.ZipUtils; @@ -114,6 +115,16 @@ public class MailService implements MailClient { } } + @Override + public void sendEmail(MailMessage mailMessage) { + sendEmail(mailMessage.getMailAddress(), + mailMessage.getTitle(), + mailMessage.getBody(), + mailMessage.getCc(), + mailMessage.getBcc(), + mailMessage.getFiles()); + } + @Override public void sendHtml(String mailAddress, String title, String htmlName, Map parameter) { sendHtml(Collections.singletonList(mailAddress), title, htmlName, parameter);