From 7efa38afad309cc2ed543bfbe7e3a1df10e58514 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 26 三月 2025 11:33:29 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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..955e8e2 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
@@ -147,15 +145,15 @@
String filePath = map.get("filePath");
String fileName = map.get("fileName");
tempFilePath.add(Paths.get(filePath));
- FileDataSource source = new FileDataSource(filePath);
+ FileDataSource source = new FileDataSource(filePath+"\\"+fileName);
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