From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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 146c90f..0a209d5
--- 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,13 +1,12 @@
package com.java110.core.client;
import com.aliyun.oss.OSSClient;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.OSSUtil;
-import org.apache.commons.net.ftp.FTP;
-import org.apache.commons.net.ftp.FTPClient;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@@ -43,10 +42,10 @@
String fileName = "";
OSSClient ossClient = null;
ByteArrayInputStream is = null;
+ String urlPath = "";
try {
ossClient = OSSUtil.getOSSClient();
fileName = UUID.randomUUID().toString();
- ftpPath = ftpPath + IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
if (imageBase64.contains("data:image/png;base64,")) {
imageBase64 = imageBase64.replace("data:image/png;base64,", "");
fileName += ".png";
@@ -62,10 +61,11 @@
} else {
fileName += ".jpg";
}
-
+ urlPath = IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
byte[] context = Base64Convert.base64ToByte(imageBase64);
is = new ByteArrayInputStream(context);
- OSSUtil.uploadByInputStream(ossClient, is, "java110", ftpPath);
+
+ OSSUtil.uploadByInputStream(ossClient, is, ftpPath + urlPath);
} catch (Exception e) {
logger.error("涓婁紶鏂囦欢澶辫触", e);
throw new IllegalArgumentException("涓婁紶鏂囦欢澶辫触");
@@ -78,7 +78,7 @@
}
}
}
- return ftpPath;
+ return urlPath;
}
@@ -93,8 +93,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("涓婁紶鏂囦欢澶辫触");
@@ -121,7 +122,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;
@@ -187,10 +188,7 @@
ByteArrayInputStream fis = null;
try {
ossClient = OSSUtil.getOSSClient();
- String f = new String(
- (remotePath + fileName).getBytes("GBK"),
- FTP.DEFAULT_CONTROL_ENCODING);
- is = OSSUtil.getInputStreamByOSS(ossClient, "java110", remotePath + fileName);
+ is = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
if (null == is) {
throw new FileNotFoundException(remotePath);
}
--
Gitblit v1.8.0