diff --git a/src/main/java/com/zilber/boot/file/controller/FileUploadController.java b/src/main/java/com/zilber/boot/file/controller/FileUploadController.java index 0606b40..d58817a 100644 --- a/src/main/java/com/zilber/boot/file/controller/FileUploadController.java +++ b/src/main/java/com/zilber/boot/file/controller/FileUploadController.java @@ -70,6 +70,12 @@ public class FileUploadController { @ApiOperation("分片上传检测-oss服务器") @PostMapping("/oss/check") + public Map check(String md5) { + return uploadUtils.check(md5); + } + + @ApiOperation("分片上传检测-oss服务器") + @PostMapping("/oss") public PartListing PartListing(OssListParts parts) { return uploadUtils.list(parts); } diff --git a/src/main/java/com/zilber/boot/file/entity/OssComplete.java b/src/main/java/com/zilber/boot/file/entity/OssComplete.java index 3665667..5d6d8c9 100644 --- a/src/main/java/com/zilber/boot/file/entity/OssComplete.java +++ b/src/main/java/com/zilber/boot/file/entity/OssComplete.java @@ -30,6 +30,10 @@ public class OssComplete extends OssProperties{ @ApiModelProperty(value = "文件名称", required = true) private String key; + @NotBlank(message = "md5不能为空") + @ApiModelProperty(value = "md5", required = true) + private String md5; + @NotNull(message = "tag列表不能为空") @ApiModelProperty("tag列表") private List tags; diff --git a/src/main/java/com/zilber/boot/file/service/UploadUtils.java b/src/main/java/com/zilber/boot/file/service/UploadUtils.java index afb15de..72ab787 100644 --- a/src/main/java/com/zilber/boot/file/service/UploadUtils.java +++ b/src/main/java/com/zilber/boot/file/service/UploadUtils.java @@ -660,7 +660,15 @@ public class UploadUtils { complete.getUploadId(), partETags); // 完成分片上传。 - return ossClient.completeMultipartUpload(completeMultipartUploadRequest); + CompleteMultipartUploadResult result = ossClient.completeMultipartUpload(completeMultipartUploadRequest); + fileDao.addFile(complete.getMd5(), result.getLocation(), + getFileType(result.getKey().substring(result.getKey().lastIndexOf("."))), 2); + return result; + } + + public Map check(String md5) { + Map objectMap = fileDao.listFileUrl(md5, 2); + return objectMap; } /**