|
|
|
|
@ -19,9 +19,12 @@ package org.springblade.resource.endpoint;
|
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.SneakyThrows; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
|
import org.springblade.core.oss.model.BladeFile; |
|
|
|
|
import org.springblade.core.oss.model.OssFile; |
|
|
|
|
import org.springblade.core.secure.annotation.PreAuth; |
|
|
|
|
import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
|
import org.springblade.core.tenant.annotation.NonDS; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.constant.RoleConstant; |
|
|
|
|
@ -33,6 +36,17 @@ import org.springblade.resource.service.IAttachService;
|
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
|
|
import java.io.File; |
|
|
|
|
import java.io.FileInputStream; |
|
|
|
|
import java.io.FileOutputStream; |
|
|
|
|
import java.nio.file.Files; |
|
|
|
|
import java.nio.file.Path; |
|
|
|
|
import java.nio.file.Paths; |
|
|
|
|
import java.nio.file.attribute.FileAttribute; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.Objects; |
|
|
|
|
import java.util.UUID; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 对象存储端点 |
|
|
|
|
* |
|
|
|
|
@ -41,6 +55,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
@NonDS |
|
|
|
|
@RestController |
|
|
|
|
@AllArgsConstructor |
|
|
|
|
@Slf4j |
|
|
|
|
@RequestMapping("/oss/endpoint") |
|
|
|
|
@Api(value = "对象存储端点", tags = "对象存储端点") |
|
|
|
|
public class OssEndpoint { |
|
|
|
|
@ -55,6 +70,7 @@ public class OssEndpoint {
|
|
|
|
|
*/ |
|
|
|
|
private final IAttachService attachService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 创建存储桶 |
|
|
|
|
* |
|
|
|
|
@ -148,6 +164,123 @@ public class OssEndpoint {
|
|
|
|
|
return R.data(bladeFile); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 文件分片上传 |
|
|
|
|
* |
|
|
|
|
* @param file 切片 |
|
|
|
|
* @param chunkNumber 当前的切片位置 |
|
|
|
|
* @param totalChunks 总切片数 |
|
|
|
|
* @param fileName 文件名称 |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/chunk") |
|
|
|
|
public R putFile(@RequestParam("file") MultipartFile file, |
|
|
|
|
@RequestParam("chunkNumber") int chunkNumber, |
|
|
|
|
@RequestParam("totalChunks") int totalChunks, |
|
|
|
|
@RequestParam("fileName") String fileName) { |
|
|
|
|
String uploadPath = CommonUtil.SYSTEMFILEPATH + AuthUtil.getUser().getUserId(); |
|
|
|
|
// 安全性优化：确保文件名是安全的
|
|
|
|
|
String safeFileName = sanitizeFileName(fileName); |
|
|
|
|
|
|
|
|
|
// 边界条件检查
|
|
|
|
|
if (chunkNumber < 0 || totalChunks < 1) { |
|
|
|
|
return R.fail("无效的chunkNumber或totalChunks"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 异常处理优化：添加日志记录
|
|
|
|
|
try { |
|
|
|
|
ensureUploadDirectoryExists(uploadPath); |
|
|
|
|
|
|
|
|
|
// 优化：使用UUID避免文件覆盖
|
|
|
|
|
// String uniqueChunkIdentifier = UUID.randomUUID().toString();
|
|
|
|
|
Path chunkFilePath = Paths.get(uploadPath, safeFileName + ".part" + chunkNumber); |
|
|
|
|
// 创建父目录
|
|
|
|
|
Files.createDirectories(chunkFilePath.getParent(), new FileAttribute<?>[0]); |
|
|
|
|
file.transferTo(chunkFilePath.toFile()); |
|
|
|
|
|
|
|
|
|
return R.data(chunkNumber); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
// 优化：添加错误日志
|
|
|
|
|
log.error("文件上传失败", e); |
|
|
|
|
return R.fail("文件上传失败~"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 安全性优化：清理文件名
|
|
|
|
|
private String sanitizeFileName(String fileName) { |
|
|
|
|
// 实现文件名清理逻辑，例如移除特殊字符，确保文件名安全
|
|
|
|
|
// 此处的实现依赖具体项目安全要求，以下为示例
|
|
|
|
|
return fileName.replaceAll("[^a-zA-Z0-9\\.\\-_]", "_"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 性能优化：确保上传目录存在
|
|
|
|
|
private void ensureUploadDirectoryExists(String uploadPath) { |
|
|
|
|
|
|
|
|
|
File uploadDir = new File(uploadPath); |
|
|
|
|
if (!uploadDir.exists()) { |
|
|
|
|
uploadDir.mkdirs(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 文件分片上传合并 |
|
|
|
|
* |
|
|
|
|
* @param map |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/mergeFile") |
|
|
|
|
public R mergeChunks(@RequestBody Map map) { |
|
|
|
|
// 提取参数
|
|
|
|
|
Integer totalChunks = Objects.requireNonNull((Integer) map.get("totalChunks"), "totalChunks cannot be null"); |
|
|
|
|
String fileName = Objects.requireNonNull((String) map.get("fileName"), "fileName cannot be null"); |
|
|
|
|
|
|
|
|
|
// 文件路径使用File.separator保证跨平台兼容性
|
|
|
|
|
String userFilePath = CommonUtil.SYSTEMFILEPATH + File.separator + AuthUtil.getUser().getUserId() + File.separator + fileName; |
|
|
|
|
File mergedFile = new File(userFilePath); |
|
|
|
|
|
|
|
|
|
// 使用try-with-resources语句确保文件流正确关闭
|
|
|
|
|
try (FileOutputStream fos = new FileOutputStream(mergedFile)) { |
|
|
|
|
for (int i = 0; i < totalChunks; i++) { |
|
|
|
|
String chunkFilePath = userFilePath + ".part" + i; |
|
|
|
|
File chunkFile = new File(chunkFilePath); |
|
|
|
|
|
|
|
|
|
if (chunkFile.exists()) { |
|
|
|
|
Files.copy(chunkFile.toPath(), fos); |
|
|
|
|
if (!chunkFile.delete()) { |
|
|
|
|
log.error("Failed to delete chunk file: {}", chunkFilePath); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
// 分片缺失的更细致处理
|
|
|
|
|
return R.fail("文件合并失败，缺失分片：" + i); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
log.info("文件合并完成: {}", mergedFile.getPath()); |
|
|
|
|
|
|
|
|
|
// 合并文件上传到OSS
|
|
|
|
|
try (FileInputStream inputStream = new FileInputStream(mergedFile)) { |
|
|
|
|
long startTime = System.currentTimeMillis(); |
|
|
|
|
BladeFile bladeFile = ossBuilder.template().putFile(fileName, inputStream); |
|
|
|
|
long endTime = System.currentTimeMillis(); |
|
|
|
|
log.info("Upload file {} from merge, start-end time: {}, {}", fileName, startTime, endTime); |
|
|
|
|
|
|
|
|
|
// bladeFile.setLink(bladeFile.getLink().replaceFirst("(http|https)://.*?/", "/minio/"));
|
|
|
|
|
|
|
|
|
|
bladeFile.setDomain("http://files.huo5u.com/"); |
|
|
|
|
return R.data(bladeFile); |
|
|
|
|
} |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("Error during file merging and uploading: ", e); |
|
|
|
|
return R.fail("文件上传失败~"); |
|
|
|
|
} finally { |
|
|
|
|
// 删除合并后的临时文件，如果存在
|
|
|
|
|
if (mergedFile.exists()) { |
|
|
|
|
boolean isDeleted = mergedFile.delete(); |
|
|
|
|
log.info("Merge file deleted: {}", isDeleted); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 上传文件 |
|
|
|
|
* |
|
|
|
|
|
