Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

9 天以前 ef6a71053515543ed2fd3fddeec7c7f7c32884ec

 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 + "'}";