From 2f10692d098af93490c46aa561a353fc5870c789 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:51:22 +0800
Subject: [PATCH] 优化修复扣费成功后的日志代码，预防bug出现
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 a443a97..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
@@ -72,17 +72,17 @@
String hospitalID = httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER);
String depID = httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER);
String folderByDate = DateUtil.formatDate(new Date());
- int begin = file.getOriginalFilename().indexOf(".");
+ int begin = file.getOriginalFilename().lastIndexOf(".");
int last = file.getOriginalFilename().length();
String fileType = file.getOriginalFilename().substring(begin, last);
String fileName = UUID.randomUUID().toString().replaceAll("-", "") + fileType;
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);
}
}
@@ -100,12 +100,13 @@
* @param newFilePath 上传到的文件路径
* @param fileStream 要上传的文件流
*/
- public void fileUpLoadOss(FileInfo fileInfo, String newFilePath, InputStream fileStream) {
+ @Override
+ public void fileUpLoadOss(FileInfo fileInfo, String newFilePath, InputStream fileStream,String fileFolder) {
ossClient.putObject(fileProperties.getOss().getBucketName(), newFilePath, fileStream);
fileInfo.setUrl(fileProperties.getOss().getDomain() + newFilePath);
}
-
+ @Override
public OSSObject down(String url) {
GetObjectRequest request = new GetObjectRequest(fileProperties.getOss().getBucketName(), url);
return ossClient.getObject(request);
@@ -117,6 +118,7 @@
* @param imgType
* @return
*/
+ @Override
public String FilePath(String imgType, String folderByDate, String hospitalId, String departmentId) {
//返回的文件路径
String fileFolder = OssPathEn+"/";
@@ -147,7 +149,11 @@
fileFolder += "HospitalLogo/";
} else if (imgType.toLowerCase().equals("doctor")) {
fileFolder += "DoctorImage/";
- } else {
+ } else if (imgType.toLowerCase().equals("customerhospital")) {
+ fileFolder += "Customer/Hospital/" + folderByDate + "/";
+ } else if (imgType.toLowerCase().equals("customerhead")) {
+ fileFolder += "Customer/HeadImg/" + folderByDate + "/";
+ }else {
fileFolder += "OtherImage/" + folderByDate + "/";
}
} else {
--
Gitblit v1.8.0