From 0f83aded9f90d475890204d7b69e5927b11f0151 Mon Sep 17 00:00:00 2001
From: rays <1615175118@qq.com>
Date: Thu, 5 Aug 2021 09:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/email/api/pojo/SendMailParam.java  | 32 +++++++++++++++++--
 .../kernel/email/jdk/JavaMailSender.java      |  7 ++--
 .../modular/factory/CustomerFactory.java      |  5 +--
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/pojo/SendMailParam.java b/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/pojo/SendMailParam.java
index 745955af1..0af9e4b69 100644
--- a/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/pojo/SendMailParam.java
+++ b/kernel-d-email/email-api/src/main/java/cn/stylefeng/roses/kernel/email/api/pojo/SendMailParam.java
@@ -26,6 +26,11 @@ package cn.stylefeng.roses.kernel.email.api.pojo;
 
 import lombok.Data;
 
+import java.io.File;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 发送邮件的请求参数
  *
@@ -36,9 +41,19 @@ import lombok.Data;
 public class SendMailParam {
 
     /**
-     * 发送给某人的邮箱
+     * 收件人列表
      */
-    private String to;
+    private List<String> tos;
+
+    /**
+     * 抄送人列表,可以为null或空
+     */
+    private List<String> ccsTos;
+
+    /**
+     * 密送人列表,可以为null或空
+     */
+    private List<String> bccsTos;
 
     /**
      * 邮件标题
@@ -50,4 +65,17 @@ public class SendMailParam {
      */
     private String content;
 
+    /**
+     * 附件列表
+     */
+    private File[] files;
+
+    /**
+     * 图片与占位符，占位符格式为cid:${cid}
+     * <p>
+     * 注意:只有发送html邮件，图片才可正常显示
+     * 如:测试图片1:<img src='cid:image01'>
+     */
+    private Map<String, InputStream> imageMap;
+
 }
diff --git a/kernel-d-email/email-sdk-java/src/main/java/cn/stylefeng/roses/kernel/email/jdk/JavaMailSender.java b/kernel-d-email/email-sdk-java/src/main/java/cn/stylefeng/roses/kernel/email/jdk/JavaMailSender.java
index 20936bd5d..6c058be18 100644
--- a/kernel-d-email/email-sdk-java/src/main/java/cn/stylefeng/roses/kernel/email/jdk/JavaMailSender.java
+++ b/kernel-d-email/email-sdk-java/src/main/java/cn/stylefeng/roses/kernel/email/jdk/JavaMailSender.java
@@ -58,7 +58,7 @@ public class JavaMailSender implements MailSenderApi {
         assertSendMailParams(sendMailParam);
 
         //spring发送邮件
-        MailUtil.send(mailAccount, CollUtil.newArrayList(sendMailParam.getTo()), sendMailParam.getTitle(), sendMailParam.getContent(), false);
+        MailUtil.send(mailAccount, sendMailParam.getTos(), sendMailParam.getCcsTos(), sendMailParam.getBccsTos(), sendMailParam.getTitle(), sendMailParam.getContent(), sendMailParam.getImageMap(), false, sendMailParam.getFiles());
     }
 
     @Override
@@ -68,7 +68,7 @@ public class JavaMailSender implements MailSenderApi {
         assertSendMailParams(sendMailParam);
 
         //spring发送邮件
-        MailUtil.send(mailAccount, CollUtil.newArrayList(sendMailParam.getTo()), sendMailParam.getTitle(), sendMailParam.getContent(), true);
+        MailUtil.send(mailAccount, sendMailParam.getTos(), sendMailParam.getCcsTos(), sendMailParam.getBccsTos(), sendMailParam.getTitle(), sendMailParam.getContent(), sendMailParam.getImageMap(), true, sendMailParam.getFiles());
     }
 
     /**
@@ -83,7 +83,7 @@ public class JavaMailSender implements MailSenderApi {
             throw new MailException(EmailExceptionEnum.EMAIL_PARAM_EMPTY_ERROR.getErrorCode(), format);
         }
 
-        if (ObjectUtil.isEmpty(sendMailParam.getTo())) {
+        if (ObjectUtil.isEmpty(sendMailParam.getTos())) {
             String format = StrUtil.format(EmailExceptionEnum.EMAIL_PARAM_EMPTY_ERROR.getUserTip(), "收件人邮箱");
             throw new MailException(EmailExceptionEnum.EMAIL_PARAM_EMPTY_ERROR.getErrorCode(), format);
         }
@@ -98,5 +98,4 @@ public class JavaMailSender implements MailSenderApi {
             throw new MailException(EmailExceptionEnum.EMAIL_PARAM_EMPTY_ERROR.getErrorCode(), format);
         }
     }
-
 }
diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
index 5b796bbaa..02aeb5403 100644
--- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
+++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/factory/CustomerFactory.java
@@ -15,6 +15,7 @@ import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 
+import java.util.Collections;
 import java.util.Date;
 
 /**
@@ -78,7 +79,7 @@ public class CustomerFactory {
         String template = CustomerConfigExpander.getRegMailContent();
 
         SendMailParam sendMailParam = new SendMailParam();
-        sendMailParam.setTo(mail);
+        sendMailParam.setTos(Collections.singletonList(mail));
         sendMailParam.setTitle(title);
         sendMailParam.setContent(StrUtil.format(template, verifyCode, verifyCode));
         return sendMailParam;
@@ -121,7 +122,7 @@ public class CustomerFactory {
         String template = CustomerConfigExpander.getResetPwdMailContent();
 
         SendMailParam sendMailParam = new SendMailParam();
-        sendMailParam.setTo(mail);
+        sendMailParam.setTos(Collections.singletonList(mail));
         sendMailParam.setTitle(title);
         sendMailParam.setContent(StrUtil.format(template, randomCode));
         return sendMailParam;