refactor: 调整邮件服务配置

This commit is contained in:
2024-05-31 22:52:50 +08:00
parent ee30e861ff
commit 7feda79359

View File

@@ -23,7 +23,6 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import jakarta.mail.MessagingException; import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMessage;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.mail.javamail.MimeMessageHelper;
import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.constant.StringConstants;
@@ -159,12 +158,13 @@ public class MailUtils {
boolean isHtml, boolean isHtml,
File... files) throws MessagingException { File... files) throws MessagingException {
Assert.isFalse(CollUtil.isEmpty(tos), "请至少指定一名收件人"); Assert.isFalse(CollUtil.isEmpty(tos), "请至少指定一名收件人");
JavaMailSender mailSender = getMailSender(); JavaMailSenderImpl mailSender = getMailSender();
MimeMessage mimeMessage = mailSender.createMimeMessage(); MimeMessage mimeMessage = mailSender.createMimeMessage();
// 创建邮件发送器 // 创建邮件发送器
MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, StandardCharsets.UTF_8 MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, StandardCharsets.UTF_8
.displayName()); .displayName());
// 设置基本信息 // 设置基本信息
messageHelper.setFrom(mailSender.getUsername());
messageHelper.setSubject(subject); messageHelper.setSubject(subject);
messageHelper.setText(content, isHtml); messageHelper.setText(content, isHtml);
// 设置收信人 // 设置收信人
@@ -214,7 +214,7 @@ public class MailUtils {
* *
* @return 邮件 Sender * @return 邮件 Sender
*/ */
public static JavaMailSender getMailSender() { public static JavaMailSenderImpl getMailSender() {
JavaMailSenderImpl mailSender = SpringUtil.getBean(JavaMailSenderImpl.class); JavaMailSenderImpl mailSender = SpringUtil.getBean(JavaMailSenderImpl.class);
MailConfigService mailConfigService = ExceptionUtils.exToNull(() -> SpringUtil MailConfigService mailConfigService = ExceptionUtils.exToNull(() -> SpringUtil
.getBean(MailConfigService.class)); .getBean(MailConfigService.class));