From 0795733d1c2a815c3fe35cb151939e091705654c Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Tue, 25 Feb 2025 09:50:27 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/common/CommonController.java    |  3 ++-
 .../com/shuili/common/config/ShuiliConfig.java |  9 +++++----
 .../shuili/common/utils/FileUploadUtils.java   | 18 +++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java b/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java
index bca50095..5a46efcb 100644
--- a/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java
+++ b/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java
@@ -58,7 +58,7 @@ public class CommonController {
         try {
 
             String uploadType = ShuiliConfig.getUploadType();
-
+            String downloadPath = ShuiliConfig.getProfile();
 
             if (uploadType.equals("disk")) {
                 // 下载名称
@@ -67,6 +67,7 @@ public class CommonController {
                 response.setContentType("multipart/form-data");
                 response.setHeader("Content-Disposition",
                         "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName));
+                fileName=fileName.replace("/profile",downloadPath);
                 FileUtils.writeBytes(fileName, response.getOutputStream());
             } else {
 
diff --git a/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java b/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java
index 82a61507..f41b86d3 100644
--- a/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java
+++ b/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java
@@ -1,5 +1,6 @@
 package com.shuili.common.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
@@ -10,8 +11,7 @@ import org.springframework.stereotype.Component;
  * @author shuili
  */
 @Component
-@ConfigurationProperties(prefix = "shuili")
-@Lazy(false)
+//@ConfigurationProperties(prefix = "shuili")
 public class ShuiliConfig
 {
     /** 项目名称 */
@@ -29,7 +29,8 @@ public class ShuiliConfig
     private boolean demoEnabled;
 
     /** 上传路径 */
-    private static String profile;
+
+    private static String profile="D:/tianhui";
 
     private static String licensePath;
 
@@ -148,7 +149,7 @@ public class ShuiliConfig
      */
     public static String getDownloadPath()
     {
-        return getProfile() + "/download/";
+        return getProfile();
     }
 
     /**
diff --git a/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java b/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java
index 683e93b0..e8651096 100644
--- a/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java
+++ b/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java
@@ -28,7 +28,7 @@ public class FileUploadUtils {
     /**
      * 默认的文件名最大长度 100
      */
-    public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+    public static final int DEFAULT_FILE_NAME_LENGTH = 255;
 
     /**
      * 默认上传的地址
@@ -95,26 +95,26 @@ public class FileUploadUtils {
 
         String fileName = file.getOriginalFilename();
 
-        String localSubPath = DateUtils.datePath() + File.separator + fileName;
+        String localSubPath = DateUtils.datePath() + "/" + fileName;
 
-        File targetFile = new File(baseDir + File.separator + localSubPath);
+        File targetFile = new File(baseDir +  "/" + localSubPath);
 
         if (!targetFile.getParentFile().exists()) {
             targetFile.getParentFile().mkdirs();
         }
         if (targetFile.exists()) {
-            localSubPath = DateUtils.datePath() + File.separator + IdUtils.fastUUID() + File.separator + fileName;
-            targetFile = new File(baseDir + File.separator + localSubPath);
+            localSubPath = DateUtils.datePath() +  "/" + IdUtils.fastUUID() + "/" + fileName;
+            targetFile = new File(baseDir +  "/" + localSubPath);
             if (!targetFile.getParentFile().exists()) {
                 targetFile.getParentFile().mkdirs();
             }
         }
-        targetFile.createNewFile();
-        file.transferTo(targetFile);
-        if (Constants.RESOURCE_PREFIX.endsWith(File.separator)) {
+        File currFile = new File(new File(baseDir).getAbsolutePath()+"/" + localSubPath);
+        file.transferTo(currFile);
+        if (Constants.RESOURCE_PREFIX.endsWith("/")) {
             return Constants.RESOURCE_PREFIX + localSubPath;
         } else {
-            return Constants.RESOURCE_PREFIX + File.separator + localSubPath;
+            return Constants.RESOURCE_PREFIX +  "/" + localSubPath;
         }
     }