From 099ea14bba367fd86f0dde37d908f07cc04c3d39 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 四月 2025 15:38:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 64d39bb..5e7ea1b 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
@@ -14,13 +14,11 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
import java.util.concurrent.CompletableFuture;
@Component
@@ -146,16 +144,17 @@
messageBodyPart = new MimeBodyPart();
String filePath = map.get("filePath");
String fileName = map.get("fileName");
- tempFilePath.add(Paths.get(filePath));
- FileDataSource source = new FileDataSource(filePath);
+ Path path = Paths.get(filePath, fileName);
+ tempFilePath.add(path);
+ FileDataSource source = new FileDataSource(path.toString());
messageBodyPart.setDataHandler(new DataHandler(source));
- String filenameEncode = MimeUtility.encodeText(fileName, "UTF-8", "base64");
+ // 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(filenameEncode);
+ messageBodyPart.setFileName(fileName);
messageBodyPart.setHeader("Content-Transfer-Encoding", "base64");
messageBodyPart.setHeader("Content-Disposition", "attachment");
- messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + filenameEncode + "\"");
+ messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + fileName + "\"");
multipart.addBodyPart(messageBodyPart);
}
// 设置邮件内容
--
Gitblit v1.7.1