From 1d5345f92dbd4aac2b5f68265921bb2529a71b8e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Tue, 27 Oct 2020 14:16:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml | 2 +-
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java | 2 +-
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 5 +++--
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
index 056af51..9b3d2ea 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
@@ -6,6 +6,7 @@
import com.kidgrow.filecenter.model.FileInfo;
import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
@@ -43,7 +44,7 @@
*/
ResultBody baseDownLoad(Map<String, Object> map) throws Exception;
- FileInfo byteUplaod(String fileName, InputStream inputStream, int size);
+ FileInfo byteUplaod(String fileName, InputStream inputStream, int size) throws IOException;
/**
* 文件上传 根据fileType选择上传方式 hospitalId departmentId
* @param file
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
index 99da73d..33591ab 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
@@ -320,7 +320,7 @@
}
@Override
- public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) {
+ public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) throws IOException {
String houzhui=fileName.substring(fileName.lastIndexOf(".")+1);
String newFileName= RandomValueUtils.uuid()+"."+houzhui;
FileInfo newfileInfo=new FileInfo();
@@ -332,8 +332,9 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(houzhui);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,OssPathEn+"pdf/"+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
baseMapper.insert(newfileInfo);
+ inputStream.close();
return newfileInfo;
}
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 df66f75..45c5a19 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
@@ -100,7 +100,7 @@
* byte[]上传
*/
@PostMapping(value="byteUplaod")
- public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes){
+ public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes) throws IOException{
if(bytes.length == 0){
return null;
}
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml b/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
index 30f4715..abcd92c 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
@@ -56,7 +56,7 @@
security:
code:
# 忽略验证码的应用编号
- ignoreClientCode: app,hospital,webApp,readxapp
+ ignoreClientCode: app,hospital,readxapp
encrypt:
key-store:
--
Gitblit v1.8.0