From 7ad12effae8d547d63e86ad64f5a9cd89aba1221 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Wed, 30 Jul 2025 20:30:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(system/file):=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E4=B8=8D=E6=8C=87=E5=AE=9A=20parent?=
 =?UTF-8?q?Path=20=E9=BB=98=E8=AE=A4=E4=B8=8A=E7=BA=A7=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/controller/FileController.java        |  4 ++--
 .../top/continew/admin/system/service/FileService.java |  5 +++--
 .../admin/system/service/impl/FileServiceImpl.java     | 10 +++-------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java b/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java
index 4f7564f8..132bffa3 100644
--- a/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java
+++ b/continew-system/src/main/java/top/continew/admin/system/controller/FileController.java
@@ -60,7 +60,7 @@ public class FileController extends BaseController<FileService, FileResp, FileRe
     /**
      * 上传文件
      * <p>
-     * 公共上传文件请使用 {@link top.continew.admin.controller.common.CommonController#upload}
+     * 公共上传文件请使用 {@link CommonController#upload}
      * </p>
      *
      * @param file       文件
@@ -69,7 +69,7 @@ public class FileController extends BaseController<FileService, FileResp, FileRe
      * @throws IOException /
      */
     @Operation(summary = "上传文件", description = "上传文件")
-    @Parameter(name = "parentPath", description = "上级目录", example = "/", in = ParameterIn.QUERY)
+    @Parameter(name = "parentPath", description = "上级目录（默认：/yyyy/MM/dd）", example = "/", in = ParameterIn.QUERY)
     @SaCheckPermission("system:file:upload")
     @PostMapping("/upload")
     public FileUploadResp upload(@NotNull(message = "文件不能为空") @RequestPart MultipartFile file,
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/FileService.java b/continew-system/src/main/java/top/continew/admin/system/service/FileService.java
index cfbdbf89..366a943a 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/FileService.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/FileService.java
@@ -16,6 +16,7 @@
 
 package top.continew.admin.system.service;
 
+import cn.hutool.core.util.StrUtil;
 import org.dromara.x.file.storage.core.FileInfo;
 import org.springframework.web.multipart.MultipartFile;
 import top.continew.admin.common.base.service.BaseService;
@@ -60,7 +61,7 @@ public interface FileService extends BaseService<FileResp, FileResp, FileQuery,
      * @throws IOException /
      */
     default FileInfo upload(MultipartFile file, String parentPath) throws IOException {
-        return upload(file, parentPath, null);
+        return upload(file, StrUtil.blankToDefault(parentPath, getDefaultParentPath()), null);
     }
 
     /**
@@ -94,7 +95,7 @@ public interface FileService extends BaseService<FileResp, FileResp, FileQuery,
      * @throws IOException /
      */
     default FileInfo upload(File file, String parentPath) throws IOException {
-        return upload(file, parentPath, null);
+        return upload(file, StrUtil.blankToDefault(parentPath, getDefaultParentPath()), null);
     }
 
     /**
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
index aa284ee3..51719593 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
@@ -252,10 +252,9 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
      * 处理路径
      *
      * <p>
-     * 1.如果 path 为空，则使用 {@link FileService#getDefaultParentPath()} 作为默认值 <br />
-     * 2.如果 path 为 {@code /}，则设置为空 <br />
-     * 3.如果 path 不以 {@code /} 结尾，则添加后缀 {@code /} <br />
-     * 4.如果 path 以 {@code /} 开头，则移除前缀 {@code /} <br />
+     * 1.如果 path 为 {@code /}，则设置为空 <br />
+     * 2.如果 path 不以 {@code /} 结尾，则添加后缀 {@code /} <br />
+     * 3.如果 path 以 {@code /} 开头，则移除前缀 {@code /} <br />
      * 示例：yyyy/MM/dd/
      * </p>
      *
@@ -263,9 +262,6 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
      * @return 处理路径
      */
     private String pretreatmentPath(String path) {
-        if (StrUtil.isBlank(path)) {
-            return this.getDefaultParentPath();
-        }
         if (StringConstants.SLASH.equals(path)) {
             return StringConstants.EMPTY;
         }