From db7e077ea8f2d995e922bc11b77dc149592a7455 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 09 四月 2025 12:35:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 617c714..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
@@ -144,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 encodedFileName = Base64.getEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
- String filenameEncode = MimeUtility.encodeText(encodedFileName);
- messageBodyPart.setFileName(filenameEncode);
+ // 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=\"" + filenameEncode + "\"");
+ messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + fileName + "\"");
multipart.addBodyPart(messageBodyPart);
}
// 设置邮件内容
--
Gitblit v1.7.1