From 51221bbef8e919aa41047fec651b6b66dd3de36c Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 29 Jul 2024 14:12:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(87346):=20=E6=96=87=E6=A1=A3=E6=8B=86?=
 =?UTF-8?q?=E5=88=86--=E7=BC=96=E8=BE=91--=E6=9D=A1=E6=AC=BE=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E9=98=BB=E5=A1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/oss/controller/SplitFileController.java |  5 ++++-
 .../service/impl/FileSplitItemsEOServiceImpl.java   | 13 ++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/laws-module-system/src/main/java/com/jero/modules/oss/controller/SplitFileController.java b/laws-module-system/src/main/java/com/jero/modules/oss/controller/SplitFileController.java
index 6182e187..d12d59e9 100644
--- a/laws-module-system/src/main/java/com/jero/modules/oss/controller/SplitFileController.java
+++ b/laws-module-system/src/main/java/com/jero/modules/oss/controller/SplitFileController.java
@@ -32,7 +32,10 @@ public class SplitFileController {
 	@ResponseBody
 	@GetMapping("/getImage")
 	public void queryPageList(@RequestParam("fileName") String fileName, HttpServletResponse response, HttpServletRequest request) {
-		String fileUrl = ("temp\\" + fileName).replace("\\\\", "\\");
+		if (!fileName.contains("temp")){
+			fileName = "temp\\" + fileName;
+		}
+		String fileUrl = fileName.replace("\\\\", "\\");
 		response.setHeader("Content-Disposition",
 				"attachment; filename=\"" + SplitFileUtils.encodeFileName(fileName, request) + "\"");
 		response.setContentType("application/force-download");
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index b63f5ea0..aec40ae3 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -4478,9 +4478,16 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 //                bizPath = "";
 //            }
         }
-        OSSFile oSSFile = ossFileService.uploadLocalForSplit(file, bizPath,state,cut);
-        if (oConvertUtils.isNotEmpty(oSSFile)) {
-            result.setResult(oSSFile);
+//        OSSFile oSSFile = ossFileService.uploadLocalForSplit(file, bizPath,state,cut);
+        String upload = ObsBootUtil.upload(file, "temp");
+        if (oConvertUtils.isNotEmpty(upload)) {
+            OSSFile ossFile = new OSSFile();
+            ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
+            ossFile.setUrl(upload);
+            ossFile.setFileName(file.getOriginalFilename());
+            ossFileService.save(ossFile);
+            ossFile.setFileName(upload);
+            result.setResult(ossFile);
             result.setSuccess(true);
         } else {
             if("cut".equals(LanguageEnum.CN.getValue())){