From b606905fcaf748edfc4bafb236e388f3295f2899 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 四月 2025 09:16:46 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java | 103 +++++++++++++++++++++++++--------------------------
1 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
index e418db1..22aad9d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
@@ -8,17 +8,17 @@
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
-import java.net.URLEncoder;
-import javax.activation.URLDataSource;
+import javax.annotation.Resource;
import javax.mail.*;
import javax.mail.internet.*;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
import java.util.concurrent.CompletableFuture;
@Component
@@ -52,7 +52,8 @@
// 访问SMTP服务时需要提供的密码(在控制台选择发信地址进行设置)
props.put("mail.password", properties.getPassword());
props.setProperty("mail.smtp.socketFactory.fallback", "false");
- props.put("mail.smtp.ssl.enable", "false");
+ props.put("mail.smtp.ssl.enable", "true");
+ props.put("mail.smtp.ssl.protocols", "TLSv1.2");
// 构建授权信息，用于进行SMTP进行身份验证
Authenticator authenticator = new Authenticator() {
@Override
@@ -96,8 +97,12 @@
//发送邮件
Transport.send(message);
} catch (MessagingException | UnsupportedEncodingException e) {
+ e.printStackTrace();
log.error("发送邮件发生异常",e);
throw new ServiceException("发送邮件失败,请检查");
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("发送邮件发生异常",e);
}
}
@@ -116,32 +121,54 @@
try {
// 创建邮件会话
Session mailSession = Session.getInstance(getMailProperties(), getAuthenticator());
-
// 创建邮件消息
MimeMessage message = new MimeMessage(mailSession);
-
// 设置发件人
InternetAddress from = new InternetAddress(properties.getUserAddr(), properties.getUserName());
message.setFrom(from);
-
// 设置收件人
InternetAddress to = new InternetAddress(emailAddress);
message.setRecipient(MimeMessage.RecipientType.TO, to);
-
// 设置邮件标题
message.setSubject("发票");
-
// 创建邮件内容
- Multipart multipart = createMultipart(list);
-
+ Multipart multipart = new MimeMultipart();
+ // 添加文本消息部分
+ BodyPart messageBodyPart = new MimeBodyPart();
+ messageBodyPart.setHeader("Content-Type", "text/plain;charset=utf-8");
+ messageBodyPart.setContent("您在小程序提交的开票申请已开票成功，请查看附件内容","text/html;charset=UTF-8");
+ multipart.addBodyPart(messageBodyPart);
+ List<Path> tempFilePath = new ArrayList<>();
+ // 添加附件部分
+ for (Map<String, String> map : list) {
+ messageBodyPart = new MimeBodyPart();
+ String filePath = map.get("filePath");
+ String fileName = map.get("fileName");
+ tempFilePath.add(Paths.get(filePath,fileName));
+ FileDataSource source = new FileDataSource(filePath+"\\"+fileName);
+ messageBodyPart.setDataHandler(new DataHandler(source));
+ // String filenameEncode = MimeUtility.encodeText(fileName, "UTF-8", "base64");
+ // String encodedFileName = Base64.getEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
+ // String filenameEncode = MimeUtility.encodeText(encodedFileName);
+ messageBodyPart.setFileName(fileName);
+ messageBodyPart.setHeader("Content-Transfer-Encoding", "base64");
+ messageBodyPart.setHeader("Content-Disposition", "attachment");
+ messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + fileName + "\"");
+ multipart.addBodyPart(messageBodyPart);
+ }
// 设置邮件内容
message.setContent(multipart);
-
// 发送邮件
Transport.send(message);
+ // 删除临时目录里面的文件
+ for (Path path : tempFilePath) {
+ Files.deleteIfExists(path);
+ }
} catch (MessagingException | UnsupportedEncodingException | MalformedURLException e) {
log.error("发送邮件发生异常", e);
throw new ServiceException("发送邮件失败, 请检查");
+ } catch (IOException e) {
+ throw new RuntimeException("文件下载发生异常");
}
}
@@ -155,7 +182,8 @@
props.put("mail.user", properties.getUserAddr());
props.put("mail.password", properties.getPassword());
props.setProperty("mail.smtp.socketFactory.fallback", "false");
- props.put("mail.smtp.ssl.enable", "false");
+ props.put("mail.smtp.ssl.enable", "true");
+ props.put("mail.smtp.ssl.protocols", "TLSv1.2");
return props;
}
@@ -170,39 +198,10 @@
};
}
- private Multipart createMultipart(List<Map<String, String>> list) throws MessagingException, UnsupportedEncodingException, MalformedURLException {
- Multipart multipart = new MimeMultipart();
-
- // 添加文本消息部分
- BodyPart messageBodyPart = new MimeBodyPart();
- messageBodyPart.setHeader("Content-Type", "text/plain;charset=utf-8");
- multipart.addBodyPart(messageBodyPart);
-
- // 添加附件部分
- for (Map<String, String> map : list) {
- messageBodyPart = new MimeBodyPart();
- String url = map.get("url");
- String fileName = map.get("fileName");
-
- URLDataSource source = new URLDataSource(new URL(url));
- messageBodyPart.setDataHandler(new DataHandler(source));
-
- String filenameEncode = MimeUtility.encodeText(fileName, "UTF-8", "base64");
- messageBodyPart.setFileName(filenameEncode);
- messageBodyPart.setHeader("Content-Transfer-Encoding", "base64");
- messageBodyPart.setHeader("Content-Disposition", "attachment");
- messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + filenameEncode + "\"");
-
- multipart.addBodyPart(messageBodyPart);
- }
-
- return multipart;
- }
-
- public static void main(String[] args) throws UnsupportedEncodingException {
- TencentMailUtil tencentMailUtil = new TencentMailUtil();
- MailProperties properties = new MailProperties();
- tencentMailUtil.properties = properties;
- tencentMailUtil.send("645025773@qq.com","大学城揽院24栋");
- }
+ // public static void main(String[] args) throws UnsupportedEncodingException {
+ // TencentMailUtil tencentMailUtil = new TencentMailUtil();
+ // MailProperties properties = new MailProperties();
+ // tencentMailUtil.properties = properties;
+ // tencentMailUtil.send("645025773@qq.com","大学城揽院24栋");
+ // }
}
--
Gitblit v1.7.1