'修改依赖'

zzjs-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java

@@ -12,17 +12,8 @@ import com.miaxis.common.utils.StringUtils;
 import com.miaxis.common.utils.file.FileUtils;
 import com.miaxis.file.domain.FileInfo;
 import com.miaxis.file.service.IFileInfoService;
-import com.miaxis.framework.config.ServerConfig;
 import com.qcloud.cos.COSClient;
-import com.qcloud.cos.ClientConfig;
-import com.qcloud.cos.auth.BasicCOSCredentials;
-import com.qcloud.cos.auth.COSCredentials;
 import com.qcloud.cos.model.PutObjectRequest;
-import com.qcloud.cos.model.PutObjectResult;
-import com.qcloud.cos.region.Region;
-import com.qcloud.vod.VodUploadClient;
-import com.qcloud.vod.model.VodUploadRequest;
-import com.qcloud.vod.model.VodUploadResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,11 +27,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.IOException;
 import java.util.Calendar;
 
 /**
@@ -57,8 +46,8 @@ public class CommonController
     @Autowired
     private IFileInfoService fileInfoService;
 
-    @Resource
-    private VodUploadClient vodUploadClient;
+//    @Resource
+//    private VodUploadClient vodUploadClient;
 
     @Value("${cos.bucketName}")
     private String bucketName;
@@ -116,21 +105,12 @@ public class CommonController
         FileInfo fileInfo = new FileInfo();
 
         //如果是学车视频 ，则调用vod上传
-        if (fileUploadTypeEnum.equals(FileUploadTypeEnum.STUDY_MOVIE) ){
-            VodUploadRequest request = new VodUploadRequest();
-            request.setMediaFilePath(localFile.getAbsolutePath());
-            VodUploadResponse response = vodUploadClient.upload("ap-guangzhou", request);
-            fileInfo.setFileType(fileUploadTypeEnum.getFileType());
-            fileInfo.setFilePath(response.getFileId());
-            fileInfo.setFileUrl(response.getMediaUrl());
-        }else{
-            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
-            cosClient.putObject(putObjectRequest);
-            String fileUrl=this.path + putObjectRequest.getKey();
-            fileInfo.setFileType(fileUploadTypeEnum.getFileType());
-            fileInfo.setFilePath(key);
-            fileInfo.setFileUrl(fileUrl);
-        }
+        PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
+        cosClient.putObject(putObjectRequest);
+        String fileUrl=this.path + putObjectRequest.getKey();
+        fileInfo.setFileType(fileUploadTypeEnum.getFileType());
+        fileInfo.setFilePath(key);
+        fileInfo.setFileUrl(fileUrl);
         if (!StringUtils.isEmpty(remark)){
             fileInfo.setRemark(remark);
         }

zzjs-admin/src/test/java/com/miaxis/test/CvmTest.java

@@ -1,40 +0,0 @@
-package com.miaxis.test;
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.ZzjsApplication;
-import com.qcloud.vod.VodUploadClient;
-import com.qcloud.vod.model.VodUploadRequest;
-import com.qcloud.vod.model.VodUploadResponse;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-
-@SpringBootTest(classes = ZzjsApplication.class)
-@RunWith(SpringRunner.class)
-public class CvmTest {
-
-    @Resource
-    private VodUploadClient vodUploadClient;
-
-
-    /**
-     * 获取微信小程序token
-     */
-    @Test
-    public void upload() throws Exception {
-        VodUploadRequest request = new VodUploadRequest();
-        request.setMediaFilePath("E:\\111.mp4");
-        request.setProcedure("LongVideoPreset");
-        VodUploadResponse response = vodUploadClient.upload("ap-guangzhou", request);
-        System.out.println(JSONObject.toJSON(response));
-
-    }
-
-
-
-
-
-}

zzjs-common/pom.xml

@@ -152,19 +152,19 @@
             <version>5.6.38</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.qcloud</groupId>
-            <artifactId>vod_api</artifactId>
-            <version>2.1.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.tencentcloudapi</groupId>
-            <artifactId>tencentcloud-sdk-java</artifactId>
-            <!-- go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. -->
-            <!-- 请到https://search.maven.org/search?q=tencentcloud-sdk-java查询所有版本，最新版本如下 -->
-            <version>3.1.296</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.qcloud</groupId>-->
+            <!--<artifactId>vod_api</artifactId>-->
+            <!--<version>2.1.4</version>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>com.tencentcloudapi</groupId>-->
+            <!--<artifactId>tencentcloud-sdk-java</artifactId>-->
+            <!--&lt;!&ndash; go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. &ndash;&gt;-->
+            <!--&lt;!&ndash; 请到https://search.maven.org/search?q=tencentcloud-sdk-java查询所有版本，最新版本如下 &ndash;&gt;-->
+            <!--<version>3.1.296</version>-->
+        <!--</dependency>-->
 
 
         <!-- swagger2-->

zzjs-common/src/main/java/com/miaxis/common/config/BeanConfig.java

@@ -7,12 +7,6 @@ import com.qcloud.cos.auth.BasicCOSCredentials;
 import com.qcloud.cos.auth.COSCredentials;
 import com.qcloud.cos.http.HttpProtocol;
 import com.qcloud.cos.region.Region;
-import com.qcloud.vod.VodUploadClient;
-import com.tencentcloudapi.common.Credential;
-import com.tencentcloudapi.common.profile.ClientProfile;
-import com.tencentcloudapi.common.profile.HttpProfile;
-import com.tencentcloudapi.common.profile.Language;
-import com.tencentcloudapi.cvm.v20170312.CvmClient;
 import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
 import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
 import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Validator;
@@ -76,11 +70,11 @@ public class BeanConfig {
      * @return
      */
 
-    @Bean
-    public VodUploadClient vodUploadClienConfigBean() {
-        VodUploadClient client = new VodUploadClient(secretId, secretKey);
-        return client;
-    }
+//    @Bean
+//    public VodUploadClient vodUploadClienConfigBean() {
+//        VodUploadClient client = new VodUploadClient(secretId, secretKey);
+//        return client;
+//    }
 
 
     /**