refactor(system/file): 重构文件管理表结构，新增计算文件大小接口

Author: Charles7c

continew-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java

@@ -29,11 +29,6 @@ public class ContainerConstants {
      */
     public static final String USER_NICKNAME = "UserNickname";
 
-    /**
-     * 文件信息
-     */
-    public static final String FILE_INFO = "FileInfo";
-
     /**
      * 用户角色 ID 列表
      */

continew-module-system/src/main/java/top/continew/admin/system/config/file/FileInfoContainer.java

@@ -62,11 +62,11 @@ public boolean save(FileInfo fileInfo) {
         // 方便文件上传完成后获取文件信息
         fileInfo.setId(String.valueOf(file.getId()));
         if (!URLUtils.isHttpUrl(fileInfo.getUrl())) {
-            String prefix = StrUtil.blankToDefault(storage.getDomain(), storage.getEndpoint());
-            String url = URLUtil.completeUrl(prefix, fileInfo.getUrl());
+            String prefix = storage.getUrlPrefix();
+            String url = URLUtil.normalize(prefix + fileInfo.getUrl(), false, true);
             fileInfo.setUrl(url);
             if (StrUtil.isNotBlank(fileInfo.getThUrl())) {
-                fileInfo.setThUrl(URLUtil.completeUrl(prefix, fileInfo.getThUrl()));
+                fileInfo.setThUrl(URLUtil.normalize(prefix + fileInfo.getThUrl(), false, true));
             }
         }
         return true;
@@ -117,8 +117,7 @@ private FileDO getFileByUrl(String url) {
             .eq(FileDO::getName, StrUtil.subAfter(url, StringConstants.SLASH, true));
         // 非 HTTP URL 场景
         if (!URLUtils.isHttpUrl(url)) {
-            return queryWrapper.eq(FileDO::getPath, StrUtil.prependIfMissing(StrUtil
-                .subBefore(url, StringConstants.SLASH, true), StringConstants.SLASH)).one();
+            return queryWrapper.eq(FileDO::getPath, StrUtil.prependIfMissing(url, StringConstants.SLASH)).one();
         }
         // HTTP URL 场景
         List<FileDO> list = queryWrapper.list();
@@ -137,8 +136,7 @@ private FileDO getFileByUrl(String url) {
             String urlPrefix = StrUtil.subBefore(url, StringConstants.SLASH, true);
             // http://localhost:8000/file/ + /user/avatar => http://localhost:8000/file/user/avatar
             StorageDO storage = storageMap.get(file.getStorageId());
-            String prefix = StrUtil.blankToDefault(storage.getDomain(), storage.getEndpoint());
-            return urlPrefix.equals(URLUtil.normalize(prefix + file.getPath(), false, true));
+            return urlPrefix.equals(URLUtil.normalize(storage.getUrlPrefix() + file.getParentPath(), false, true));
         }).findFirst().orElse(null);
     }
 }

continew-module-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java

@@ -83,7 +83,7 @@ public void validate(StorageReq req) {
      * @param req 请求参数
      */
     public void pretreatment(StorageReq req) {
-        // 域名需要以 “/” 结尾
+        // 域名需要以 “/” 结尾（x-file-storage 在拼接路径时都是直接 + 拼接，所以规范要求每一级都要以 “/” 结尾，且后面路径不能以 “/” 开头）
         if (StrUtil.isNotBlank(req.getDomain())) {
             req.setDomain(StrUtil.appendIfMissing(req.getDomain(), StringConstants.SLASH));
         }

continew-module-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java

@@ -36,6 +36,6 @@ public interface FileMapper extends BaseMapper<FileDO> {
      *
      * @return 文件资源统计信息
      */
-    @Select("SELECT type, COUNT(1) number, SUM(size) size FROM sys_file GROUP BY type")
+    @Select("SELECT type, COUNT(1) number, SUM(size) size FROM sys_file WHERE type != 0 GROUP BY type")
     List<FileStatisticsResp> statistics();
 }

continew-module-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java

@@ -60,7 +60,12 @@ public class FileDO extends BaseDO {
     private Long size;
 
     /**
-     * 存储路径
+     * 上级目录
+     */
+    private String parentPath;
+
+    /**
+     * 路径
      */
     private String path;
 
@@ -119,10 +124,11 @@ public FileDO(FileInfo fileInfo) {
         this.originalName = fileInfo.getOriginalFilename();
         this.size = fileInfo.getSize();
         // 如果为空，则为 /；如果不为空，则调整格式为：/xxx
-        this.path = StrUtil.isEmpty(fileInfo.getPath())
+        this.parentPath = StrUtil.isEmpty(fileInfo.getPath())
             ? StringConstants.SLASH
             : StrUtil.removeSuffix(StrUtil.prependIfMissing(fileInfo
                 .getPath(), StringConstants.SLASH), StringConstants.SLASH);
+        this.path = StrUtil.prependIfMissing(fileInfo.getUrl(), StringConstants.SLASH);
         this.extension = fileInfo.getExt();
         this.contentType = fileInfo.getContentType();
         this.type = FileTypeEnum.getByExtension(this.extension);
@@ -148,15 +154,16 @@ public FileInfo toFileInfo(StorageDO storage) {
         // 暂不使用，所以保持空
         fileInfo.setBasePath(StringConstants.EMPTY);
         fileInfo.setSize(this.size);
-        fileInfo.setPath(StringConstants.SLASH.equals(this.path)
+        fileInfo.setPath(StringConstants.SLASH.equals(this.parentPath)
             ? StringConstants.EMPTY
-            : StrUtil.appendIfMissing(StrUtil.removePrefix(this.path, StringConstants.SLASH), StringConstants.SLASH));
+            : StrUtil.appendIfMissing(StrUtil
+                .removePrefix(this.parentPath, StringConstants.SLASH), StringConstants.SLASH));
         fileInfo.setExt(this.extension);
         fileInfo.setContentType(this.contentType);
         if (StrUtil.isNotBlank(this.metadata)) {
             fileInfo.setMetadata(JSONUtil.toBean(this.metadata, Map.class));
         }
-        fileInfo.setUrl(fileInfo.getPath() + fileInfo.getFilename());
+        fileInfo.setUrl(StrUtil.removePrefix(this.path, StringConstants.SLASH));
         // 缩略图信息
         fileInfo.setThFilename(this.thumbnailName);
         fileInfo.setThSize(this.thumbnailSize);
@@ -166,4 +173,11 @@ public FileInfo toFileInfo(StorageDO storage) {
         }
         return fileInfo;
     }
+
+    public void setParentPath(String parentPath) {
+        this.parentPath = parentPath;
+        this.path = StringConstants.SLASH.equals(parentPath)
+            ? parentPath + this.name
+            : parentPath + StringConstants.SLASH + this.name;
+    }
 }

continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java

@@ -16,14 +16,20 @@
 
 package top.continew.admin.system.model.entity;
 
+import cn.hutool.core.lang.RegexPool;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
-import top.continew.admin.system.enums.StorageTypeEnum;
 import top.continew.admin.common.model.entity.BaseDO;
+import top.continew.admin.system.enums.StorageTypeEnum;
+import top.continew.starter.core.constant.StringConstants;
 import top.continew.starter.security.crypto.annotation.FieldEncrypt;
 
 import java.io.Serial;
+import java.net.URL;
 
 /**
  * 存储实体
@@ -99,4 +105,28 @@ public class StorageDO extends BaseDO {
      * 状态
      */
     private DisEnableStatusEnum status;
+
+    /**
+     * 获取 URL 前缀
+     * <p>
+     * LOCAL：{@link #domain}/ <br />
+     * OSS：域名不为空：{@link #domain}/；Endpoint 不是
+     * IP：http(s)://{@link #bucketName}.{@link #endpoint}/；否则：{@link #endpoint}/{@link #bucketName}/
+     * </p>
+     *
+     * @return URL 前缀
+     */
+    public String getUrlPrefix() {
+        if (StrUtil.isNotBlank(this.domain) || StorageTypeEnum.LOCAL.equals(this.type)) {
+            return StrUtil.appendIfMissing(this.domain, StringConstants.SLASH);
+        }
+        URL url = URLUtil.url(this.endpoint);
+        String host = url.getHost();
+        // IP（MinIO） 则拼接 BucketName
+        if (ReUtil.isMatch(RegexPool.IPV4, host) || ReUtil.isMatch(RegexPool.IPV6, host)) {
+            return StrUtil
+                .appendIfMissing(this.endpoint, StringConstants.SLASH) + this.bucketName + StringConstants.SLASH;
+        }
+        return "%s://%s.%s/".formatted(url.getProtocol(), this.bucketName, host);
+    }
 }

continew-module-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java

@@ -46,10 +46,10 @@ public class FileQuery implements Serializable {
     private String originalName;
 
     /**
-     * 存储路径
+     * 上级目录
      */
-    @Schema(description = "存储路径", example = "/")
-    private String path;
+    @Schema(description = "上级目录", example = "/")
+    private String parentPath;
 
     /**
      * 类型

continew-module-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java

@@ -46,8 +46,8 @@ public class FileReq implements Serializable {
     private String originalName;
 
     /**
-     * 存储路径
+     * 上级目录
      */
-    @Schema(description = "存储路径", example = "/")
-    private String path;
+    @Schema(description = "上级目录", example = "/")
+    private String parentPath;
 }

continew-module-system/src/main/java/top/continew/admin/system/model/req/FileReq.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.admin.system.model.resp.file;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 文件夹计算大小响应参数
+ *
+ * @author Charles7c
+ * @since 2025/5/16 21:32
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "文件夹计算大小响应参数")
+public class FileDirCalcSizeResp implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 大小（字节）
+     */
+    @Schema(description = "大小（字节）", example = "4096")
+    private Long size;
+}