From 2809275eb14deca48f62a28d7f1e604843d1b1da Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@gmail.com> Date: 星期三, 12 二月 2025 22:18:17 +0800 Subject: [PATCH] # --- rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java index 6a377d3..fa55f03 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java @@ -1,5 +1,9 @@ package com.vincent.rsf.server.common.service; +import com.alibaba.fastjson.JSON; +import com.vincent.rsf.common.utils.Utils; +import com.vincent.rsf.framework.common.Cools; +import com.vincent.rsf.server.system.enums.EmailType; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -10,6 +14,7 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import java.util.Map; @Slf4j @Service @@ -18,19 +23,39 @@ @Value("${spring.mail.username}") private String from; + private final static String TEMPLATE = "Your verification code is: ${code}"; + @Autowired + @SuppressWarnings("all") private JavaMailSender mailSender; - public boolean sendVerificationEmail(String to, String verificationCode) { + public boolean sendEmail(String to, EmailType emailType, Map<String, Object> param) { + + String subject = emailType.subject; + String content = emailType.content; + if (!Cools.isEmpty(param) && !param.isEmpty()) { + content = Utils.processTemplate(content, param); + } + + boolean sendRes = this.send(this.from, to, subject, content); + if (sendRes) { + log.info("Email sent successfully. To: {}, Subject: {}, Parameter: {}" + , to + , subject + , JSON.toJSONString(param)); + } + return sendRes; + } + + public boolean send(String from, String to, String subject, String content) { try { MimeMessage message = mailSender.createMimeMessage(); message.setFrom(from); - MimeMessageHelper helper = new MimeMessageHelper(message, true); - // 閭欢涓婚鍜屽唴瀹� + MimeMessageHelper helper = new MimeMessageHelper(message, true); helper.setTo(to); - helper.setSubject("Email Verification Code"); - helper.setText("Your verification code is: " + verificationCode); + helper.setSubject(subject); + helper.setText(content); mailSender.send(message); return true; -- Gitblit v1.9.1