From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 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 b61d381..fd926ce 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
@@ -2,28 +2,28 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.heredata.hos.model.bucket.Bucket;
import com.stylefeng.guns.config.properties.GunsProperties;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.log.LogObjectHolder;
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.OssUploadUtil;
-import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.ui.Model;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.modular.system.model.TVersionManagement;
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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.io.File;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -38,18 +38,21 @@
@Controller
@RequestMapping("/tVersionManagement")
public class TVersionManagementController extends BaseController {
-
+
private String PREFIX = "/system/tVersionManagement/";
-
+
@Autowired
private ITVersionManagementService tVersionManagementService;
-
+
@Autowired
private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
-
+
/**
* 跳转到版本管理首页
*/
@@ -100,16 +103,16 @@
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 (ShiroKit.getUser().getRoleType() != 1){
+ if (shiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
- }else{
- page.setRecords(tVersionManagementService.getVersionList(page,beginTime,endTime,version));
+ } else {
+ page.setRecords(tVersionManagementService.getVersionList(page, beginTime, endTime, version));
}
return super.packForBT(page);
}
@@ -124,26 +127,41 @@
*/
@ResponseBody
@RequestMapping("/saveApk")
- public Map<String, Object> saveApk(@RequestPart("myfile") MultipartFile myfile, HttpServletRequest request){
+ 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);
+ try {
+ String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(myfile.getOriginalFilename());
+ String bucketName = QianYunTongProperties.bucketName;
+ Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
+ if (null == grjyTest) {
+ //创建桶
+ Boolean bucket = NCOSSUtil.createBucket(bucketName);
+ if (!bucket) {
+ throw new RuntimeException("创建存储桶失败");
+ }
+ //设置桶策略
+ String policyText = "{\"Version\":\"2025-06-23\",\"Statement\":[{\"Sid\":\"Stmt20250623\",\"Action\":[\"GetObject\"],\"Effect\":\"Allow\",\"Resource\":\"" + bucketName + "/*\",\"Principal\":\"*\"}]}";
+ Boolean bucketPolicy = NCOSSUtil.setBucketPolicy(bucketName, policyText);
+ if (!bucketPolicy) {
+ throw new RuntimeException("设置桶策略失败");
+ }
+ }
+ //上传对象
+ String key = "apk/" + pictureName;
+ String object = NCOSSUtil.putObject(bucketName, key, myfile.getInputStream());
+ if (null == object) {
+ throw new RuntimeException("上传图片失败");
+ }
+ m.put("imgUrl", "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key);
} catch (Exception e) {
e.printStackTrace();
- }*/
- try {
- String pictureName = OssUploadUtil.ossUpload(request, myfile);
- m.put("imgUrl", pictureName);
- }catch (Exception e){
- e.printStackTrace();
}
+// try {
+// String pictureName = OssUploadUtil.ossUpload(request, myfile);
+// m.put("imgUrl", pictureName);
+// }catch (Exception e){
+// e.printStackTrace();
+// }
return m;
}
--
Gitblit v1.7.1