From f604f87781d7cdae5571465a3bafffff53313028 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 08:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
index f687a33..59e128e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
@@ -7,11 +7,9 @@
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
+import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
-import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
-import org.springframework.beans.factory.annotation.Value;
+import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
@@ -24,6 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.File;
+import java.io.InputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -43,12 +42,6 @@
@Autowired
private ITVersionManagementService tVersionManagementService;
-
- @Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
/**
* 跳转到版本管理首页
@@ -141,8 +134,11 @@
try {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
MultipartFile file = (MultipartFile) myfile;
-
- String pictureName = OssUploadUtil.ossUpload(request, file);
+ InputStream inputStream = file.getInputStream();
+ String name = file.getOriginalFilename();
+ name = UUIDUtil.getRandomCode() + name.substring(name.lastIndexOf("."));
+ String pictureName = OBSUtil.putObjectToBucket(inputStream, name);
+// String pictureName = OssUploadUtil.ossUpload(request, file);
m.put("imgUrl", pictureName);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1