Merge branch 'master' into branch20211210
This commit is contained in:
+24
@@ -19,6 +19,7 @@ import java.io.File;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
public class EmailSendMsgHandle implements ISendMsgHandle {
|
public class EmailSendMsgHandle implements ISendMsgHandle {
|
||||||
static String emailFrom;
|
static String emailFrom;
|
||||||
@@ -64,6 +65,17 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
|
|||||||
//设置端口(这里用465、默认的25 在阿里云服务器上未开放,推荐我们设置465)
|
//设置端口(这里用465、默认的25 在阿里云服务器上未开放,推荐我们设置465)
|
||||||
mailSender.setPort(25);
|
mailSender.setPort(25);
|
||||||
|
|
||||||
|
Properties javaMailProperties = mailSender.getJavaMailProperties();
|
||||||
|
javaMailProperties.setProperty("mail.smtp.auth", "true");
|
||||||
|
javaMailProperties.setProperty("mail.debug", "true");//启用调试
|
||||||
|
javaMailProperties.setProperty("mail.smtp.timeout", "3000"); //设置超时时间3秒
|
||||||
|
javaMailProperties.setProperty("mail.smtp.starttls.enable", "true");
|
||||||
|
javaMailProperties.setProperty("mail.smtp.starttls.required", "true");
|
||||||
|
javaMailProperties.setProperty("mail.smtp.ssl.enable", "false");
|
||||||
|
javaMailProperties.setProperty("mail.imap.ssl.socketFactory.fallback", "false");
|
||||||
|
javaMailProperties.setProperty("mail.smtp.ssl.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
|
||||||
|
mailSender.setJavaMailProperties(javaMailProperties);
|
||||||
|
|
||||||
MimeMessage message = mailSender.createMimeMessage();
|
MimeMessage message = mailSender.createMimeMessage();
|
||||||
try {
|
try {
|
||||||
//这里的utf-8解决 邮件 内容乱码
|
//这里的utf-8解决 邮件 内容乱码
|
||||||
@@ -110,6 +122,18 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
|
|||||||
mailSender.setPassword(emailPassword);
|
mailSender.setPassword(emailPassword);
|
||||||
//设置端口(这里用465、默认的25 在阿里云服务器上未开放,推荐我们设置465)
|
//设置端口(这里用465、默认的25 在阿里云服务器上未开放,推荐我们设置465)
|
||||||
mailSender.setPort(25);
|
mailSender.setPort(25);
|
||||||
|
|
||||||
|
Properties javaMailProperties = mailSender.getJavaMailProperties();
|
||||||
|
javaMailProperties.setProperty("mail.smtp.auth", "true");
|
||||||
|
javaMailProperties.setProperty("mail.debug", "true");//启用调试
|
||||||
|
javaMailProperties.setProperty("mail.smtp.timeout", "3000"); //设置超时时间3秒
|
||||||
|
javaMailProperties.setProperty("mail.smtp.starttls.enable", "true");
|
||||||
|
javaMailProperties.setProperty("mail.smtp.starttls.required", "true");
|
||||||
|
javaMailProperties.setProperty("mail.smtp.ssl.enable", "false");
|
||||||
|
javaMailProperties.setProperty("mail.imap.ssl.socketFactory.fallback", "false");
|
||||||
|
javaMailProperties.setProperty("mail.smtp.ssl.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
|
||||||
|
mailSender.setJavaMailProperties(javaMailProperties);
|
||||||
|
|
||||||
MimeMessage message = mailSender.createMimeMessage();
|
MimeMessage message = mailSender.createMimeMessage();
|
||||||
MimeMessageHelper helper = null;
|
MimeMessageHelper helper = null;
|
||||||
if(CollectionUtils.isEmpty(fileList)){
|
if(CollectionUtils.isEmpty(fileList)){
|
||||||
|
|||||||
Reference in New Issue
Block a user