From 3e4b6ab3a9590639e1fa606b0d52b29e83ecb890 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 30 Jun 2024 12:06:44 +0800 Subject: [PATCH] =?UTF-8?q?chore(messaging/mail):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/{MailConfigService.java => MailConfigurer.java} | 4 ++-- .../continew/starter/messaging/mail/util/MailUtils.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) rename continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/{MailConfigService.java => MailConfigurer.java} (97%) diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigService.java b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigurer.java similarity index 97% rename from continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigService.java rename to continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigurer.java index fd127006..bf8863d3 100644 --- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigService.java +++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/core/MailConfigurer.java @@ -20,12 +20,12 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; import top.continew.starter.core.util.validate.ValidationUtils; /** - * 邮件配置服务 + * 邮件配置 * * @author Charles7c * @since 2.1.0 */ -public interface MailConfigService { +public interface MailConfigurer { /** * 获取邮件配置 diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java index 08f937ef..d32f9319 100644 --- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java +++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java @@ -27,7 +27,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.MimeMessageHelper; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ExceptionUtils; -import top.continew.starter.messaging.mail.core.MailConfigService; +import top.continew.starter.messaging.mail.core.MailConfigurer; import java.io.File; import java.nio.charset.StandardCharsets; @@ -217,10 +217,9 @@ public class MailUtils { */ public static JavaMailSenderImpl getMailSender() { JavaMailSenderImpl mailSender = SpringUtil.getBean(JavaMailSenderImpl.class); - MailConfigService mailConfigService = ExceptionUtils.exToNull(() -> SpringUtil - .getBean(MailConfigService.class)); - if (mailConfigService != null && mailConfigService.getMailConfig() != null) { - mailConfigService.apply(mailConfigService.getMailConfig(), mailSender); + MailConfigurer mailConfigurer = ExceptionUtils.exToNull(() -> SpringUtil.getBean(MailConfigurer.class)); + if (mailConfigurer != null && mailConfigurer.getMailConfig() != null) { + mailConfigurer.apply(mailConfigurer.getMailConfig(), mailSender); } return mailSender; }