handlers) {
- for (StorageHandler handler : handlers) {
- HANDLER_MAP.put(handler.getType(), handler);
- }
- }
-
- /**
- * 获取指定类型的存储处理器
- *
- * @param type 存储类型
- * @return StorageHandler
- */
- public StorageHandler createHandler(StorageTypeEnum type) {
- return Optional.ofNullable(HANDLER_MAP.get(type))
- .orElseThrow(() -> new BaseException(StrUtil.format("不存在此类型存储处理器:{}: ", type)));
- }
-}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/handler/StorageHandler.java b/continew-system/src/main/java/top/continew/admin/system/handler/StorageHandler.java
deleted file mode 100644
index 4882de6e..00000000
--- a/continew-system/src/main/java/top/continew/admin/system/handler/StorageHandler.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.handler;
-
-import org.springframework.web.multipart.MultipartFile;
-import top.continew.admin.system.enums.StorageTypeEnum;
-import top.continew.admin.system.model.entity.StorageDO;
-import top.continew.admin.system.model.req.MultipartUploadInitReq;
-import top.continew.admin.system.model.resp.file.MultipartUploadInitResp;
-import top.continew.admin.system.model.resp.file.MultipartUploadResp;
-
-import java.util.List;
-
-/**
- * 存储类型处理器
- *
- * 专注于文件操作，不包含业务逻辑
- *
- * @author KAI
- * @since 2025/7/30 17:15
- */
-public interface StorageHandler {
-
- MultipartUploadInitResp initMultipartUpload(StorageDO storageDO, MultipartUploadInitReq req);
-
- /**
- * 分片上传
- *
- * @param storageDO 存储实体
- * @param path 存储路径
- * @param uploadId 文件名
- * @param file 文件对象
- * @return {@link MultipartUploadResp} 分片上传结果
- */
- MultipartUploadResp uploadPart(StorageDO storageDO,
- String path,
- String uploadId,
- Integer partNumber,
- MultipartFile file);
-
- /**
- * 合并分片
- *
- * @param storageDO 存储实体
- * @param uploadId 上传Id
- */
- void completeMultipartUpload(StorageDO storageDO,
- List parts,
- String path,
- String uploadId,
- boolean needVerify);
-
- /**
- * 清楚分片
- *
- * @param storageDO 存储实体
- * @param uploadId 上传Id
- */
- void cleanPart(StorageDO storageDO, String uploadId);
-
- /**
- * 获取存储类型
- *
- * @return 存储类型
- */
- StorageTypeEnum getType();
-}
diff --git a/continew-system/src/main/java/top/continew/admin/system/handler/impl/LocalStorageHandler.java b/continew-system/src/main/java/top/continew/admin/system/handler/impl/LocalStorageHandler.java
deleted file mode 100644
index 7fe44788..00000000
--- a/continew-system/src/main/java/top/continew/admin/system/handler/impl/LocalStorageHandler.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * 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.handler.impl;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-import top.continew.admin.system.constant.MultipartUploadConstants;
-import top.continew.admin.system.enums.StorageTypeEnum;
-import top.continew.admin.system.handler.StorageHandler;
-import top.continew.admin.system.model.entity.StorageDO;
-import top.continew.admin.system.model.req.MultipartUploadInitReq;
-import top.continew.admin.system.model.resp.file.MultipartUploadInitResp;
-import top.continew.admin.system.model.resp.file.MultipartUploadResp;
-import top.continew.admin.system.service.FileService;
-import top.continew.starter.core.exception.BaseException;
-
-import java.io.File;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.Comparator;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * 本地存储处理器
- * 实现分片上传、合并、取消等操作。
- *
- * @author KAI
- * @since 2023/7/30 22:58
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class LocalStorageHandler implements StorageHandler {
-
- private final FileService fileService;
-
- @Override
- public MultipartUploadInitResp initMultipartUpload(StorageDO storageDO, MultipartUploadInitReq req) {
- String uploadId = UUID.randomUUID().toString();
- String bucket = storageDO.getBucketName(); // 本地存储中，bucket是存储根路径
- String parentPath = req.getParentPath();
- String fileName = req.getFileName();
- StrUtil.blankToDefault(parentPath, StrUtil.SLASH);
- String relativePath = StrUtil.endWith(parentPath, StrUtil.SLASH)
- ? parentPath + fileName
- : parentPath + StrUtil.SLASH + fileName;
- try {
- // 创建临时目录用于存储分片
- String tempDirPath = buildTempDirPath(bucket, uploadId);
- FileUtil.mkdir(tempDirPath);
- fileService.createParentDir(parentPath, storageDO);
- // 构建返回结果
- MultipartUploadInitResp result = new MultipartUploadInitResp();
- result.setBucket(bucket);
- result.setFileId(UUID.randomUUID().toString());
- result.setUploadId(uploadId);
- result.setPlatform(storageDO.getCode());
- result.setFileName(fileName);
- result.setFileMd5(req.getFileMd5());
- result.setFileSize(req.getFileSize());
- result.setExtension(FileUtil.extName(fileName));
- result.setContentType(req.getContentType());
- result.setPath(relativePath);
- result.setParentPath(parentPath);
- result.setPartSize(MultipartUploadConstants.MULTIPART_UPLOAD_PART_SIZE);
- log.info("本地存储初始化分片上传成功: uploadId={}, path={}", uploadId, parentPath);
- return result;
- } catch (Exception e) {
- log.error("本地存储初始化分片上传失败: {}", e.getMessage(), e);
- throw new BaseException("本地存储初始化分片上传失败: " + e.getMessage(), e);
- }
- }
-
- @Override
- public MultipartUploadResp uploadPart(StorageDO storageDO,
- String path,
- String uploadId,
- Integer partNumber,
- MultipartFile file) {
- try {
- long size = file.getSize();
- String bucket = storageDO.getBucketName();
- // 获取临时目录路径
- String tempDirPath = buildTempDirPath(bucket, uploadId);
-
- // 确保临时目录存在
- File tempDir = new File(tempDirPath);
- if (!tempDir.exists()) {
- FileUtil.mkdir(tempDirPath);
- }
-
- // 保存分片文件
- String partFilePath = tempDirPath + File.separator + String.format("part_%s", partNumber);
- File partFile = new File(partFilePath);
- file.transferTo(partFile);
-
- // 计算ETag (使用MD5)
- String etag = DigestUtil.md5Hex(partFile);
-
- // 构建返回结果
- MultipartUploadResp result = new MultipartUploadResp();
- result.setPartNumber(partNumber);
- result.setPartETag(etag);
- result.setPartSize(size);
- result.setSuccess(true);
-
- log.info("本地存储分片上传成功: uploadId={}, partNumber={}, etag={}", uploadId, partNumber, etag);
- return result;
- } catch (Exception e) {
- log.error("本地存储分片上传失败: uploadId={}, partNumber={}, error={}", uploadId, partNumber, e.getMessage(), e);
-
- MultipartUploadResp result = new MultipartUploadResp();
- result.setPartNumber(partNumber);
- result.setSuccess(false);
- result.setErrorMessage(e.getMessage());
- return result;
- }
- }
-
- @Override
- public void completeMultipartUpload(StorageDO storageDO,
- List parts,
- String path,
- String uploadId,
- boolean needVerify) {
- String bucket = storageDO.getBucketName(); // 本地存储中，bucket是存储根路径
- String tempDirPath = buildTempDirPath(bucket, uploadId);
-
- try {
- // 本地存储不需要验证，直接使用传入的分片信息
- Path targetPath = Paths.get(bucket, path);
- Files.createDirectories(targetPath.getParent());
-
- // 合并分片
- try (OutputStream out = Files
- .newOutputStream(targetPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) {
-
- // 按分片编号排序
- List sortedParts = parts.stream()
- .filter(MultipartUploadResp::isSuccess)
- .sorted(Comparator.comparingInt(MultipartUploadResp::getPartNumber))
- .toList();
-
- // 逐个读取并写入
- for (MultipartUploadResp part : sortedParts) {
- Path partPath = Paths.get(tempDirPath, String.format("part_%s", part.getPartNumber()));
-
- if (!Files.exists(partPath)) {
- throw new BaseException("分片文件不存在: partNumber=" + part.getPartNumber());
- }
-
- Files.copy(partPath, out);
- }
- }
- // 清理临时文件
- cleanupTempFiles(tempDirPath);
-
- log.info("本地存储分片合并成功: uploadId={}, targetPath={}", uploadId, targetPath);
-
- } catch (Exception e) {
- log.error("本地存储分片合并失败: uploadId={}, path={}, error={}", uploadId, path, e.getMessage(), e);
- throw new BaseException("完成分片上传失败: " + e.getMessage(), e);
- }
- }
-
- @Override
- public void cleanPart(StorageDO storageDO, String uploadId) {
- try {
- String bucket = storageDO.getBucketName();
- // 获取临时目录路径
- String tempDirPath = buildTempDirPath(bucket, uploadId);
-
- // 清理临时文件
- cleanupTempFiles(tempDirPath);
-
- log.info("本地存储分片清理成功: uploadId={}", uploadId);
- } catch (Exception e) {
- log.error("本地存储分片清理失败: uploadId={}, error={}", uploadId, e.getMessage(), e);
- throw new BaseException("本地存储分片清理失败: " + e.getMessage(), e);
- }
- }
-
- @Override
- public StorageTypeEnum getType() {
- return StorageTypeEnum.LOCAL;
- }
-
- /**
- * 构建临时目录路径
- *
- * @param bucket 存储桶（本地存储根路径）
- * @param uploadId 上传ID
- * @return 临时目录路径
- */
- private String buildTempDirPath(String bucket, String uploadId) {
- return StrUtil
- .appendIfMissing(bucket, File.separator) + MultipartUploadConstants.TEMP_DIR_NAME + File.separator + uploadId;
- }
-
- /**
- * 构建目标文件路径
- *
- * @param bucket 存储桶（本地存储根路径）
- * @param path 文件路径
- * @return 目标文件路径
- */
- private String buildTargetDirPath(String bucket, String path) {
- return StrUtil.appendIfMissing(bucket, File.separator) + path;
- }
-
- /**
- * 清理临时文件
- *
- * @param tempDirPath 临时目录路径
- */
- private void cleanupTempFiles(String tempDirPath) {
- try {
- FileUtil.del(tempDirPath);
- } catch (Exception e) {
- log.warn("清理临时文件失败: {}, {}", tempDirPath, e.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/handler/impl/S3StorageHandler.java b/continew-system/src/main/java/top/continew/admin/system/handler/impl/S3StorageHandler.java
deleted file mode 100644
index 6183849f..00000000
--- a/continew-system/src/main/java/top/continew/admin/system/handler/impl/S3StorageHandler.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * 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.handler.impl;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-import software.amazon.awssdk.core.sync.RequestBody;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.*;
-import top.continew.admin.system.constant.MultipartUploadConstants;
-import top.continew.admin.system.enums.StorageTypeEnum;
-import top.continew.admin.system.factory.S3ClientFactory;
-import top.continew.admin.system.handler.StorageHandler;
-import top.continew.admin.system.model.entity.StorageDO;
-import top.continew.admin.system.model.req.MultipartUploadInitReq;
-import top.continew.admin.system.model.resp.file.MultipartUploadInitResp;
-import top.continew.admin.system.model.resp.file.MultipartUploadResp;
-import top.continew.admin.system.service.FileService;
-import top.continew.starter.core.exception.BaseException;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * S3存储处理器
- * 使用AWS SDK 2.x版本API。实现分片上传、合并、取消等操作。
- *
- * @author KAI
- * @since 2025/07/30 20:10
- */
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class S3StorageHandler implements StorageHandler {
-
- private final S3ClientFactory s3ClientFactory;
-
- private final FileService fileService;
-
- @Override
- public MultipartUploadInitResp initMultipartUpload(StorageDO storageDO, MultipartUploadInitReq req) {
- String bucket = storageDO.getBucketName();
- String parentPath = req.getParentPath();
- String fileName = req.getFileName();
- String contentType = req.getContentType();
- StrUtil.blankToDefault(parentPath, StrUtil.SLASH);
- String relativePath = StrUtil.endWith(parentPath, StrUtil.SLASH)
- ? parentPath + fileName
- : parentPath + StrUtil.SLASH + fileName;
-
- fileService.createParentDir(parentPath, storageDO);
- try {
- // 构建请求
- CreateMultipartUploadRequest.Builder requestBuilder = CreateMultipartUploadRequest.builder()
- .bucket(bucket)
- .key(buildS3Key(relativePath))
- .contentType(contentType);
-
- // 添加元数据 暂时注释掉 mataData传递中文会导致签名校验不通过
- // if (metaData != null && !metaData.isEmpty()) {
- // requestBuilder.metadata(metaData);
- // }
-
- S3Client s3Client = s3ClientFactory.getClient(storageDO);
- log.info("S3初始化分片上传: bucket={}, key={}, contentType={}", bucket, buildS3Key(relativePath), contentType);
-
- // 执行请求
- CreateMultipartUploadResponse response = s3Client.createMultipartUpload(requestBuilder.build());
- String uploadId = response.uploadId();
- // 构建返回结果
- MultipartUploadInitResp result = new MultipartUploadInitResp();
- result.setBucket(bucket);
- result.setFileId(UUID.randomUUID().toString());
-
- result.setUploadId(uploadId);
- result.setPlatform(storageDO.getCode());
- result.setFileName(fileName);
- result.setFileMd5(req.getFileMd5());
- result.setFileSize(req.getFileSize());
- result.setExtension(FileUtil.extName(fileName));
- result.setContentType(req.getContentType());
- result.setPath(relativePath);
- result.setParentPath(parentPath);
- result.setPartSize(MultipartUploadConstants.MULTIPART_UPLOAD_PART_SIZE);
- log.info("S3初始化分片上传成功: uploadId={}, path={}", uploadId, relativePath);
- return result;
-
- } catch (Exception e) {
- throw new BaseException("S3初始化分片上传失败: " + e.getMessage(), e);
- }
- }
-
- @Override
- public MultipartUploadResp uploadPart(StorageDO storageDO,
- String path,
- String uploadId,
- Integer partNumber,
- MultipartFile file) {
- try {
- String bucket = storageDO.getBucketName();
- // 读取数据到内存（注意：实际使用时可能需要优化大文件处理）
- byte[] bytes = file.getBytes();
-
- // 构建请求
- UploadPartRequest request = UploadPartRequest.builder()
- .bucket(bucket)
- .key(buildS3Key(path))
- .uploadId(uploadId)
- .partNumber(partNumber)
- .contentLength((long)bytes.length)
- .build();
-
- // 执行上传
- S3Client s3Client = s3ClientFactory.getClient(storageDO);
- UploadPartResponse response = s3Client.uploadPart(request, RequestBody.fromBytes(bytes));
- // 构建返回结果
- MultipartUploadResp result = new MultipartUploadResp();
- result.setPartNumber(partNumber);
- result.setPartETag(response.eTag());
- result.setSuccess(true);
- log.info("S3上传分片成功: partNumber={} for key={} with uploadId={}", partNumber, path, uploadId);
- log.info("上传分片ETag: {}", response.eTag());
-
- return result;
-
- } catch (Exception e) {
- MultipartUploadResp result = new MultipartUploadResp();
- result.setPartNumber(partNumber);
- result.setSuccess(false);
- result.setErrorMessage(e.getMessage());
- log.error("S3上传分片失败: partNumber={} for key={} with uploadId={} errorMessage={}", partNumber, path, uploadId, e
- .getMessage());
- return result;
- }
- }
-
- @Override
- public void completeMultipartUpload(StorageDO storageDO,
- List parts,
- String path,
- String uploadId,
- boolean needVerify) {
- if (path == null) {
- throw new BaseException("无效的uploadId: " + uploadId);
- }
- String bucket = storageDO.getBucketName();
- S3Client s3Client = s3ClientFactory.getClient(storageDO);
- // 如果需要验证，比较本地记录和S3的分片信息
- if (needVerify) {
- List s3Parts = listParts(bucket, path, uploadId, s3Client);
- validateParts(parts, s3Parts);
- }
- // 构建已完成的分片列表
- List completedParts = parts.stream()
- .filter(MultipartUploadResp::isSuccess)
- .map(part -> CompletedPart.builder().partNumber(part.getPartNumber()).eTag(part.getPartETag()).build())
- .sorted(Comparator.comparingInt(CompletedPart::partNumber))
- .collect(Collectors.toList());
-
- // 构建请求
- CompleteMultipartUploadRequest request = CompleteMultipartUploadRequest.builder()
- .bucket(bucket)
- .key(buildS3Key(path))
- .uploadId(uploadId)
- .multipartUpload(CompletedMultipartUpload.builder().parts(completedParts).build())
- .build();
-
- // 完成上传
- s3Client.completeMultipartUpload(request);
- log.info("S3完成分片上传: key={}, uploadId={}, parts={}", buildS3Key(path), uploadId, completedParts.size());
- }
-
- @Override
- public void cleanPart(StorageDO storageDO, String uploadId) {
- try {
- String bucket = storageDO.getBucketName();
- S3Client s3Client = s3ClientFactory.getClient(storageDO);
-
- // 列出所有未完成的分片上传
- ListMultipartUploadsRequest listRequest = ListMultipartUploadsRequest.builder().bucket(bucket).build();
-
- ListMultipartUploadsResponse listResponse = s3Client.listMultipartUploads(listRequest);
-
- // 查找匹配的上传任务
- Optional targetUpload = listResponse.uploads()
- .stream()
- .filter(upload -> upload.uploadId().equals(uploadId))
- .findFirst();
-
- if (targetUpload.isPresent()) {
- MultipartUpload upload = targetUpload.get();
-
- // 取消分片上传
- AbortMultipartUploadRequest abortRequest = AbortMultipartUploadRequest.builder()
- .bucket(bucket)
- .key(upload.key())
- .uploadId(uploadId)
- .build();
-
- s3Client.abortMultipartUpload(abortRequest);
- log.info("S3清理分片上传成功: bucket={}, key={}, uploadId={}", bucket, upload.key(), uploadId);
- } else {
- log.warn("S3未找到对应的分片上传任务: uploadId={}", uploadId);
- }
-
- } catch (Exception e) {
- log.error("S3清理分片上传失败: uploadId={}, error={}", uploadId, e.getMessage(), e);
- throw new BaseException("S3清理分片上传失败: " + e.getMessage(), e);
- }
- }
-
- @Override
- public StorageTypeEnum getType() {
- return StorageTypeEnum.OSS;
- }
-
- /**
- * 列出已上传的分片
- */
- public List listParts(String bucket, String path, String uploadId, S3Client s3Client) {
- try {
- // 构建请求
- ListPartsRequest request = ListPartsRequest.builder()
- .bucket(bucket)
- .key(buildS3Key(path))
- .uploadId(uploadId)
- .build();
-
- // 获取分片列表
- ListPartsResponse response = s3Client.listParts(request);
-
- // 转换结果
- return response.parts().stream().map(part -> {
- MultipartUploadResp result = new MultipartUploadResp();
- result.setPartNumber(part.partNumber());
- result.setPartETag(part.eTag());
- result.setSuccess(true);
- return result;
- }).collect(Collectors.toList());
-
- } catch (Exception e) {
- throw new BaseException("S3列出分片失败: " + e.getMessage(), e);
- }
- }
-
- /**
- * 验证分片一致性
- *
- * @param recordParts 记录部件
- * @param s3Parts s3零件
- */
- private void validateParts(List recordParts, List s3Parts) {
- Map recordMap = recordParts.stream()
- .collect(Collectors.toMap(MultipartUploadResp::getPartNumber, MultipartUploadResp::getPartETag));
-
- Map s3Map = s3Parts.stream()
- .collect(Collectors.toMap(MultipartUploadResp::getPartNumber, MultipartUploadResp::getPartETag));
-
- // 检查分片数量
- if (recordMap.size() != s3Map.size()) {
- throw new BaseException(String.format("分片数量不一致: 本地记录=%d, S3=%d", recordMap.size(), s3Map.size()));
- }
-
- // 检查每个分片
- List missingParts = new ArrayList<>();
- List mismatchParts = new ArrayList<>();
-
- for (Map.Entry entry : recordMap.entrySet()) {
- Integer partNumber = entry.getKey();
- String recordETag = entry.getValue();
- String s3ETag = s3Map.get(partNumber);
-
- if (s3ETag == null) {
- missingParts.add(partNumber);
- } else if (!recordETag.equals(s3ETag)) {
- mismatchParts.add(partNumber);
- }
- }
-
- if (!missingParts.isEmpty()) {
- throw new BaseException("S3缺失分片: " + missingParts);
- }
-
- if (!mismatchParts.isEmpty()) {
- throw new BaseException("分片ETag不匹配: " + mismatchParts);
- }
- }
-
- /**
- * 规范化 S3 对象 key，去掉前导斜杠，合并多余斜杠。
- *
- * @param rawKey 你传入的完整路径，比如 "/folder//子目录//文件名.png"
- * @return 规范化后的 key，比如 "folder/子目录/文件名.png"
- */
- public static String buildS3Key(String rawKey) {
- if (rawKey == null || rawKey.isEmpty()) {
- throw new IllegalArgumentException("key 不能为空");
- }
- // 去掉前导斜杠
- while (rawKey.startsWith("/")) {
- rawKey = rawKey.substring(1);
- }
- // 替换连续多个斜杠为一个斜杠
- rawKey = rawKey.replaceAll("/+", "/");
- return rawKey;
- }
-
-}
\ No newline at end of file
--
Gitee
From fd27bc6459effcf30c8225560668573707c5a0e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=B3=BD=E5=A8=81?= <958142070@qq.com>
Date: Mon, 2 Mar 2026 19:38:05 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix(storage):=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E5=88=86=E7=89=87=E4=B8=8A=E4=BC=A0=E6=97=B6=E6=97=A0=E6=95=88?=
=?UTF-8?q?uploadId=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 添加对uploadId获取MultipartSession的校验，避免空指针异常
- 使用MultipartSession中的平台和桶信息替代原先的存储配置
- 优化路径处理，优先使用session的路径信息
- 抛出明确的BaseException提示无效的uploadId
- 处理上传分片时可能的IO异常并抛出业务异常
---
.../service/impl/MultipartUploadServiceImpl.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java
index 473edfe0..7cf71f86 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java
@@ -92,11 +92,15 @@ public class MultipartUploadServiceImpl implements MultipartUploadService {
@Override
public MultipartUploadResp uploadPart(MultipartFile file, String uploadId, Integer partNumber, String path) {
- StorageDO storageDO = storageService.getByCode(null);
+ MultipartInitResp session = fileStorageService.getMultipartSession(uploadId);
+ if (session == null) {
+ throw new BaseException("无效的 uploadId: " + uploadId);
+ }
+ String targetPath = StrUtil.blankToDefault(session.getPath(), path);
try {
top.continew.starter.storage.domain.model.resp.MultipartUploadResp resp = fileStorageService
- .uploadPart(storageDO.getCode(), storageDO
- .getBucketName(), normalizeStoragePath(path), uploadId, partNumber, file.getInputStream());
+ .uploadPart(session.getPlatform(), session
+ .getBucket(), normalizeStoragePath(targetPath), uploadId, partNumber, file.getInputStream());
return this.toAdminUploadResp(resp);
} catch (IOException e) {
throw new BaseException("上传分片失败: " + e.getMessage(), e);
--
Gitee
From a770dd8ce5451e48fdcf93993089e6f94d11fba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=B3=BD=E5=A8=81?= <958142070@qq.com>
Date: Mon, 2 Mar 2026 19:53:22 +0800
Subject: [PATCH 05/12] =?UTF-8?q?fix(storage):=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E5=88=86=E7=89=87=E4=B8=8A=E4=BC=A0=E9=BB=98=E8=AE=A4=E5=88=86?=
=?UTF-8?q?=E7=89=87=E5=A4=A7=E5=B0=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/constant/MultipartUploadConstants.java | 10 +---------
.../admin/system/service/impl/StorageServiceImpl.java | 4 ++++
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/continew-system/src/main/java/top/continew/admin/system/constant/MultipartUploadConstants.java b/continew-system/src/main/java/top/continew/admin/system/constant/MultipartUploadConstants.java
index c6ebbbd6..c05df941 100644
--- a/continew-system/src/main/java/top/continew/admin/system/constant/MultipartUploadConstants.java
+++ b/continew-system/src/main/java/top/continew/admin/system/constant/MultipartUploadConstants.java
@@ -84,15 +84,7 @@ public class MultipartUploadConstants {
public static final long DEFAULT_EXPIRE_HOURS = 24;
/**
- * 临时文件夹
- *
- * 分片上传的临时文件夹名称
- *
- */
- public static final String TEMP_DIR_NAME = "temp";
-
- /**
- * 分片大小
+ * 分片大小 - 必须是 5MB 不然会报错 分片合并时，存在“非最后一片 < 5MB”的分片
*/
public static final long MULTIPART_UPLOAD_PART_SIZE = 5 * 1024 * 1024;
}
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
index 1367d59e..f0d34041 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
@@ -26,6 +26,7 @@ import top.continew.admin.common.base.service.BaseServiceImpl;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.model.req.CommonStatusUpdateReq;
import top.continew.admin.common.util.SecureUtils;
+import top.continew.admin.system.constant.MultipartUploadConstants;
import top.continew.admin.system.enums.StorageTypeEnum;
import top.continew.admin.system.mapper.StorageMapper;
import top.continew.admin.system.model.entity.StorageDO;
@@ -198,6 +199,9 @@ public class StorageServiceImpl extends BaseServiceImpl throw new IllegalArgumentException("不支持的存储类型：%s".formatted(storage.getType()));
--
Gitee
From f7a9d09fef3a750d99d6b4ee74808b0decdb0841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=B3=BD=E5=A8=81?= <958142070@qq.com>
Date: Mon, 2 Mar 2026 20:40:27 +0800
Subject: [PATCH 06/12] =?UTF-8?q?refactor(storage):=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E5=88=86=E7=89=87=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE=E5=92=8C?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 移除MultipartUploadConstants中的固定分片大小常量
- 引入StorageProperties支持动态配置分片阈值和大小
- 在LocalStorage和OSS配置中根据配置设置分片上传阈值和分片大小
- 新增方法解析分片上传阈值、分片大小和本地临时目录，支持默认值回退
- 清理相关导入，优化代码结构
---
.../constant/MultipartUploadConstants.java | 5 ----
.../service/impl/StorageServiceImpl.java | 28 ++++++++++++++++---
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/continew-system/src/main/java/top/continew/admin/system/constant/MultipartUploadConstants.java b/continew-system/src/main/java/top/continew/admin/system/constant/MultipartUploadConstants.java
index c05df941..228f7795 100644
--- a/continew-system/src/main/java/top/continew/admin/system/constant/MultipartUploadConstants.java
+++ b/continew-system/src/main/java/top/continew/admin/system/constant/MultipartUploadConstants.java
@@ -82,9 +82,4 @@ public class MultipartUploadConstants {
*
*/
public static final long DEFAULT_EXPIRE_HOURS = 24;
-
- /**
- * 分片大小 - 必须是 5MB 不然会报错 分片合并时，存在“非最后一片 < 5MB”的分片
- */
- public static final long MULTIPART_UPLOAD_PART_SIZE = 5 * 1024 * 1024;
}
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
index f0d34041..2aca7f63 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
@@ -26,7 +26,6 @@ import top.continew.admin.common.base.service.BaseServiceImpl;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.model.req.CommonStatusUpdateReq;
import top.continew.admin.common.util.SecureUtils;
-import top.continew.admin.system.constant.MultipartUploadConstants;
import top.continew.admin.system.enums.StorageTypeEnum;
import top.continew.admin.system.mapper.StorageMapper;
import top.continew.admin.system.model.entity.StorageDO;
@@ -40,6 +39,8 @@ import top.continew.starter.core.util.validation.CheckUtils;
import top.continew.starter.core.util.validation.ValidationUtils;
import top.continew.starter.storage.autoconfigure.properties.LocalStorageConfig;
import top.continew.starter.storage.autoconfigure.properties.OssStorageConfig;
+import top.continew.starter.storage.autoconfigure.properties.StorageProperties;
+import top.continew.starter.storage.common.constant.StorageConstant;
import top.continew.starter.storage.core.FileStorageService;
import top.continew.starter.storage.strategy.impl.LocalStorageStrategy;
import top.continew.starter.storage.strategy.impl.OssStorageStrategy;
@@ -57,6 +58,7 @@ import java.util.List;
public class StorageServiceImpl extends BaseServiceImpl implements StorageService {
private final FileStorageService fileStorageService;
+ private final StorageProperties storageProperties;
@Resource
private FileService fileService;
@@ -188,6 +190,9 @@ public class StorageServiceImpl extends BaseServiceImpl {
@@ -199,9 +204,8 @@ public class StorageServiceImpl extends BaseServiceImpl throw new IllegalArgumentException("不支持的存储类型：%s".formatted(storage.getType()));
@@ -219,6 +223,22 @@ public class StorageServiceImpl extends BaseServiceImpl 0 ? threshold : StorageConstant.DEFAULT_MULTIPART_UPLOAD_THRESHOLD;
+ }
+
+ private long resolveMultipartUploadPartSize() {
+ long partSize = storageProperties.getMultipartUploadPartSize();
+ return partSize > 0 ? partSize : StorageConstant.DEFAULT_MULTIPART_UPLOAD_PART_SIZE;
+ }
+
+ private String resolveLocalMultipartTempDir() {
+ return StrUtil.isBlank(storageProperties.getLocalMultipartTempDir())
+ ? StorageConstant.DEFAULT_LOCAL_MULTIPART_TEMP_DIR
+ : storageProperties.getLocalMultipartTempDir();
+ }
+
/**
* 解密 SecretKey
*
--
Gitee
From aa91017507cbef158a87a448dcf2bc110702036d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=B3=BD=E5=A8=81?= <958142070@qq.com>
Date: Tue, 3 Mar 2026 11:05:40 +0800
Subject: [PATCH 07/12] =?UTF-8?q?feat(storage):=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=88=86=E7=89=87=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE=E6=94=AF?=
=?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 数据库表增加字段 multipart_upload_part_size 和 multipart_temp_dir
- StorageDO 实体新增分片上传大小和本地分片临时目录属性
- StorageReq 请求对象添加分片上传大小和本地分片临时目录字段及验证
- StorageResp 响应对象添加分片上传大小和本地分片临时目录字段
- StorageServiceImpl 实现分片上传阈值和分片大小的全局与实例级解析逻辑
- 实现本地存储分片临时目录的配置回退和解析逻辑
---
.../db/changelog/mysql/main_table.sql | 2 +
.../db/changelog/postgresql/main_table.sql | 4 +
.../admin/system/model/entity/StorageDO.java | 12 ++-
.../admin/system/model/req/StorageReq.java | 17 +++-
.../admin/system/model/resp/StorageResp.java | 14 ++-
.../service/impl/StorageServiceImpl.java | 98 ++++++++++++++++++-
6 files changed, 141 insertions(+), 6 deletions(-)
diff --git a/continew-server/src/main/resources/db/changelog/mysql/main_table.sql b/continew-server/src/main/resources/db/changelog/mysql/main_table.sql
index 66ed46d9..d9e2739e 100644
--- a/continew-server/src/main/resources/db/changelog/mysql/main_table.sql
+++ b/continew-server/src/main/resources/db/changelog/mysql/main_table.sql
@@ -292,6 +292,8 @@ CREATE TABLE IF NOT EXISTS `sys_storage` (
`endpoint` varchar(255) DEFAULT NULL COMMENT 'Endpoint',
`bucket_name` varchar(255) NOT NULL COMMENT 'Bucket',
`domain` varchar(255) DEFAULT NULL COMMENT '域名',
+ `multipart_upload_part_size` bigint(20) DEFAULT NULL COMMENT '分片上传大小（字节）',
+ `multipart_temp_dir` varchar(255) DEFAULT NULL COMMENT '本地分片临时目录',
`recycle_bin_enabled` bit(1) NOT NULL DEFAULT b'1' COMMENT '启用回收站',
`recycle_bin_path` varchar(255) DEFAULT NULL COMMENT '回收站路径',
`description` varchar(200) DEFAULT NULL COMMENT '描述',
diff --git a/continew-server/src/main/resources/db/changelog/postgresql/main_table.sql b/continew-server/src/main/resources/db/changelog/postgresql/main_table.sql
index ca5b2c1c..84c272e2 100644
--- a/continew-server/src/main/resources/db/changelog/postgresql/main_table.sql
+++ b/continew-server/src/main/resources/db/changelog/postgresql/main_table.sql
@@ -475,6 +475,8 @@ CREATE TABLE IF NOT EXISTS "sys_storage" (
"endpoint" varchar(255) DEFAULT NULL,
"bucket_name" varchar(255) NOT NULL,
"domain" varchar(255) DEFAULT NULL,
+ "multipart_upload_part_size" int8 DEFAULT NULL,
+ "multipart_temp_dir" varchar(255) DEFAULT NULL,
"recycle_bin_enabled" bool NOT NULL DEFAULT true,
"recycle_bin_path" varchar(255) DEFAULT NULL,
"description" varchar(200) DEFAULT NULL,
@@ -501,6 +503,8 @@ COMMENT ON COLUMN "sys_storage"."secret_key" IS 'Secret Key';
COMMENT ON COLUMN "sys_storage"."endpoint" IS 'Endpoint';
COMMENT ON COLUMN "sys_storage"."bucket_name" IS 'Bucket';
COMMENT ON COLUMN "sys_storage"."domain" IS '域名';
+COMMENT ON COLUMN "sys_storage"."multipart_upload_part_size" IS '分片上传大小（字节）';
+COMMENT ON COLUMN "sys_storage"."multipart_temp_dir" IS '本地分片临时目录';
COMMENT ON COLUMN "sys_storage"."recycle_bin_enabled" IS '启用回收站';
COMMENT ON COLUMN "sys_storage"."recycle_bin_path" IS '回收站路径';
COMMENT ON COLUMN "sys_storage"."description" IS '描述';
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
index ef950984..f362bcce 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
@@ -86,6 +86,16 @@ public class StorageDO extends BaseDO {
*/
private String domain;
+ /**
+ * 分片上传大小（字节）
+ */
+ private Long multipartUploadPartSize;
+
+ /**
+ * 本地分片临时目录
+ */
+ private String multipartTempDir;
+
/**
* 启用回收站
*/
@@ -139,4 +149,4 @@ public class StorageDO extends BaseDO {
}
return "%s://%s.%s/".formatted(url.getProtocol(), this.bucketName, host);
}
-}
\ No newline at end of file
+}
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java b/continew-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java
index 56a42830..f595300d 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java
@@ -20,6 +20,7 @@ import cn.sticki.spel.validator.constrain.SpelNotBlank;
import cn.sticki.spel.validator.jakarta.SpelValid;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
@@ -112,6 +113,20 @@ public class StorageReq implements Serializable {
@NotBlank(message = "访问路径不能为空", groups = ValidationGroup.Storage.Local.class)
private String domain;
+ /**
+ * 分片上传大小（字节）
+ */
+ @Schema(description = "分片上传大小（字节）", example = "5242880")
+ @Min(value = 1, message = "分片上传大小必须大于 0")
+ private Long multipartUploadPartSize;
+
+ /**
+ * 本地分片临时目录
+ */
+ @Schema(description = "本地分片临时目录", example = "/tmp/continew-multipart")
+ @Length(max = 255, message = "本地分片临时目录长度不能超过 {max} 个字符")
+ private String multipartTempDir;
+
/**
* 启用回收站
*/
@@ -150,4 +165,4 @@ public class StorageReq implements Serializable {
*/
@JsonIgnore
private Boolean isDefault;
-}
\ No newline at end of file
+}
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java
index 0cfa93a3..8c7b5e3a 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java
@@ -85,6 +85,18 @@ public class StorageResp extends BaseDetailResp {
@Schema(description = "域名", example = "http://localhost:8000/file")
private String domain;
+ /**
+ * 分片上传大小（字节）
+ */
+ @Schema(description = "分片上传大小（字节）", example = "5242880")
+ private Long multipartUploadPartSize;
+
+ /**
+ * 本地分片临时目录
+ */
+ @Schema(description = "本地分片临时目录", example = "/tmp/continew-multipart")
+ private String multipartTempDir;
+
/**
* 启用回收站
*/
@@ -120,4 +132,4 @@ public class StorageResp extends BaseDetailResp {
return this.getIsDefault();
}
-}
\ No newline at end of file
+}
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
index 2aca7f63..70dd8f88 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
@@ -191,8 +191,8 @@ public class StorageServiceImpl extends BaseServiceImpl {
@@ -205,7 +205,7 @@ public class StorageServiceImpl extends BaseServiceImpl throw new IllegalArgumentException("不支持的存储类型：%s".formatted(storage.getType()));
@@ -223,22 +223,114 @@ public class StorageServiceImpl extends BaseServiceImpl
+ * 当上传文件大小超过该阈值时，存储策略将走分片上传流程。
+ * 取值优先级：
+ *
+ *
+ * 1. 全局配置 {@code continew-starter.storage.multipart-upload-threshold}
+ *
+ *
+ * 2. 框架默认值 {@link StorageConstant#DEFAULT_MULTIPART_UPLOAD_THRESHOLD}
+ *
+ *
+ * @return 最终生效的分片上传阈值（字节）
+ */
private long resolveMultipartUploadThreshold() {
long threshold = storageProperties.getMultipartUploadThreshold();
return threshold > 0 ? threshold : StorageConstant.DEFAULT_MULTIPART_UPLOAD_THRESHOLD;
}
+ /**
+ * 解析全局分片大小（字节）
+ *
+ *
+ * 用于在存储实例未配置分片大小时作为回退值。
+ * 取值优先级：
+ *
+ *
+ * 1. 全局配置 {@code continew-starter.storage.multipart-upload-part-size}
+ *
+ *
+ * 2. 框架默认值 {@link StorageConstant#DEFAULT_MULTIPART_UPLOAD_PART_SIZE}
+ *
+ *
+ * @return 最终生效的全局分片大小（字节）
+ */
private long resolveMultipartUploadPartSize() {
long partSize = storageProperties.getMultipartUploadPartSize();
return partSize > 0 ? partSize : StorageConstant.DEFAULT_MULTIPART_UPLOAD_PART_SIZE;
}
+ /**
+ * 解析存储实例分片大小（字节）
+ *
+ *
+ * 取值优先级：
+ *
+ *
+ * 1. 存储实例配置（{@link StorageDO#getMultipartUploadPartSize()}）
+ *
+ *
+ * 2. 全局配置（见 {@link #resolveMultipartUploadPartSize()}）
+ *
+ *
+ * @param storage 存储配置实体
+ * @return 最终生效的分片大小（字节）
+ */
+ private long resolveMultipartUploadPartSize(StorageDO storage) {
+ Long partSize = storage.getMultipartUploadPartSize();
+ return (partSize != null && partSize > 0) ? partSize : resolveMultipartUploadPartSize();
+ }
+
+ /**
+ * 解析全局本地分片临时目录
+ *
+ *
+ * 用于本地存储实例未配置临时目录时的回退值。
+ * 取值优先级：
+ *
+ *
+ * 1. 全局配置 {@code continew-starter.storage.local-multipart-temp-dir}
+ *
+ *
+ * 2. 框架默认值 {@link StorageConstant#DEFAULT_LOCAL_MULTIPART_TEMP_DIR}
+ *
+ *
+ * @return 最终生效的全局本地分片临时目录
+ */
private String resolveLocalMultipartTempDir() {
return StrUtil.isBlank(storageProperties.getLocalMultipartTempDir())
? StorageConstant.DEFAULT_LOCAL_MULTIPART_TEMP_DIR
: storageProperties.getLocalMultipartTempDir();
}
+ /**
+ * 解析存储实例本地分片临时目录
+ *
+ *
+ * 仅本地存储策略使用该值。
+ * 取值优先级：
+ *
+ *
+ * 1. 存储实例配置（{@link StorageDO#getMultipartTempDir()}，并进行 trim）
+ *
+ *
+ * 2. 全局配置（见 {@link #resolveLocalMultipartTempDir()}）
+ *
+ *
+ * @param storage 存储配置实体
+ * @return 最终生效的本地分片临时目录
+ */
+ private String resolveLocalMultipartTempDir(StorageDO storage) {
+ return StrUtil.isBlank(storage.getMultipartTempDir())
+ ? resolveLocalMultipartTempDir()
+ : storage.getMultipartTempDir().trim();
+ }
+
/**
* 解密 SecretKey
*
--
Gitee
From 23f78de6249aff1ddfa868c10fca82df1f4bd47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=B3=BD=E5=A8=81?= <958142070@qq.com>
Date: Tue, 3 Mar 2026 11:13:05 +0800
Subject: [PATCH 08/12] =?UTF-8?q?feat(storage):=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=88=86=E7=89=87=E4=B8=8A=E4=BC=A0=E9=98=88=E5=80=BC=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在数据库表中添加 multipart_upload_threshold 字段，支持 MySQL 和 PostgreSQL
- 在 StorageDO、StorageReq 和 StorageResp 实体类中增加 multipartUploadThreshold 字段
- 修改 StorageServiceImpl，支持根据存储实例优先级解析分片上传阈值配置
- 保持原有默认阈值配置兼容性，新增方法根据存储实例和全局配置确定阈值
- 更新相关注释和接口文档说明分片上传阈值含义及使用示例
---
.../db/changelog/mysql/main_table.sql | 1 +
.../db/changelog/postgresql/main_table.sql | 2 ++
.../admin/system/model/entity/StorageDO.java | 5 ++++
.../admin/system/model/req/StorageReq.java | 7 ++++++
.../admin/system/model/resp/StorageResp.java | 6 +++++
.../service/impl/StorageServiceImpl.java | 25 +++++++++++++++++--
6 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/continew-server/src/main/resources/db/changelog/mysql/main_table.sql b/continew-server/src/main/resources/db/changelog/mysql/main_table.sql
index d9e2739e..f540f7ce 100644
--- a/continew-server/src/main/resources/db/changelog/mysql/main_table.sql
+++ b/continew-server/src/main/resources/db/changelog/mysql/main_table.sql
@@ -292,6 +292,7 @@ CREATE TABLE IF NOT EXISTS `sys_storage` (
`endpoint` varchar(255) DEFAULT NULL COMMENT 'Endpoint',
`bucket_name` varchar(255) NOT NULL COMMENT 'Bucket',
`domain` varchar(255) DEFAULT NULL COMMENT '域名',
+ `multipart_upload_threshold` bigint(20) DEFAULT NULL COMMENT '分片上传阈值（字节）',
`multipart_upload_part_size` bigint(20) DEFAULT NULL COMMENT '分片上传大小（字节）',
`multipart_temp_dir` varchar(255) DEFAULT NULL COMMENT '本地分片临时目录',
`recycle_bin_enabled` bit(1) NOT NULL DEFAULT b'1' COMMENT '启用回收站',
diff --git a/continew-server/src/main/resources/db/changelog/postgresql/main_table.sql b/continew-server/src/main/resources/db/changelog/postgresql/main_table.sql
index 84c272e2..05bf71ac 100644
--- a/continew-server/src/main/resources/db/changelog/postgresql/main_table.sql
+++ b/continew-server/src/main/resources/db/changelog/postgresql/main_table.sql
@@ -475,6 +475,7 @@ CREATE TABLE IF NOT EXISTS "sys_storage" (
"endpoint" varchar(255) DEFAULT NULL,
"bucket_name" varchar(255) NOT NULL,
"domain" varchar(255) DEFAULT NULL,
+ "multipart_upload_threshold" int8 DEFAULT NULL,
"multipart_upload_part_size" int8 DEFAULT NULL,
"multipart_temp_dir" varchar(255) DEFAULT NULL,
"recycle_bin_enabled" bool NOT NULL DEFAULT true,
@@ -503,6 +504,7 @@ COMMENT ON COLUMN "sys_storage"."secret_key" IS 'Secret Key';
COMMENT ON COLUMN "sys_storage"."endpoint" IS 'Endpoint';
COMMENT ON COLUMN "sys_storage"."bucket_name" IS 'Bucket';
COMMENT ON COLUMN "sys_storage"."domain" IS '域名';
+COMMENT ON COLUMN "sys_storage"."multipart_upload_threshold" IS '分片上传阈值（字节）';
COMMENT ON COLUMN "sys_storage"."multipart_upload_part_size" IS '分片上传大小（字节）';
COMMENT ON COLUMN "sys_storage"."multipart_temp_dir" IS '本地分片临时目录';
COMMENT ON COLUMN "sys_storage"."recycle_bin_enabled" IS '启用回收站';
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
index f362bcce..a8767e6c 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
@@ -86,6 +86,11 @@ public class StorageDO extends BaseDO {
*/
private String domain;
+ /**
+ * 分片上传阈值（字节）
+ */
+ private Long multipartUploadThreshold;
+
/**
* 分片上传大小（字节）
*/
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java b/continew-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java
index f595300d..8536bf32 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java
@@ -113,6 +113,13 @@ public class StorageReq implements Serializable {
@NotBlank(message = "访问路径不能为空", groups = ValidationGroup.Storage.Local.class)
private String domain;
+ /**
+ * 分片上传阈值（字节）
+ */
+ @Schema(description = "分片上传阈值（字节）", example = "10485760")
+ @Min(value = 1, message = "分片上传阈值必须大于 0")
+ private Long multipartUploadThreshold;
+
/**
* 分片上传大小（字节）
*/
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java
index 8c7b5e3a..85c28857 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java
@@ -85,6 +85,12 @@ public class StorageResp extends BaseDetailResp {
@Schema(description = "域名", example = "http://localhost:8000/file")
private String domain;
+ /**
+ * 分片上传阈值（字节）
+ */
+ @Schema(description = "分片上传阈值（字节）", example = "10485760")
+ private Long multipartUploadThreshold;
+
/**
* 分片上传大小（字节）
*/
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
index 70dd8f88..ebe56ec0 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
@@ -190,7 +190,7 @@ public class StorageServiceImpl extends BaseServiceImpl 0 ? threshold : StorageConstant.DEFAULT_MULTIPART_UPLOAD_THRESHOLD;
}
+ /**
+ * 解析存储实例分片上传阈值（字节）
+ *
+ *
+ * 取值优先级：
+ *
+ *
+ * 1. 存储实例配置（{@link StorageDO#getMultipartUploadThreshold()}）
+ *
+ *
+ * 2. 全局配置（见 {@link #resolveMultipartUploadThreshold()}）
+ *
+ *
+ * @param storage 存储配置实体
+ * @return 最终生效的分片上传阈值（字节）
+ */
+ private long resolveMultipartUploadThreshold(StorageDO storage) {
+ Long threshold = storage.getMultipartUploadThreshold();
+ return (threshold != null && threshold > 0) ? threshold : resolveMultipartUploadThreshold();
+ }
+
/**
* 解析全局分片大小（字节）
*
--
Gitee
From 35f8d2d7f8058435b5ab9d50eaf123a216131595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=B3=BD=E5=A8=81?= <958142070@qq.com>
Date: Tue, 3 Mar 2026 11:28:49 +0800
Subject: [PATCH 09/12] =?UTF-8?q?fix(storage):=20=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=AD=98=E5=82=A8=E5=88=86=E7=89=87=E5=A4=A7?=
=?UTF-8?q?=E5=B0=8F=E4=B8=8D=E5=B0=91=E4=BA=8E5MB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../top/continew/admin/system/enums/StorageTypeEnum.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java b/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java
index 064e500d..e3a7e1db 100644
--- a/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java
+++ b/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java
@@ -27,6 +27,7 @@ import top.continew.starter.core.constant.StringConstants;
import top.continew.starter.core.enums.BaseEnum;
import top.continew.starter.core.util.URLUtils;
import top.continew.starter.core.util.validation.ValidationUtils;
+import top.continew.starter.storage.common.constant.StorageConstant;
/**
* 存储类型枚举
@@ -66,6 +67,10 @@ public enum StorageTypeEnum implements BaseEnum {
ValidationUtils.validate(req, ValidationGroup.Storage.OSS.class);
ValidationUtils.throwIf(StrUtil.isNotBlank(req.getDomain()) && !ReUtil
.isMatch(RegexConstants.URL_HTTP_NOT_IP, req.getDomain()), "域名格式不正确");
+ Long multipartUploadPartSize = req.getMultipartUploadPartSize();
+ ValidationUtils.throwIf(multipartUploadPartSize != null
+ && multipartUploadPartSize < StorageConstant.DEFAULT_MULTIPART_UPLOAD_PART_SIZE,
+ "对象存储分片大小不能小于 5MB");
}
};
--
Gitee
From fd056ee3c21485cf52f627b0ce589233856b8511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=B3=BD=E5=A8=81?= <958142070@qq.com>
Date: Tue, 3 Mar 2026 11:50:14 +0800
Subject: [PATCH 10/12] =?UTF-8?q?fix(multipart-upload):=20=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=88=86=E7=89=87=E5=A4=A7=E5=B0=8F=E4=B8=80=E8=87=B4?=
=?UTF-8?q?=E6=80=A7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在上传分片时校验分片序号是否合法，确保在有效区间内（1..totalParts）
- 验证非最后一片的大小必须等于会话中定义的分片大小
- 验证最后一片大小必须等于剩余字节数，支持整除情况
- 如果分片大小与预期不符，抛出异常提示分片大小不匹配
---
.../admin/system/enums/StorageTypeEnum.java | 5 +--
.../impl/MultipartUploadServiceImpl.java | 44 +++++++++++++++++++
2 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java b/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java
index e3a7e1db..a4796b8a 100644
--- a/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java
+++ b/continew-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java
@@ -68,9 +68,8 @@ public enum StorageTypeEnum implements BaseEnum {
ValidationUtils.throwIf(StrUtil.isNotBlank(req.getDomain()) && !ReUtil
.isMatch(RegexConstants.URL_HTTP_NOT_IP, req.getDomain()), "域名格式不正确");
Long multipartUploadPartSize = req.getMultipartUploadPartSize();
- ValidationUtils.throwIf(multipartUploadPartSize != null
- && multipartUploadPartSize < StorageConstant.DEFAULT_MULTIPART_UPLOAD_PART_SIZE,
- "对象存储分片大小不能小于 5MB");
+ ValidationUtils
+ .throwIf(multipartUploadPartSize != null && multipartUploadPartSize < StorageConstant.DEFAULT_MULTIPART_UPLOAD_PART_SIZE, "对象存储分片大小不能小于 5MB");
}
};
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java
index 7cf71f86..6c83ca09 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/MultipartUploadServiceImpl.java
@@ -96,6 +96,7 @@ public class MultipartUploadServiceImpl implements MultipartUploadService {
if (session == null) {
throw new BaseException("无效的 uploadId: " + uploadId);
}
+ validatePartSize(file, session, partNumber);
String targetPath = StrUtil.blankToDefault(session.getPath(), path);
try {
top.continew.starter.storage.domain.model.resp.MultipartUploadResp resp = fileStorageService
@@ -163,6 +164,49 @@ public class MultipartUploadServiceImpl implements MultipartUploadService {
return target;
}
+ /**
+ * 基于分片会话固化参数校验当前分片大小一致性。
+ *
+ *
+ * 规则：
+ *
+ *
+ * 1. 分片序号必须在合法区间（1..totalParts）
+ *
+ *
+ * 2. 非最后一片大小必须等于会话 partSize
+ *
+ *
+ * 3. 最后一片大小必须等于剩余字节数（支持整除时等于 partSize）
+ *
+ *
+ * @param file 当前上传分片
+ * @param session 分片上传会话
+ * @param partNumber 分片序号
+ */
+ private void validatePartSize(MultipartFile file, MultipartInitResp session, Integer partNumber) {
+ if (partNumber == null || partNumber < 1) {
+ throw new BaseException("分片序号不合法: " + partNumber);
+ }
+ Long sessionPartSize = session.getPartSize();
+ Long sessionFileSize = session.getFileSize();
+ if (sessionPartSize == null || sessionPartSize <= 0 || sessionFileSize == null || sessionFileSize <= 0) {
+ return;
+ }
+ long partSize = sessionPartSize;
+ long fileSize = sessionFileSize;
+ long totalParts = (fileSize + partSize - 1) / partSize;
+ if (partNumber > totalParts) {
+ throw new BaseException("分片序号超出范围: " + partNumber);
+ }
+ long expectedPartSize = partNumber < totalParts ? partSize : fileSize - (totalParts - 1) * partSize;
+ long actualPartSize = file.getSize();
+ if (actualPartSize != expectedPartSize) {
+ throw new BaseException("分片大小不匹配: partNumber=%s, expected=%s, actual=%s"
+ .formatted(partNumber, expectedPartSize, actualPartSize));
+ }
+ }
+
private String normalizeStoragePath(String path) {
return StrUtil.removePrefix(path.replace("\\", StringConstants.SLASH)
.replaceAll("/+", StringConstants.SLASH), StringConstants.SLASH);
--
Gitee
From b6f6ca2512fd1a010fa6425606bab5c56978a77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=B3=BD=E5=A8=81?= <958142070@qq.com>
Date: Tue, 3 Mar 2026 15:20:28 +0800
Subject: [PATCH 11/12] =?UTF-8?q?feat(file):=20=E6=94=AF=E6=8C=81=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E5=92=8C=E9=BB=98=E8=AE=A4=E5=AD=98=E5=82=A8=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 文件上传接口新增uploadTaskId参数，支持上传任务ID追踪进度
- 新增文件上传进度查询接口，返回上传状态、进度百分比及相关信息
- 新增默认存储上传配置接口，提供当前默认存储的相关上传配置信息
- 实现上传过程中进度数据保存至Redis，保证上传状态实时更新
- 上传异常或完成时更新上传进度状态，支持失败与完成状态区分
- 增加FileUploadProgressResp和FileUploadConfigResp响应参数类
- 新增文件上传进度状态枚举，定义上传流程各阶段状态
- StorageService接口及实现新增获取默认上传配置方法
- 相关服务与控制器注入StorageService及相应接口实现
---
.../system/controller/FileController.java | 26 +++-
.../enums/FileUploadProgressStatusEnum.java | 65 ++++++++
.../model/resp/file/FileUploadConfigResp.java | 80 ++++++++++
.../resp/file/FileUploadProgressResp.java | 86 +++++++++++
.../admin/system/service/FileService.java | 26 ++++
.../admin/system/service/StorageService.java | 10 +-
.../system/service/impl/FileServiceImpl.java | 145 ++++++++++++++++--
.../service/impl/StorageServiceImpl.java | 17 ++
8 files changed, 437 insertions(+), 18 deletions(-)
create mode 100644 continew-system/src/main/java/top/continew/admin/system/enums/FileUploadProgressStatusEnum.java
create mode 100644 continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileUploadConfigResp.java
create mode 100644 continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileUploadProgressResp.java
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 91fa6ca0..2581a255 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
@@ -30,11 +30,14 @@ import org.springframework.web.multipart.MultipartFile;
import top.continew.admin.common.base.controller.BaseController;
import top.continew.admin.system.model.query.FileQuery;
import top.continew.admin.system.model.req.FileReq;
+import top.continew.admin.system.model.resp.file.FileUploadConfigResp;
+import top.continew.admin.system.model.resp.file.FileUploadProgressResp;
import top.continew.admin.system.model.resp.file.FileDirCalcSizeResp;
import top.continew.admin.system.model.resp.file.FileResp;
import top.continew.admin.system.model.resp.file.FileStatisticsResp;
import top.continew.admin.system.model.resp.file.FileUploadResp;
import top.continew.admin.system.service.FileService;
+import top.continew.admin.system.service.StorageService;
import top.continew.starter.core.util.validation.ValidationUtils;
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
import top.continew.starter.extension.crud.enums.Api;
@@ -57,6 +60,8 @@ import java.io.IOException;
@CrudRequestMapping(value = "/system/file", api = {Api.PAGE, Api.UPDATE, Api.BATCH_DELETE})
public class FileController extends BaseController {
+ private final StorageService storageService;
+
/**
* 上传文件
*
@@ -73,9 +78,10 @@ public class FileController extends BaseController {
+
+ /**
+ * 初始化
+ */
+ INIT("INIT", "初始化"),
+
+ /**
+ * 上传中
+ */
+ UPLOADING("UPLOADING", "上传中"),
+
+ /**
+ * 收尾处理中（文件字节已传输完成，等待后端处理完成）
+ */
+ FINALIZING("FINALIZING", "收尾处理中"),
+
+ /**
+ * 已完成
+ */
+ COMPLETED("COMPLETED", "已完成"),
+
+ /**
+ * 失败
+ */
+ FAILED("FAILED", "失败"),
+
+ /**
+ * 未找到任务
+ */
+ NOT_FOUND("NOT_FOUND", "未找到任务");
+
+ private final String value;
+ private final String description;
+}
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileUploadConfigResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileUploadConfigResp.java
new file mode 100644
index 00000000..1b94ae10
--- /dev/null
+++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileUploadConfigResp.java
@@ -0,0 +1,80 @@
+/*
+ * 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.Data;
+import top.continew.admin.system.enums.StorageTypeEnum;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 默认存储上传配置响应参数
+ *
+ * @author echo
+ * @since 2026/3/3 12:20
+ */
+@Data
+@Schema(description = "默认存储上传配置响应参数")
+public class FileUploadConfigResp implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 默认存储 ID
+ */
+ @Schema(description = "默认存储 ID", example = "1")
+ private Long storageId;
+
+ /**
+ * 默认存储名称
+ */
+ @Schema(description = "默认存储名称", example = "本地存储")
+ private String storageName;
+
+ /**
+ * 默认存储编码
+ */
+ @Schema(description = "默认存储编码", example = "local")
+ private String storageCode;
+
+ /**
+ * 存储类型（1: 本地存储，2: 对象存储）
+ */
+ @Schema(description = "存储类型（1: 本地存储，2: 对象存储）", example = "1")
+ private StorageTypeEnum storageType;
+
+ /**
+ * 分片上传阈值（字节）
+ */
+ @Schema(description = "分片上传阈值（字节）", example = "10485760")
+ private Long multipartUploadThreshold;
+
+ /**
+ * 分片上传大小（字节）
+ */
+ @Schema(description = "分片上传大小（字节）", example = "5242880")
+ private Long multipartUploadPartSize;
+
+ /**
+ * 本地分片临时目录（仅本地存储返回）
+ */
+ @Schema(description = "本地分片临时目录（仅本地存储返回）", example = "/tmp/continew-multipart")
+ private String multipartTempDir;
+}
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileUploadProgressResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileUploadProgressResp.java
new file mode 100644
index 00000000..aeb09ed6
--- /dev/null
+++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/file/FileUploadProgressResp.java
@@ -0,0 +1,86 @@
+/*
+ * 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.Data;
+import top.continew.admin.system.enums.FileUploadProgressStatusEnum;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 文件上传进度响应参数
+ *
+ * @author echo
+ * @since 2026/3/3 12:20
+ */
+@Data
+@Schema(description = "文件上传进度响应参数")
+public class FileUploadProgressResp implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 上传任务 ID
+ */
+ @Schema(description = "上传任务 ID", example = "upload-task-1")
+ private String uploadTaskId;
+
+ /**
+ * 任务状态（INIT/UPLOADING/FINALIZING/COMPLETED/FAILED/NOT_FOUND）
+ */
+ @Schema(description = "任务状态（INIT/UPLOADING/FINALIZING/COMPLETED/FAILED/NOT_FOUND）", example = "UPLOADING")
+ private FileUploadProgressStatusEnum status;
+
+ /**
+ * 上传进度百分比
+ */
+ @Schema(description = "上传进度百分比", example = "65")
+ private Integer percentage;
+
+ /**
+ * 已上传字节数
+ */
+ @Schema(description = "已上传字节数", example = "3407872")
+ private Long bytesRead;
+
+ /**
+ * 总字节数
+ */
+ @Schema(description = "总字节数", example = "5242880")
+ private Long totalBytes;
+
+ /**
+ * 文件 ID（完成上传后返回）
+ */
+ @Schema(description = "文件 ID（完成上传后返回）", example = "1897293810343682049")
+ private String fileId;
+
+ /**
+ * 文件 URL（完成上传后返回）
+ */
+ @Schema(description = "文件 URL（完成上传后返回）", example = "http://localhost:8000/file/example.png")
+ private String url;
+
+ /**
+ * 错误信息
+ */
+ @Schema(description = "错误信息")
+ private String message;
+}
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 56afce14..59700eb2 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
@@ -23,6 +23,7 @@ import top.continew.admin.system.model.entity.FileDO;
import top.continew.admin.system.model.entity.StorageDO;
import top.continew.admin.system.model.query.FileQuery;
import top.continew.admin.system.model.req.FileReq;
+import top.continew.admin.system.model.resp.file.FileUploadProgressResp;
import top.continew.admin.system.model.resp.file.FileResp;
import top.continew.admin.system.model.resp.file.FileStatisticsResp;
import top.continew.starter.core.constant.StringConstants;
@@ -76,6 +77,23 @@ public interface FileService extends BaseService implements FileService {
+ private static final String FILE_UPLOAD_PROGRESS_PREFIX = "file:upload:progress:";
+ private static final Duration FILE_UPLOAD_PROGRESS_EXPIRE = Duration.ofHours(1);
+
private final FileStorageService fileStorageService;
@Lazy
@Resource
@@ -107,12 +115,18 @@ public class FileServiceImpl extends BaseServiceImpl storageIds) {
if (CollUtil.isEmpty(storageIds)) {
@@ -217,13 +252,14 @@ public class FileServiceImpl extends BaseServiceImpl allExtensions = FileTypeEnum.getAllExtensions();
CheckUtils.throwIf(!allExtensions.contains(extName), "不支持的文件类型，仅支持 {} 格式的文件", String
.join(StringConstants.COMMA, allExtensions));
@@ -239,6 +275,11 @@ public class FileServiceImpl extends BaseServiceImpl log
- .info("文件 [{}] 已上传 [{}]，总大小 [{}]，进度 [{}%]", uniqueFileName, progressSize, allSize, percentage));
- // 上传
- log.info("开始上传文件: {}", uniqueFileName);
- FileInfo fileInfo = uploadPretreatment.upload();
- log.info("文件 [{}] 上传完成", uniqueFileName);
- return this.postProcessUploadResult(fileInfo, storage);
+ uploadPretreatment.onProgress((progressSize, allSize, percentage) -> {
+ log.info("文件 [{}] 已上传 [{}]，总大小 [{}]，进度 [{}%]", uniqueFileName, progressSize, allSize, percentage);
+ if (StrUtil.isNotBlank(normalizedUploadTaskId)) {
+ FileUploadProgressStatusEnum status = (allSize > 0 && progressSize >= allSize) || percentage >= 100
+ ? FileUploadProgressStatusEnum.FINALIZING
+ : FileUploadProgressStatusEnum.UPLOADING;
+ this.saveUploadProgress(normalizedUploadTaskId, status, progressSize, allSize, percentage, null, null, null);
+ }
+ });
+ try {
+ // 上传
+ log.info("开始上传文件: {}", uniqueFileName);
+ FileInfo fileInfo = uploadPretreatment.upload();
+ log.info("文件 [{}] 上传完成", uniqueFileName);
+ FileInfo result = this.postProcessUploadResult(fileInfo, storage);
+ if (StrUtil.isNotBlank(normalizedUploadTaskId)) {
+ long completedSize = result.getSize() == null ? totalBytes : result.getSize();
+ this.saveUploadProgress(normalizedUploadTaskId, FileUploadProgressStatusEnum.COMPLETED, completedSize, totalBytes, 100, null, result
+ .getFileId(), result.getUrl());
+ }
+ return result;
+ } catch (RuntimeException e) {
+ if (StrUtil.isNotBlank(normalizedUploadTaskId)) {
+ this.saveUploadProgress(normalizedUploadTaskId, FileUploadProgressStatusEnum.FAILED, 0L, totalBytes, 0, e
+ .getMessage(), null, null);
+ }
+ throw e;
+ }
}
/**
@@ -410,4 +472,57 @@ public class FileServiceImpl extends BaseServiceImpl
Date: Tue, 17 Mar 2026 16:11:25 +0800
Subject: [PATCH 12/12] =?UTF-8?q?fix(storage):=20=E4=BF=AE=E6=AD=A3?=
=?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=AD=98=E5=82=A8=E9=85=8D=E7=BD=AE=EF=BC=8C?=
=?UTF-8?q?=E5=90=AF=E7=94=A8=E8=B7=AF=E5=BE=84=E6=A0=B7=E5=BC=8F=E8=AE=BF?=
=?UTF-8?q?=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../continew/admin/system/service/impl/StorageServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
index 53dd09a4..114a0a5a 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
@@ -223,6 +223,7 @@ public class StorageServiceImpl extends BaseServiceImpl throw new IllegalArgumentException("不支持的存储类型：%s".formatted(storage.getType()));
--
Gitee