From 0ad75f90e6464b95bef06c88227f521c5c03d41d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 06 五月 2023 16:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
index ea492a3..ea61e95 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
@@ -3,7 +3,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil ;
+import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -11,7 +13,9 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import com.alibaba.fastjson.JSON;
-
+
+import java.io.InputStream;
+
@Controller
public class UediterController {
/*@RequestMapping("/config")
@@ -103,7 +107,11 @@
String pictureName = "";
try {
//文件上传，具体根据实际替换
- pictureName = OssUploadUtil.ossUpload(request, picture);
+ InputStream inputStream = picture.getInputStream();
+ String name = picture.getOriginalFilename();
+ name = UUIDUtil.getRandomCode() + name.substring(name.lastIndexOf("."));
+ pictureName = OBSUtil.putObjectToBucket(inputStream, name);
+// pictureName = OssUploadUtil.ossUpload(request, picture);
String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
if (callback == null) {
--
Gitblit v1.7.1