修改bug

Pu Zhibing

2 天以前 a3698ecb84be4192754d7b2092491e727dbccec7

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java

@@ -2,28 +2,27 @@

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.servlet.http.HttpServletRequest;
import java.io.File;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -106,10 +105,10 @@
            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 +123,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;
    }