From b0e0f0cb9dbf68af601d07650ef522f2237cbc06 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 17:40:57 +0800
Subject: [PATCH] 配合新的套餐功能，修正套餐的扣款顺序（修复）
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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..c490b1f 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,7 +72,7 @@
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;
@@ -100,12 +100,13 @@
* @param newFilePath 上传到的文件路径
* @param fileStream 要上传的文件流
*/
+ @Override
public void fileUpLoadOss(FileInfo fileInfo, String newFilePath, InputStream fileStream) {
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+"/";
--
Gitblit v1.8.0