From 171f5567cecda191f6b32e6c303c2bea9cd266f0 Mon Sep 17 00:00:00 2001 From: 克 刘 <4345453@qq.com> Date: Tue, 01 Sep 2020 19:47:37 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java index 3d67a91..b70149c 100644 --- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java +++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java @@ -12,6 +12,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.Map; /** @@ -83,6 +87,39 @@ } return fileService.baseDownLoad(map); } + /** + * byte[]上传 + */ + @PostMapping(value="byteUplaod") + public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes){ + if(bytes.length == 0){ + return null; + } + if (com.kidgrow.common.utils.StringUtils.isBlank(fileName)) { + return null; + } + InputStream inputStream = new ByteArrayInputStream(bytes); + return fileService.byteUplaod(fileName,inputStream,bytes.length); + } + /** + * byte[]上传 + */ + @PostMapping(value="byteUplaodTest",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public FileInfo byteUplaodTest(@RequestParam("fileName") String fileName,@RequestPart("file") MultipartFile file)throws IOException { + InputStream inputStream = file.getInputStream(); + ByteArrayOutputStream bytestream = new ByteArrayOutputStream(); + byte[] buffer=new byte[1024]; + int ch; + /** + * + * */ + while ((ch = inputStream.read(buffer)) != -1) { + bytestream.write(buffer,0,ch); + } + byte[] data = bytestream.toByteArray(); + InputStream inputStream1 = new ByteArrayInputStream(data); + return fileService.byteUplaod(fileName,inputStream,data.length); + } /** * 文件删除 -- Gitblit v1.8.0