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 6445183..96f2ade 100644 --- a/src/main/java/com/zilber/boot/file/controller/FileUploadController.java +++ b/src/main/java/com/zilber/boot/file/controller/FileUploadController.java @@ -28,8 +28,8 @@ public class FileUploadController { @ApiOperation("文件上传服务器") @PostMapping("/upload") - public Map uploadFile(MultipartFile file) { - return uploadUtils.upload(file); + public Map uploadFile(MultipartFile file, String md5) { + return uploadUtils.upload(file, md5); } @ApiOperation("分片上传服务器") @@ -52,8 +52,8 @@ public class FileUploadController { @ApiOperation("文件上传oss服务器") @PostMapping("/oss/upload") - public Map uploadFileToOss(MultipartFile file) { - return uploadUtils.upload(file, null); + public Map uploadFileToOss(MultipartFile file, String md5) { + return uploadUtils.upload(file, null, md5); } @ApiOperation("分片上传初始化-oss服务器") 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 082bee8..12f5ae0 100644 --- a/src/main/java/com/zilber/boot/file/service/UploadUtils.java +++ b/src/main/java/com/zilber/boot/file/service/UploadUtils.java @@ -43,9 +43,9 @@ public class UploadUtils { @Autowired private FileDao fileDao; - public Map upload(MultipartFile file) { + public Map upload(MultipartFile file, String md5) { try { - Map objectMap = fileDao.listFileUrl(MD5Encoder.encode(file.getBytes()), 1); + Map objectMap = fileDao.listFileUrl(md5, 1); if ( objectMap != null ){ objectMap.put("name", file.getOriginalFilename()); return objectMap; @@ -94,15 +94,11 @@ public class UploadUtils { * @param module oss目录 * @return */ - public Map upload(MultipartFile file, @Nullable String module) { - try { - Map objectMap = fileDao.listFileUrl(MD5Encoder.encode(file.getBytes()), 2); - if ( objectMap != null ){ - objectMap.put("name", file.getOriginalFilename()); - return objectMap; - } - } catch (IOException e) { - e.printStackTrace(); + public Map upload(MultipartFile file, @Nullable String module, String md5) { + Map objectMap = fileDao.listFileUrl(md5, 2); + if ( objectMap != null ){ + objectMap.put("name", file.getOriginalFilename()); + return objectMap; } /** * 获取oss的属性