From fe3b0f4a3c46892f08421dd4c4d0937fb8a87f93 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 06 六月 2023 17:55:10 +0800
Subject: [PATCH] 优化代码
---
java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 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
old mode 100644
new mode 100755
index a270962..f06584f
--- 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,11 +1,11 @@
package com.java110.core.client;
import com.aliyun.oss.OSSClient;
+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.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@@ -63,7 +63,8 @@
urlPath = IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
byte[] context = Base64Convert.base64ToByte(imageBase64);
is = new ByteArrayInputStream(context);
- OSSUtil.uploadByInputStream(ossClient, is, "java110", ftpPath + urlPath);
+
+ OSSUtil.uploadByInputStream(ossClient, is, ftpPath + urlPath);
} catch (Exception e) {
logger.error("涓婁紶鏂囦欢澶辫触", e);
throw new IllegalArgumentException("涓婁紶鏂囦欢澶辫触");
@@ -91,8 +92,9 @@
try {
ossClient = OSSUtil.getOSSClient();
fileName = UUID.randomUUID().toString() + "." + uploadFile.getOriginalFilename().substring(uploadFile.getOriginalFilename().lastIndexOf(".") + 1);
+ fileName = IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
is = uploadFile.getInputStream();
- OSSUtil.uploadByInputStream(ossClient, is, "java110", ftpPath);
+ OSSUtil.uploadByInputStream(ossClient, is, ftpPath + fileName);
} catch (Exception e) {
// logger.error("涓婁紶鏂囦欢澶辫触", e);
throw new IllegalArgumentException("涓婁紶鏂囦欢澶辫触");
@@ -108,6 +110,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;
+ }
+
/*
*鏂囦欢涓嬭浇宸ュ叿鏂规硶
*/
@@ -119,7 +134,7 @@
ByteArrayInputStream fis = null;
try {
ossClient = OSSUtil.getOSSClient();
- OSSUtil.getInputStreamByOSS(ossClient, "java110", remotePath + fileName);
+ ins = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
byteOut = new ByteArrayOutputStream();
byte[] buf = new byte[2048];
int bufsize = 0;
@@ -185,7 +200,7 @@
ByteArrayInputStream fis = null;
try {
ossClient = OSSUtil.getOSSClient();
- is = OSSUtil.getInputStreamByOSS(ossClient, "java110", remotePath + fileName);
+ is = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
if (null == is) {
throw new FileNotFoundException(remotePath);
}
@@ -238,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