From f6646d87aceda231e2f3a73670ec708ec8fca0a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 15 Aug 2020 11:29:36 +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/config/AliyunOSSAutoConfigure.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 2b09032..5364009 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
@@ -11,6 +11,7 @@
import com.kidgrow.filecenter.properties.FileServerProperties;
import com.kidgrow.filecenter.service.impl.AbstractIFileService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -20,8 +21,6 @@
import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
import java.util.UUID;
/**
@@ -64,6 +63,9 @@
return fileProperties.getType();
}
+ @Value("${spring.profiles.active}")
+ private String OssPathEn;
+
@Override
protected void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception {
String clientID = httpServletRequest.getHeader(SecurityConstants.CLIENT_HEADER);
@@ -77,7 +79,8 @@
fileFolder = FilePath(fileInfo.getImgType(), folderByDate, null, null);
fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream());
} else {
- fileUpLoadOss(fileInfo, fileProperties.getOss().getFolder() + folderByDate + "/" + fileName, file.getInputStream());
+ fileFolder = FilePath(fileInfo.getImgType(), folderByDate, null, null);
+ fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream());
}
}
@@ -114,7 +117,9 @@
*/
public String FilePath(String imgType, String folderByDate, String hospitalId, String departmentId) {
//返回的文件路径
- String fileFolder = "";
+ String fileFolder = OssPathEn+"/";
+
+
if (StringUtils.isNotBlank(imgType)) {
// 光片需要按照根据医院ID，科室ID，日期进行OSS存储
if (imgType.toLowerCase().equals("xray")) {
@@ -122,34 +127,34 @@
String depID = httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER);
if (org.apache.commons.lang3.StringUtils.isBlank(hospitalID) &&
org.apache.commons.lang3.StringUtils.isBlank(depID)) {
- fileFolder = "Xray/" + hospitalID + "/" + depID + "/" + folderByDate + "/";
+ fileFolder += "Xray/" + hospitalID + "/" + depID + "/" + folderByDate + "/";
} else {
if (org.apache.commons.lang3.StringUtils.isBlank(hospitalId) &&
org.apache.commons.lang3.StringUtils.isBlank(departmentId)) {
- fileFolder = "Xray/" + hospitalId + "/" + departmentId + "/" + folderByDate + "/";
+ fileFolder += "Xray/" + hospitalId + "/" + departmentId + "/" + folderByDate + "/";
} else {
- fileFolder = "Xray/" + folderByDate + "/";
+ fileFolder += "Xray/" + folderByDate + "/";
}
}
} else if (imgType.toLowerCase().equals("app")) {
//移动端APP上传
if (org.apache.commons.lang3.StringUtils.isBlank(hospitalId) &&
org.apache.commons.lang3.StringUtils.isBlank(departmentId)) {
- fileFolder = "AppXray/" + hospitalId + "/" + departmentId + "/" + folderByDate + "/";
+ fileFolder += "AppXray/" + hospitalId + "/" + departmentId + "/" + folderByDate + "/";
} else {
- fileFolder = "AppXray/" + folderByDate + "/";
+ fileFolder += "AppXray/" + folderByDate + "/";
}
}
// 医院Logo只保存在一个目录中
else if (imgType.toLowerCase().equals("logo")) {
- fileFolder = "HospitalLogo/";
+ fileFolder += "HospitalLogo/";
} else if (imgType.toLowerCase().equals("doctor")) {
- fileFolder = "DoctorImage/";
+ fileFolder += "DoctorImage/";
} else {
- fileFolder = "OtherImage/" + folderByDate + "/";
+ fileFolder += "OtherImage/" + folderByDate + "/";
}
} else {
- fileFolder = "OtherImage/" + folderByDate + "/";
+ fileFolder += "OtherImage/" + folderByDate + "/";
}
return fileFolder;
}
--
Gitblit v1.8.0