Skip to content

[davinci]fix: 修复SSL发送163企业邮箱时未设置session导致发送邮件失败 #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions server/src/main/java/edp/core/utils/MailUtils.java
Original file line number Diff line number Diff line change
@@ -27,15 +27,17 @@
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Component;
import org.thymeleaf.TemplateEngine;
import org.thymeleaf.context.Context;

import javax.mail.Authenticator;
import javax.mail.MessagingException;
import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -49,7 +51,7 @@
public class MailUtils {

@Autowired
private JavaMailSender javaMailSender;
private JavaMailSenderImpl javaMailSender;

@Autowired
private TemplateEngine templateEngine;
@@ -148,6 +150,15 @@ public void sendMail(MailContent mailContent, Logger customLogger) throws Server

try {
MimeMessage message = javaMailSender.createMimeMessage();
Authenticator auth = new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
// mail username and password
return new PasswordAuthentication(javaMailSender.getUsername(), javaMailSender.getPassword());
}
};
Session session = Session.getInstance(javaMailSender.getJavaMailProperties(),auth);
javaMailSender.setSession(session);
MimeMessageHelper messageHelper = new MimeMessageHelper(message, multipart);

messageHelper.setFrom(from, displayName);
@@ -193,7 +204,6 @@ public void sendMail(MailContent mailContent, Logger customLogger) throws Server
}
});
}

javaMailSender.send(message);
if (customLogger != null) {
customLogger.info("Email sending content:{}, cost:{}", mailContent.toString(), watch.elapsed(TimeUnit.MILLISECONDS));