diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java index f34e6d013..078d150df 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java @@ -207,11 +207,11 @@ public class OssController { * 图片上传并压缩缩略图 * * @return void - * @author yinzuomei - * @date 2020/02/27 + * @author lpf + * @date 2020/03/27 */ @PostMapping("uploadImg") - @ApiOperation(value = "上传文件") + @ApiOperation(value = "上传图片") public Result uploadImg(@RequestParam("file") MultipartFile file) throws Exception { if (file.isEmpty()) { return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); @@ -232,4 +232,26 @@ public class OssController { uploadAll.setFileName(file.getOriginalFilename()); return new Result().ok(uploadAll); } + /** + * 文件上传 + * + * @return void + * @author lpf + * @date 2020/04/02 + */ + @PostMapping("uploadFile") + @ApiOperation(value = "上传文件") + public Result uploadFile(@RequestParam("file") MultipartFile file) throws Exception { + if (file.isEmpty()) { + return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY); + } + //上传文件 + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + String url = OssFactory.build().uploadSuffix(file.getBytes(), extension); + ossService.afterUpload(url, file.getSize()); + UploadImgAllDTO uploadAll = new UploadImgAllDTO(); + uploadAll.setImgUrl(url); + uploadAll.setFileName(file.getOriginalFilename()); + return new Result().ok(uploadAll); + } }