From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
index 461ff1f..c7f3e67 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -5,6 +5,7 @@
import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.util.ObsUploadUtil;
+import com.stylefeng.guns.modular.system.util.OBSUploadUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +67,7 @@
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
if (file.getSize() != 0) {
- ossUpload = OssUploadUtil.ossUpload(request, file);
+ ossUpload = OBSUploadUtil.inputStreamUpload(file);
// ossUpload = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), file);
m.put("imgUrl", ossUpload);
}
@@ -83,7 +84,7 @@
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
MultipartFile file = (MultipartFile) picture;
- String pictureName = OssUploadUtil.ossUpload(request, file);
+ String pictureName = OBSUploadUtil.inputStreamUpload(file);
// String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
return pictureName;
} catch (IOException e1) {
@@ -125,7 +126,7 @@
// 文件全路径
//pictureName = gunsProperties.getPictureServerAddress() + pictureName;
// pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
- pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
+ pictureName = OBSUploadUtil.inputStreamUpload(picture);
String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
if (callback == null) {
--
Gitblit v1.7.1