From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 99da73d..c416d2f 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
@@ -231,7 +231,7 @@
@Override
public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
String urlDiZhi=MapUtils.getString(map,"url");
- if(!urlDiZhi.contains(DOMAIN)){
+ if(!urlDiZhi.contains(DOMAIN)&&!urlDiZhi.contains(DOMAIN.replace("https","http"))){
ByteArrayOutputStream outPut = new ByteArrayOutputStream();
byte[] data = new byte[1024];
try {
@@ -260,7 +260,7 @@
List<FileInfo> fileInfos = baseMapper.selectByMap(map);
if (fileInfos.size() > 0) {
FileInfo fileInfo = fileInfos.get(0);
- OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, ""));
+ OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, "").replace(DOMAIN.replace("https","http"),""));
InputStream objectContent = down.getObjectContent();
//返回Base64编码过的字节数组字符串
byte[] data = null;
@@ -320,7 +320,7 @@
}
@Override
- public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) {
+ public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) throws IOException {
String houzhui=fileName.substring(fileName.lastIndexOf(".")+1);
String newFileName= RandomValueUtils.uuid()+"."+houzhui;
FileInfo newfileInfo=new FileInfo();
@@ -332,8 +332,9 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(houzhui);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,OssPathEn+"pdf/"+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
baseMapper.insert(newfileInfo);
+ inputStream.close();
return newfileInfo;
}
--
Gitblit v1.8.0