From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug
---
java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 8095074..0f87d3a
--- 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,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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@@ -63,7 +64,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 +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, ftpPath);
+ OSSUtil.uploadByInputStream(ossClient, is, ftpPath + fileName);
} catch (Exception e) {
// logger.error("涓婁紶鏂囦欢澶辫触", e);
throw new IllegalArgumentException("涓婁紶鏂囦欢澶辫触");
@@ -185,7 +188,7 @@
ByteArrayInputStream fis = null;
try {
ossClient = OSSUtil.getOSSClient();
- is = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
+ is = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
if (null == is) {
throw new FileNotFoundException(remotePath);
}
--
Gitblit v1.8.0