diff --git a/src/main/java/org/ils/file/controller/FileDetailController.java b/src/main/java/org/ils/file/controller/FileDetailController.java index 66c5fb4..fc39181 100644 --- a/src/main/java/org/ils/file/controller/FileDetailController.java +++ b/src/main/java/org/ils/file/controller/FileDetailController.java @@ -41,14 +41,7 @@ public class FileDetailController { } - /** - * 上传文件 - */ - @ApiOperation("上传文件-返回fileInfo") - @RequestMapping(value = "uploadInputStream", method = RequestMethod.POST) - public Result uploadInputStream(InputStream inputStream) { - return Result.ok(ilsFileDetailService.uploadInputStream(inputStream)); - } + /** diff --git a/src/main/java/org/ils/file/mapper/FileDetailMapper.java b/src/main/java/org/ils/file/mapper/FileDetailMapper.java index 0086c7b..1a5d83a 100644 --- a/src/main/java/org/ils/file/mapper/FileDetailMapper.java +++ b/src/main/java/org/ils/file/mapper/FileDetailMapper.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.ils.file.entity.FileDetail; +/** + * @author chenjf + */ @Mapper public interface FileDetailMapper extends BaseMapper { } diff --git a/src/main/java/org/ils/file/service/IlsFileDetailService.java b/src/main/java/org/ils/file/service/IlsFileDetailService.java index 75564ae..ad4019c 100644 --- a/src/main/java/org/ils/file/service/IlsFileDetailService.java +++ b/src/main/java/org/ils/file/service/IlsFileDetailService.java @@ -19,10 +19,6 @@ public interface IlsFileDetailService { public FileInfo upload(MultipartFile file); - /** - * 上传文件 - */ - public FileInfo uploadInputStream(InputStream inputStream); /** * 上传文件,成功返回文件 url */ diff --git a/src/main/java/org/ils/file/service/impl/IlsFileDetailServiceImpl.java b/src/main/java/org/ils/file/service/impl/IlsFileDetailServiceImpl.java index 1f0be51..36be0fd 100644 --- a/src/main/java/org/ils/file/service/impl/IlsFileDetailServiceImpl.java +++ b/src/main/java/org/ils/file/service/impl/IlsFileDetailServiceImpl.java @@ -31,13 +31,10 @@ public class IlsFileDetailServiceImpl implements IlsFileDetailService { private FileDetailService fileDetailService; @Override public FileInfo upload(MultipartFile file) { - FileInfo fileInfo = fileStorageService.of(file).upload(); - return fileInfo; - } - - @Override - public FileInfo uploadInputStream(InputStream inputStream) { - FileInfo fileInfo = fileStorageService.of(inputStream).upload(); + FileInfo fileInfo = fileStorageService.of(file) + .setObjectId(file.getOriginalFilename()) + .setOriginalFilename(file.getOriginalFilename()) + .upload(); return fileInfo; } @@ -46,9 +43,10 @@ public class IlsFileDetailServiceImpl implements IlsFileDetailService { public String uploadUrl(MultipartFile file) { FileInfo fileInfo = fileStorageService.of(file) .setPath("upload/") //保存到相对路径下,为了方便管理,不需要可以不写 - .setObjectId("0") //关联对象id,为了方便管理,不需要可以不写 + .setObjectId(file.getOriginalFilename()) //关联对象id,为了方便管理,不需要可以不写 .setObjectType("0") //关联对象类型,为了方便管理,不需要可以不写 .putAttr("role","admin") //保存一些属性,可以在切面、保存上传记录、自定义存储平台等地方获取使用,不需要可以不写 + .setOriginalFilename(file.getOriginalFilename()) .upload(); //将文件上传到对应地方 return fileInfo == null ? "上传失败!" : fileInfo.getUrl(); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ae2fcba..00a1b3a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,8 +1,5 @@ server: port: 9098 -feign: - hystrix: - enabled: true spring: mvc: pathmatch: