From 8b7c75249a83b45dd53cc2177bb61bfa3d7e55cb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 02 Mar 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
index 4d30ebc..00388a0 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
@@ -79,10 +79,10 @@
String fileFolder = "";
if (clientID.equals("hospital")) {//医院端平台，
fileFolder = FilePath(fileInfo.getImgType(), folderByDate, hospitalID, depID);
- fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream());
+ fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream(),fileFolder);
} else {
fileFolder = FilePath(fileInfo.getImgType(), folderByDate, hospitalID, depID);
- fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream());
+ fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream(),fileFolder);
}
}
@@ -101,7 +101,7 @@
* @param fileStream 要上传的文件流
*/
@Override
- public void fileUpLoadOss(FileInfo fileInfo, String newFilePath, InputStream fileStream) {
+ public void fileUpLoadOss(FileInfo fileInfo, String newFilePath, InputStream fileStream,String fileFolder) {
ossClient.putObject(fileProperties.getOss().getBucketName(), newFilePath, fileStream);
fileInfo.setUrl(fileProperties.getOss().getDomain() + newFilePath);
--
Gitblit v1.8.0