From 09f98d8509fb22db2edcc18bdafc0c7ab7c3baa1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 四月 2025 09:12:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java | 12 ++++++------
1 files changed, 6 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..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
@@ -144,16 +144,16 @@
messageBodyPart = new MimeBodyPart();
String filePath = map.get("filePath");
String fileName = map.get("fileName");
- tempFilePath.add(Paths.get(filePath));
- FileDataSource source = new FileDataSource(filePath);
+ 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(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