From a438a004d92586c0657ef5c5d297b1af88ea370d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sat, 10 Oct 2020 15:12:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
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 b6c6dbb..492dbff 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
@@ -45,6 +45,8 @@
@Value("${kidgrow.file-server.oss.domain}")
private String DOMAIN;
+ @Value("${spring.profiles.active}")
+ private String OssPathEn;
@Override
public FileInfo upload(MultipartFile file) throws Exception {
FileInfo fileInfo = FileUtil.getFileInfo(file);
@@ -330,7 +332,7 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(houzhui);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,OssPathEn+"pdf/"+newFileName,inputStream);
baseMapper.insert(newfileInfo);
return newfileInfo;
}
--
Gitblit v1.8.0