From 91fcd48801ad1120651027824f7a60a14deadf87 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 08 七月 2025 19:21:21 +0800
Subject: [PATCH] 修改三方对接逻辑和环境参数配置

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
index 5596625..a5d0c65 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -9,7 +9,7 @@
 import com.stylefeng.guns.modular.system.service.ITImgMidService;
 import com.stylefeng.guns.modular.system.util.ResultUtil;
 import com.stylefeng.guns.modular.system.util.qianyuntong.NCOSSUtil;
-import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongProperties;
+import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +36,9 @@
 
     @Autowired
     private GunsProperties gunsProperties;
+    
+    @Autowired
+    private QianYunTongConfig qianYunTongConfig;
 
     /**
      * 上传图片(上传到项目的webapp/static/img)
@@ -70,7 +73,7 @@
             MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
             if (file.getSize() != 0) {
                 String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
-                String bucketName = QianYunTongProperties.bucketName;
+                String bucketName = qianYunTongConfig.getBucketName();
                 Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
                 if (null == grjyTest) {
                     //创建桶
@@ -92,7 +95,7 @@
                     throw new RuntimeException("上传图片失败");
                 }
     
-                ossUpload = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
+                ossUpload = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;
 
 
 //                ossUpload = OssUploadUtil.ossUpload(request, file);
@@ -113,7 +116,7 @@
     public ResultUtil image1(@RequestPart("file") MultipartFile file, HttpServletRequest request) {
         try {
             String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
-            String bucketName = QianYunTongProperties.bucketName;
+            String bucketName = qianYunTongConfig.getBucketName();
             Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
             if (null == grjyTest) {
                 //创建桶
@@ -135,7 +138,7 @@
                 return ResultUtil.error("上传图片失败");
             }
     
-            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
+            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;
 
 //            String pictureName = OssUploadUtil.ossUpload(request, file);
             System.out.println("mediaResp");
@@ -158,7 +161,7 @@
         String suffix = picture.getOriginalFilename().substring(picture.getOriginalFilename().lastIndexOf("."));
         String pictureName = UUID.randomUUID().toString() + suffix;
         try {
-            String bucketName = QianYunTongProperties.bucketName;
+            String bucketName = qianYunTongConfig.getBucketName();
             Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
             if (null == grjyTest) {
                 //创建桶
@@ -180,7 +183,7 @@
                 throw new RuntimeException("上传图片失败");
             }
     
-            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
+            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             throw new GunsException(BizExceptionEnum.UPLOAD_ERROR);
@@ -197,7 +200,7 @@
         try {
             // 上传文件目录
             String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(picture.getOriginalFilename());
-            String bucketName = QianYunTongProperties.bucketName;
+            String bucketName = qianYunTongConfig.getBucketName();
             Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
             if (null == grjyTest) {
                 //创建桶
@@ -219,7 +222,7 @@
                 throw new RuntimeException("上传图片失败");
             }
     
-            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
+            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;
 //            pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
     
             String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";

--
Gitblit v1.7.1