From ba4af275c3b8d073f863be7b12e43974b3ef14a2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 12 七月 2025 10:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after into pim_ly

---
 src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
index eb801bc..61de057 100644
--- a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -6,6 +6,7 @@
 import com.ruoyi.other.pojo.TempFile;
 import com.ruoyi.other.service.TempFileService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.util.URLEncoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -13,6 +14,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -35,7 +37,14 @@
     public TempFile uploadFile(MultipartFile file,Integer type) throws IOException {
         // 1. 鐢熸垚涓存椂鏂囦欢ID鍜岃矾寰�
         String tempId = UUID.randomUUID().toString();
-        Path tempFilePath = Paths.get(tempDir, tempId + "_" + file.getOriginalFilename());
+        String originalFilename = file.getOriginalFilename();
+        if(originalFilename == null) throw new IOException("鏂囦欢鍚嶄笉鑳戒负绌�");
+        URLEncoder urlEncoder = new URLEncoder();
+        String encodedFilename = urlEncoder.encode(originalFilename, StandardCharsets.UTF_8);
+        encodedFilename = encodedFilename.replaceAll("%2E",".");
+        Path tempFilePath = Paths.get(tempDir, tempId + "_" + encodedFilename);
+
+//        Path tempFilePath = Paths.get(tempDir, tempId + "_" + file.getOriginalFilename());
 
         // 2. 纭繚鐩綍瀛樺湪
         Path parentDir = tempFilePath.getParent();

--
Gitblit v1.9.3