From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
index 65a54fd..23d2f9b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
@@ -9,6 +9,7 @@
 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.util.GoogleCloudStorageUtil;
 import com.stylefeng.guns.modular.system.util.OBSUploadUtil;
 import com.stylefeng.guns.modular.system.util.OssUploadUtil;
 import org.springframework.beans.factory.annotation.Value;
@@ -120,23 +121,8 @@
     @RequestMapping("/saveApk")
     public Map<String, Object> saveApk(@RequestPart("myfile") MultipartFile myfile, HttpServletRequest request){
         Map<String, Object> m = new HashMap<>();
-        /*try {
-            String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
-            try {
-                String fileSavePath = gunsProperties.getFileUploadPath()+"apk\\";
-                file.transferTo(new File(fileSavePath + pictureName));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            m.put("imgUrl", gunsProperties.getPictureServerAddress()+"apk/"+pictureName);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }*/
         try {
-            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-            MultipartFile file = (MultipartFile) myfile;
-
-            String pictureName = OBSUploadUtil.inputStreamUpload(file);
+            String pictureName = GoogleCloudStorageUtil.upload(myfile);
             m.put("imgUrl", pictureName);
         }catch (Exception e){
             e.printStackTrace();

--
Gitblit v1.7.1