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/system/UediterController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
index 97e3140..61cb775 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
@@ -3,6 +3,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+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.stereotype.Controller;
@@ -104,7 +105,7 @@
             String pictureName = "";
             try {
             	//文件上传,具体根据实际替换
-                pictureName = OBSUploadUtil.inputStreamUpload(picture);
+                pictureName = GoogleCloudStorageUtil.upload(picture);
  
                 String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
                 if (callback == null) {

--
Gitblit v1.7.1