From e113d46ee53bcff4a4e99322cfdca982394b4504 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Thu, 9 May 2024 16:54:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=AF=B9=E8=B1=A1=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=82=AE=E4=BB=B6=EF=BC=8C=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=A4=9A=E9=99=84=E4=BB=B6=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bunny/common/service/utils/EmptyUtil.java | 9 +++++++++ .../java/cn/bunny/entity/email/EmailSend.java | 8 ++++---- ...lSendCheck.java => MailSendCheckUtil.java} | 7 ++++++- ...lSenderHelper.java => MailSenderUtil.java} | 20 ++++++++++--------- .../bunny/module/minio/utils/MinioUtil.java | 4 ++++ .../service/impl/EmailServiceImpl.java | 18 ++++++++--------- 6 files changed, 43 insertions(+), 23 deletions(-) rename module/module-mail/src/main/java/cn/bunny/module/mail/utils/{MailSendCheck.java => MailSendCheckUtil.java} (82%) rename module/module-mail/src/main/java/cn/bunny/module/mail/utils/{MailSenderHelper.java => MailSenderUtil.java} (91%) create mode 100644 module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/EmptyUtil.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/EmptyUtil.java index 84e08ba..9cbfe0c 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/EmptyUtil.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/EmptyUtil.java @@ -1,11 +1,20 @@ package cn.bunny.common.service.utils; import cn.bunny.common.service.exception.BunnyException; +import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; +@Slf4j public class EmptyUtil { + /** + * 是否为空 + * + * @param value 判断值 + * @param message 错误消息 + */ public static void isEmpty(Object value, String message) { if (value == null || !StringUtils.hasText(value.toString())) { + log.error("为空对象错误：{}，{}", value, message); throw new BunnyException(message); } } diff --git a/model/src/main/java/cn/bunny/entity/email/EmailSend.java b/model/src/main/java/cn/bunny/entity/email/EmailSend.java index 5f814f5..d3e69b7 100644 --- a/model/src/main/java/cn/bunny/entity/email/EmailSend.java +++ b/model/src/main/java/cn/bunny/entity/email/EmailSend.java @@ -1,22 +1,22 @@ package cn.bunny.entity.email; -import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.web.multipart.MultipartFile; +/** + * 邮件发送对象 + */ @Data @Builder @AllArgsConstructor @NoArgsConstructor public class EmailSend { // 给谁发送 - @NotNull(message = "发送者不能为空") private String sendTo; // 发送主题 - @NotNull(message = "主题不能为空") private String subject; // 是否为富文本 private Boolean isRichText; @@ -25,5 +25,5 @@ public class EmailSend { // 抄送人 private String ccParam; // 发送的文件 - private MultipartFile file; + private MultipartFile[] file; } diff --git a/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheck.java b/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheckUtil.java similarity index 82% rename from module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheck.java rename to module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheckUtil.java index e462942..9295238 100644 --- a/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheck.java +++ b/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSendCheckUtil.java @@ -4,7 +4,12 @@ import cn.bunny.common.constant.MessageConstant; import cn.bunny.common.service.utils.EmptyUtil; import cn.bunny.entity.email.EmailSend; -public class MailSendCheck { +public class MailSendCheckUtil { + /** + * 检测发送对象是否为空的对象 + * + * @param emailSend 邮件发送对象 + */ public static void check(EmailSend emailSend) { // 空发送对象 EmptyUtil.isEmpty(emailSend, MessageConstant.EMPTY_SEND_OBJECT); diff --git a/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderHelper.java b/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderUtil.java similarity index 91% rename from module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderHelper.java rename to module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderUtil.java index 2bbf42b..6fae9b0 100644 --- a/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderHelper.java +++ b/module/module-mail/src/main/java/cn/bunny/module/mail/utils/MailSenderUtil.java @@ -11,14 +11,14 @@ import org.springframework.web.multipart.MultipartFile; import java.util.Objects; -public class MailSenderHelper { +public class MailSenderUtil { private final String username; private final JavaMailSenderImpl javaMailSender; /** * 初始化构造函数进行当前类赋值 */ - public MailSenderHelper(EmailSendInit emailSendInit) { + public MailSenderUtil(EmailSendInit emailSendInit) { JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl(); javaMailSender.setHost(emailSendInit.getHost()); javaMailSender.setPort(emailSendInit.getPort()); @@ -37,7 +37,7 @@ public class MailSenderHelper { * @param emailSend 邮件消息 */ public void sendSimpleEmail(EmailSend emailSend) { - MailSendCheck.check(emailSend); + MailSendCheckUtil.check(emailSend); // 创建邮件消息体 SimpleMailMessage 发送简单邮件 SimpleMailMessage mailMessage = new SimpleMailMessage(); @@ -59,7 +59,7 @@ public class MailSenderHelper { * @param emailSend 邮件消息 */ public void sendAttachmentEmail(EmailSend emailSend, MultipartFile file, boolean isRich) throws MessagingException { - MailSendCheck.check(emailSend); + MailSendCheckUtil.check(emailSend); // 创建 MimeMessage 对象用户发送附件或者是富文本内容 MimeMessage mailMessage = javaMailSender.createMimeMessage(); // 创建 MimeMessageHelper @@ -86,7 +86,7 @@ public class MailSenderHelper { * @param emailSend 邮件消息 */ public void sendRichText(EmailSend emailSend, boolean isRich) throws MessagingException { - MailSendCheck.check(emailSend); + MailSendCheckUtil.check(emailSend); // 创建 MimeMessage 对象用户发送附件或者是富文本内容 MimeMessage mailMessage = javaMailSender.createMimeMessage(); // 创建 MimeMessageHelper @@ -111,7 +111,7 @@ public class MailSenderHelper { * @param emailSend 邮件消息 */ public void sendCC(EmailSend emailSend, boolean isRich) throws MessagingException { - MailSendCheck.check(emailSend); + MailSendCheckUtil.check(emailSend); // 创建 MimeMessage 对象用于发送邮件富文本或者附件 MimeMessage message = javaMailSender.createMimeMessage(); // 创建 MimeMessageHelper @@ -138,7 +138,7 @@ public class MailSenderHelper { * @param emailSend 邮件消息 */ public void sendEmail(EmailSend emailSend) throws MessagingException { - MailSendCheck.check(emailSend); + MailSendCheckUtil.check(emailSend); // 创建 MimeMessage 对象用于发送邮件富文本或者附件 MimeMessage message = javaMailSender.createMimeMessage(); @@ -156,8 +156,10 @@ public class MailSenderHelper { // 设置抄送人 helper.setCc(emailSend.getCcParam().split(",")); // 邮件添加附件 - MultipartFile file = emailSend.getFile(); - helper.addAttachment(Objects.requireNonNull(file.getOriginalFilename()), file); + MultipartFile[] files = emailSend.getFile(); + for (MultipartFile file : files) { + helper.addAttachment(Objects.requireNonNull(file.getOriginalFilename()), file); + } // 发送邮件 javaMailSender.send(message); diff --git a/module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java b/module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java new file mode 100644 index 0000000..b273856 --- /dev/null +++ b/module/module-minio/src/main/java/cn/bunny/module/minio/utils/MinioUtil.java @@ -0,0 +1,4 @@ +package cn.bunny.module.minio.utils; + +public class MinioUtil { +} diff --git a/service/src/main/java/cn/bunny/service/service/impl/EmailServiceImpl.java b/service/src/main/java/cn/bunny/service/service/impl/EmailServiceImpl.java index 9b483b4..1c90bec 100644 --- a/service/src/main/java/cn/bunny/service/service/impl/EmailServiceImpl.java +++ b/service/src/main/java/cn/bunny/service/service/impl/EmailServiceImpl.java @@ -2,7 +2,7 @@ package cn.bunny.service.service.impl; import cn.bunny.entity.email.EmailSend; import cn.bunny.entity.email.EmailSendInit; -import cn.bunny.module.mail.utils.MailSenderHelper; +import cn.bunny.module.mail.utils.MailSenderUtil; import cn.bunny.service.service.EmailService; import jakarta.mail.MessagingException; import lombok.extern.slf4j.Slf4j; @@ -24,8 +24,8 @@ public class EmailServiceImpl implements EmailService { emailSendInit.setPort(465); emailSendInit.setUsername("3324855376@qq.com"); emailSendInit.setPassword("axyqbvfuxkdqdaai"); - MailSenderHelper mailSenderHelper = new MailSenderHelper(emailSendInit); - mailSenderHelper.sendSimpleEmail(emailSend); + MailSenderUtil mailSenderUtil = new MailSenderUtil(emailSendInit); + mailSenderUtil.sendSimpleEmail(emailSend); } /** @@ -43,8 +43,8 @@ public class EmailServiceImpl implements EmailService { emailSendInit.setUsername("3324855376@qq.com"); emailSendInit.setPassword("axyqbvfuxkdqdaai"); - MailSenderHelper mailSenderHelper = new MailSenderHelper(emailSendInit); - mailSenderHelper.sendEmail(emailSend); + MailSenderUtil mailSenderUtil = new MailSenderUtil(emailSendInit); + mailSenderUtil.sendEmail(emailSend); return true; } catch (MessagingException e) { return false; @@ -66,8 +66,8 @@ public class EmailServiceImpl implements EmailService { emailSendInit.setUsername("3324855376@qq.com"); emailSendInit.setPassword("axyqbvfuxkdqdaai"); - MailSenderHelper mailSenderHelper = new MailSenderHelper(emailSendInit); - mailSenderHelper.sendRichText(emailSend, true); + MailSenderUtil mailSenderUtil = new MailSenderUtil(emailSendInit); + mailSenderUtil.sendRichText(emailSend, true); return true; } catch (MessagingException e) { return false; @@ -88,8 +88,8 @@ public class EmailServiceImpl implements EmailService { emailSendInit.setUsername("3324855376@qq.com"); emailSendInit.setPassword("axyqbvfuxkdqdaai"); - MailSenderHelper mailSenderHelper = new MailSenderHelper(emailSendInit); - mailSenderHelper.sendCC(emailSend, true); + MailSenderUtil mailSenderUtil = new MailSenderUtil(emailSendInit); + mailSenderUtil.sendCC(emailSend, true); return true; } catch (MessagingException e) { return false;