From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
index b905dc2..bf407ec 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
@@ -14,7 +14,7 @@
import com.stylefeng.guns.modular.system.service.ITVersionManagementService;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.HashMap;
@@ -37,18 +38,24 @@
@Controller
@RequestMapping("/tVersionManagement")
public class TVersionManagementController extends BaseController {
-
+
private String PREFIX = "/system/tVersionManagement/";
-
+
@Autowired
private ITVersionManagementService tVersionManagementService;
-
+
@Autowired
private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
-
+
+ @Autowired
+ private QianYunTongConfig qianYunTongConfig;
+
/**
* 跳转到版本管理首页
*/
@@ -99,13 +106,13 @@
String version) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroExtUtil.getUser().getRoleType() != 1) {
+ if (shiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
} else {
page.setRecords(tVersionManagementService.getVersionList(page, beginTime, endTime, version));
@@ -127,7 +134,7 @@
Map<String, Object> m = new HashMap<>();
try {
String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(myfile.getOriginalFilename());
- String bucketName = QianYunTongProperties.bucketName;
+ String bucketName = qianYunTongConfig.getBucketName();
Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
if (null == grjyTest) {
//创建桶
@@ -148,7 +155,7 @@
if (null == object) {
throw new RuntimeException("上传图片失败");
}
- m.put("imgUrl", "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key);
+ m.put("imgUrl", "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.7.1