From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java b/java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java
index 3c504c6..f06584f 100755
--- a/java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java
+++ b/java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java
@@ -1,12 +1,11 @@
package com.java110.core.client;
import com.aliyun.oss.OSSClient;
-import com.java110.utils.cache.MappingCache;
+import com.java110.core.log.LoggerFactory;
import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.OSSUtil;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@@ -65,7 +64,7 @@
byte[] context = Base64Convert.base64ToByte(imageBase64);
is = new ByteArrayInputStream(context);
- OSSUtil.uploadByInputStream(ossClient, is, ftpPath + urlPath);
+ OSSUtil.uploadByInputStream(ossClient, is, ftpPath + urlPath);
} catch (Exception e) {
logger.error("涓婁紶鏂囦欢澶辫触", e);
throw new IllegalArgumentException("涓婁紶鏂囦欢澶辫触");
@@ -111,8 +110,7 @@
return fileName;
}
- public String upload(InputStream inputStream, String ftpPath) {
- String fileName = "";
+ public String upload(InputStream inputStream, String ftpPath) {
OSSClient ossClient = null;
try {
ossClient = OSSUtil.getOSSClient();
@@ -122,7 +120,7 @@
throw new IllegalArgumentException("涓婁紶鏂囦欢澶辫触");
} finally {
}
- return fileName;
+ return ftpPath;
}
/*
@@ -255,4 +253,20 @@
return null;
}
+
+ public InputStream download(String fileName) {
+ OSSClient ossClient = null;
+ InputStream is = null;
+ try {
+ ossClient = OSSUtil.getOSSClient();
+ is = OSSUtil.getInputStreamByOSS(ossClient, fileName);
+ if (null == is) {
+ throw new FileNotFoundException(fileName);
+ }
+ } catch (Exception e) {
+ logger.error("ftp閫氳繃鏂囦欢鍚嶇О鑾峰彇杩滅▼鏂囦欢娴�", e);
+ }
+ return is;
+ }
+
}
--
Gitblit v1.8.0