配置优化

fs-service-system/src/main/java/com/fs/config/cloud/CloudHostProper.java

@@ -0,0 +1,12 @@
+package com.fs.config.cloud;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+public class CloudHostProper {
+    @Value("${cloud_host.company_name}")
+    private String companyName;
+}

fs-service-system/src/main/java/com/fs/config/tencent/TencentCOSClientConfig.java

@@ -0,0 +1,27 @@
+package com.fs.config.tencent;
+
+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.region.Region;
+import lombok.AllArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component
+@AllArgsConstructor
+public class TencentCOSClientConfig {
+    private final TencentProperties tencentProperties;
+
+    @Bean
+    private COSClient createClient() {
+        // 初始化用户身份信息(secretId, secretKey)
+        COSCredentials cred = new BasicCOSCredentials(tencentProperties.secretId, tencentProperties.secretKey);
+        // 设置bucket的区域, COS地域的简称请参照 https://www.qcloud.com/document/product/436/6224
+        ClientConfig clientConfig = new ClientConfig(new Region(tencentProperties.region));
+        // 生成cos客户端
+        return new COSClient(cred, clientConfig);
+    }
+
+}

fs-service-system/src/main/java/com/fs/config/tencent/TencentProperties.java

@@ -0,0 +1,22 @@
+package com.fs.config.tencent;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+public class TencentProperties {
+    @Value("${tencent_cloud_config.secret_id}")
+    public String secretId;
+    @Value("${tencent_cloud_config.secret_key}")
+    public String secretKey;
+    @Value("${tencent_cloud_config.bucket}")
+    public String bucket;
+    @Value("${tencent_cloud_config.app_id}")
+    public String appId;
+    @Value("${tencent_cloud_config.region}")
+    public String region;
+    @Value("${tencent_cloud_config.proxy}")
+    public String proxy;
+}

fs-service-system/src/main/java/com/fs/course/service/ITencentCloudCosService.java

@@ -3,7 +3,6 @@ package com.fs.course.service;
 import com.fs.common.core.domain.R;
 
 public interface ITencentCloudCosService {
-    R getTmpSecretKey();
 
     R getKeyAndCredentials();
 

fs-service-system/src/main/java/com/fs/course/service/impl/TencentCloudCosService.java

@@ -1,29 +1,25 @@
 package com.fs.course.service.impl;
 
 import com.fs.common.core.domain.R;
+import com.fs.config.tencent.TencentProperties;
 import com.fs.course.domain.FsUserCourseVideo;
 import com.fs.course.mapper.FsUserCourseVideoMapper;
 import com.fs.course.service.ITencentCloudCosService;
 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.exception.CosClientException;
 import com.qcloud.cos.exception.CosServiceException;
 import com.qcloud.cos.model.COSObject;
 import com.qcloud.cos.model.GetObjectRequest;
-import com.qcloud.cos.region.Region;
 import com.qcloud.cos.utils.IOUtils;
 import com.tencent.cloud.CosStsClient;
-import com.tencent.cloud.Policy;
 import com.tencent.cloud.Response;
-import com.tencent.cloud.Statement;
 import com.tencent.cloud.cos.util.Jackson;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.profile.ClientProfile;
 import com.tencentcloudapi.common.profile.HttpProfile;
 import com.tencentcloudapi.mps.v20190612.MpsClient;
 import com.tencentcloudapi.mps.v20190612.models.*;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,115 +30,11 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
+@AllArgsConstructor
 public class TencentCloudCosService implements ITencentCloudCosService {
-    private static final String RT_SECRET_ID = "AKIDCj7NSNAovtqeJpBau8GZ4CGB71thXIxX";
-    private static final String RT_SECRET_KEY = "lTB5zwqqz7CNhzDOWivFWedgfTBgxgBT";
-    private static final String RT_BUCKET = "fs-1319721001";
-    private static final String RT_APP_ID = "1319721001";
-    private static final String RT_REGION = "ap-chongqing";
-    private static final String RT_PROXY = "fs";
-
-
-    private static final String YL_SECRET_ID = "AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT";
-    private static final String YL_SECRET_KEY = "u5SuS80342xzx8FRBukza9lVNHKNMSaB";
-    private static final String YL_BUCKET = "fby-1323137866";
-    private static final String YL_APP_ID = "1323137866";
-    private static final String YL_REGION = "ap-chongqing";
-    private static final String YL_PROXY = "fby";
-    @Override
-    public R getTmpSecretKey() {
-        TreeMap<String, Object> config = new TreeMap<String, Object>();
-        try {
-            //这里的 SecretId 和 SecretKey 代表了用于申请临时密钥的永久身份（主账号、子账号等），子账号需要具有操作存储桶的权限。
-            String secretId = "AKIDCj7NSNAovtqeJpBau8GZ4CGB71thXIxX";//用户的 SecretId，建议使用子账号密钥，授权遵循最小权限指引，降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
-            String secretKey = "lTB5zwqqz7CNhzDOWivFWedgfTBgxgBT";//用户的 SecretKey，建议使用子账号密钥，授权遵循最小权限指引，降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
-            String bucket = "fs-1319721001";
-            String appId = "1319721001";
-            String region = "ap-chongqing";
-            String proxy  = "fs";
-            int durationSeconds = 1800;
-
-            // 替换为您的云 api 密钥 SecretId
-            config.put("secretId", secretId);
-            // 替换为您的云 api 密钥 SecretKey
-            config.put("secretKey", secretKey);
-
-            // 初始化 policy
-            Policy policy = new Policy();
-
-            // 设置域名:
-            // 如果您使用了腾讯云 cvm，可以设置内部域名
-            config.put("host", "https://cos.his.cdwjyyh.com");
-
-            // 临时密钥有效时长，单位是秒，默认 1800 秒，目前主账号最长 2 小时（即 7200 秒），子账号最长 36 小时（即 129600）秒
-            config.put("durationSeconds", durationSeconds);
-            // 换成您的 bucket
-            config.put("bucket", bucket);
-            // 换成 bucket 所在地区
-            config.put("region", region);
-
-            // 开始构建一条 statement
-            Statement statement = new Statement();
-            // 声明设置的结果是允许操作
-            statement.setEffect("allow");
-            /**
-             * 密钥的权限列表。必须在这里指定本次临时密钥所需要的权限。
-             * 权限列表请参见 https://cloud.tencent.com/document/product/436/31923
-             * 规则为 {project}:{interfaceName}
-             * project : 产品缩写  cos相关授权为值为cos,数据万象(数据处理)相关授权值为ci
-             * 授权所有接口用*表示，例如 cos:*,ci:*
-             * 添加一批操作权限 :
-             */
-            statement.addActions(new String[]{
-                    "cos:PutObject",
-                    // 表单上传、小程序上传
-                    "cos:PostObject",
-                    // 分块上传
-                    "cos:InitiateMultipartUpload",
-                    "cos:ListMultipartUploads",
-                    "cos:ListParts",
-                    "cos:UploadPart",
-                    "cos:CompleteMultipartUpload",
-                    // 处理相关接口一般为数据万象产品 权限中以ci开头
-                    // 创建媒体处理任务
-                    "ci:CreateMediaJobs",
-                    // 文件压缩
-                    "ci:CreateFileProcessJobs"
-            });
-
-            /**
-             * 这里改成允许的路径前缀，可以根据自己网站的用户登录态判断允许上传的具体路径
-             * 资源表达式规则分对象存储(cos)和数据万象(ci)两种
-             * 数据处理、审核相关接口需要授予ci资源权限
-             *  cos : qcs::cos:{region}:uid/{appid}:{bucket}/{path}
-             *  ci  : qcs::ci:{region}:uid/{appid}:bucket/{bucket}/{path}
-             * 列举几种典型的{path}授权场景：
-             * 1、允许访问所有对象："*"
-             * 2、允许访问指定的对象："a/a1.txt", "b/b1.txt"
-             * 3、允许访问指定前缀的对象："a*", "a/*", "b/*"
-             *  如果填写了“*”，将允许用户访问所有资源；除非业务需要，否则请按照最小权限原则授予用户相应的访问权限范围。
-             *
-             * 示例：授权examplebucket-1250000000 bucket目录下的所有资源给cos和ci 授权两条Resource
-             */
-            statement.addResources(new String[]{
-                    "qcs::cos:" + region + ":uid/" + appId + ':' + bucket + "/*" });
-
-            // 把一条 statement 添加到 policy
-            // 可以添加多条
-            policy.addStatement(statement);
-            // 将 Policy 示例转化成 String，可以使用任何 json 转化方式，这里是本 SDK 自带的推荐方式
-            config.put("policy", Jackson.toJsonPrettyString(policy));
+    private final COSClient cosClient;
+    private final TencentProperties tencentProperties;
 
-            Response response = CosStsClient.getCredential(config);
-            System.out.println(response.credentials.tmpSecretId);
-            System.out.println(response.credentials.tmpSecretKey);
-            System.out.println(response.credentials.sessionToken);
-            return R.ok().put("data",response);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new IllegalArgumentException("no valid secret !");
-        }
-    }
 
     @Override
     public R getKeyAndCredentials() {
@@ -160,7 +52,7 @@ public class TencentCloudCosService implements ITencentCloudCosService {
         }
     }
 
-    public static String generateCosKey(String ext) {
+    public String generateCosKey(String ext) {
         Date date = new Date();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
         String ymd = dateFormat.format(date);
@@ -175,15 +67,15 @@ public class TencentCloudCosService implements ITencentCloudCosService {
 
     public TreeMap<String,Object> getConfig(){
 
-        String secretId = YL_SECRET_ID;//用户的 SecretId，建议使用子账号密钥，授权遵循最小权限指引，降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
-        String secretKey = YL_SECRET_KEY; ;//用户的 SecretKey，建议使用子账号密钥，授权遵循最小权限指引，降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
+        String secretId = tencentProperties.secretId;//用户的 SecretId，建议使用子账号密钥，授权遵循最小权限指引，降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
+        String secretKey = tencentProperties.secretKey; ;//用户的 SecretKey，建议使用子账号密钥，授权遵循最小权限指引，降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
 
 //          String  secretId = YL_SECRET_ID;
 //            String  secretKey = YL_SECRET_KEY;
-        String bucket = YL_BUCKET;
-        String appId = YL_APP_ID;
-        String region = YL_REGION;
-        String proxy = YL_PROXY;
+        String bucket = tencentProperties.bucket;
+        String appId = tencentProperties.appId;
+        String region = tencentProperties.region;
+        String proxy = tencentProperties.proxy;
 
 
         int durationSeconds = 1800;
@@ -284,22 +176,9 @@ public class TencentCloudCosService implements ITencentCloudCosService {
 
     }
 
-    private static COSClient cosClient = createClient();
-
-    private static COSClient createClient() {
-        // 初始化用户身份信息(secretId, secretKey)
-        COSCredentials cred = new BasicCOSCredentials(YL_SECRET_ID,YL_SECRET_KEY);
-        // 设置bucket的区域, COS地域的简称请参照 https://www.qcloud.com/document/product/436/6224
-        ClientConfig clientConfig = new ClientConfig(new Region(YL_REGION));
-        // 生成cos客户端
-        COSClient cosclient = new COSClient(cred, clientConfig);
-
-        return cosclient;
-    }
-
-    private static byte[] getObjectInputStream() throws IOException {
+    private byte[] getObjectInputStream() throws IOException {
         String key = "test/my_test.json";
-        GetObjectRequest getObjectRequest = new GetObjectRequest(YL_BUCKET, key);
+        GetObjectRequest getObjectRequest = new GetObjectRequest(tencentProperties.bucket, key);
         InputStream cosObjectInput = null;
 
         try {
@@ -349,28 +228,28 @@ public class TencentCloudCosService implements ITencentCloudCosService {
         return R.ok();
     }
 
-    private static MpsClient createMpsClient() {
-        Credential cred = new Credential(YL_SECRET_ID, YL_SECRET_KEY);
+    private MpsClient createMpsClient() {
+        Credential cred = new Credential(tencentProperties.secretId, tencentProperties.secretKey);
         HttpProfile httpProfile = new HttpProfile();
         httpProfile.setEndpoint("mps.tencentcloudapi.com");
         ClientProfile clientProfile = new ClientProfile();
         clientProfile.setHttpProfile(httpProfile);
-        return new MpsClient(cred, YL_REGION, clientProfile);
+        return new MpsClient(cred, tencentProperties.region, clientProfile);
     }
-    public static String replaceCourse(String input) {
+    public String replaceCourse(String input) {
         if (input == null) {
             return null;
         }
         return input.replace("course", "course_transcode_100301");
     }
 
-    public static void submitTranscodeJob(String inputPath,String outputPath) {
+    public void submitTranscodeJob(String inputPath,String outputPath) {
         try {
             // 输入文件配置（COS路径）
             MpsClient client = createMpsClient();
             CosInputInfo cosInputInfo = new CosInputInfo();
-            cosInputInfo.setBucket(YL_BUCKET);
-            cosInputInfo.setRegion(YL_REGION);
+            cosInputInfo.setBucket(tencentProperties.bucket);
+            cosInputInfo.setRegion(tencentProperties.region);
             //文件key
             cosInputInfo.setObject(inputPath);
 
@@ -382,8 +261,8 @@ public class TencentCloudCosService implements ITencentCloudCosService {
 
             // 输出配置
             CosOutputStorage cosOutputStorage = new CosOutputStorage();
-            cosOutputStorage.setBucket(YL_BUCKET);
-            cosOutputStorage.setRegion(YL_REGION);
+            cosOutputStorage.setBucket(tencentProperties.bucket);
+            cosOutputStorage.setRegion(tencentProperties.region);
 
             TaskOutputStorage taskOutputStorage = new TaskOutputStorage();
             taskOutputStorage.setType("COS");

fs-service-system/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -9,6 +9,7 @@ import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyConfigService;
 import com.fs.company.service.ICompanyUserService;
 import com.fs.company.vo.OptionVO;
+import com.fs.config.cloud.CloudHostProper;
 import com.fs.his.config.FsSysConfig;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.qw.domain.QwCompany;
@@ -78,6 +79,8 @@ public class QwUserServiceImpl implements IQwUserService
     @Autowired
     private ConfigUtil configUtil;
 
+    @Autowired
+    CloudHostProper cloudHostProper;
     @Autowired
     private QwWorkTaskMapper qwWorkTaskMapper;
     @Autowired
@@ -314,7 +317,7 @@ public class QwUserServiceImpl implements IQwUserService
 
         qwUserVOS.setIsBind(1);
         qwUserVOS.setAppKey(appKey);
-        qwUserVOS.setCompany("rt");
+        qwUserVOS.setCompany(cloudHostProper.getCompanyName());
 
         String body = HttpRequest.post("http://watch.ylrzcloud.com/prod-api/server/bind")
                 .body(JSON.toJSONString(qwUserVOS), "application/json;charset=UTF-8")

fs-service-system/src/main/resources/application-config-dev.yml

@@ -111,8 +111,12 @@ jpush:
 aifabu:  #爱链接
   appKey: 7b471be905ab17e00f3b858c6710dd117601d008
 
-
-
-
-
-
+tencent_cloud_config:
+  secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
+  secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
+  bucket: 1323137866
+  app_id: 1323137866
+  region: chongqing
+  proxy: hzyy
+cloud_host:
+  company_name: 润天