From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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 f90165d..4b1534d 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,15 @@
package com.java110.core.client;
+import com.alibaba.fastjson.JSONObject;
import com.aliyun.oss.OSSClient;
-import com.java110.utils.cache.MappingCache;
+import com.java110.core.factory.LogFactory;
+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 org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@@ -43,6 +46,7 @@
OSSClient ossClient = null;
ByteArrayInputStream is = null;
String urlPath = "";
+ String resMsg = "涓婁紶鎴愬姛";
try {
ossClient = OSSUtil.getOSSClient();
fileName = UUID.randomUUID().toString();
@@ -65,10 +69,11 @@
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("涓婁紶鏂囦欢澶辫触");
+ resMsg = e.getMessage()+e.getLocalizedMessage();
+ throw new IllegalArgumentException("涓婁紶鏂囦欢澶辫触" + e.getMessage());
} finally {
if (is != null) {
try {
@@ -77,6 +82,9 @@
e.printStackTrace();
}
}
+
+ LogFactory.saveOutLog("OSS", "鏂囦欢", new ResponseEntity(resMsg, HttpStatus.OK));
+
}
return urlPath;
}
@@ -111,6 +119,19 @@
return fileName;
}
+ public String upload(InputStream inputStream, String ftpPath) {
+ OSSClient ossClient = null;
+ try {
+ ossClient = OSSUtil.getOSSClient();
+ OSSUtil.uploadByInputStream(ossClient, inputStream, ftpPath);
+ } catch (Exception e) {
+ // logger.error("涓婁紶鏂囦欢澶辫触", e);
+ throw new IllegalArgumentException("涓婁紶鏂囦欢澶辫触");
+ } finally {
+ }
+ return ftpPath;
+ }
+
/*
*鏂囦欢涓嬭浇宸ュ叿鏂规硶
*/
@@ -122,7 +143,7 @@
ByteArrayInputStream fis = null;
try {
ossClient = OSSUtil.getOSSClient();
- OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
+ ins = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
byteOut = new ByteArrayOutputStream();
byte[] buf = new byte[2048];
int bufsize = 0;
@@ -241,4 +262,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