Преглед на файлове

Merge remote-tracking branch 'origin/master'

zx преди 3 седмици
родител
ревизия
e91f726256

+ 0 - 1
fs-common/pom.xml

@@ -126,7 +126,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

+ 4 - 0
fs-company/pom.xml

@@ -71,6 +71,10 @@
             <version>0.4.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <!--        <dependency>-->
 <!--            <groupId>ru.yandex.clickhouse</groupId>-->
 <!--            <artifactId>clickhouse-jdbc</artifactId>-->

+ 5 - 0
fs-qwhook-sop/pom.xml

@@ -61,6 +61,11 @@
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
         <!-- 验证码 -->
         <dependency>
             <groupId>com.github.penggle</groupId>

+ 0 - 1
fs-service/pom.xml

@@ -45,7 +45,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>com.baidu.dev2</groupId>

+ 0 - 12
fs-service/src/main/java/com/fs/config/tencent/TencentProperties.java

@@ -19,16 +19,4 @@ public class TencentProperties {
     public String region;
     @Value("${tencent_cloud_config.proxy}")
     public String proxy;
-    @Value("${tmp_secret_config.secret_id}")
-    public String tempSecretId;
-    @Value("${tmp_secret_config.secret_key}")
-    public String tempSecretKey;
-    @Value("${tmp_secret_config.bucket}")
-    public String tempBucket;
-    @Value("${tmp_secret_config.app_id}")
-    public String tempAppId;
-    @Value("${tmp_secret_config.region}")
-    public String tempRegion;
-    @Value("${tmp_secret_config.proxy}")
-    public String tempProxy;
 }

+ 0 - 1
fs-service/src/main/java/com/fs/course/service/ITencentCloudCosService.java

@@ -7,7 +7,6 @@ import java.io.File;
 import java.io.IOException;
 
 public interface ITencentCloudCosService {
-    R getTmpSecretKey();
 
     R getKeyAndCredentials();
 

+ 0 - 95
fs-service/src/main/java/com/fs/course/service/impl/TencentCloudCosService.java

@@ -37,101 +37,6 @@ public class TencentCloudCosService implements ITencentCloudCosService {
     private final COSClient cosClient;
     private final TencentProperties tencentProperties;
 
-    @Override
-    public R getTmpSecretKey() {
-        TreeMap<String, Object> config = new TreeMap<String, Object>();
-        try {
-            //用户的 SecretId,建议使用子账号密钥,授权遵循最小权限指引,降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
-            String secretId = tencentProperties.tempSecretId;
-            //用户的 SecretKey,建议使用子账号密钥,授权遵循最小权限指引,降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
-            String secretKey = tencentProperties.tempSecretKey;
-            String bucket = tencentProperties.tempBucket;
-            String appId = tencentProperties.tempAppId;
-            String region = tencentProperties.tempRegion;
-            String proxy  = tencentProperties.tempProxy;
-            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));
-
-            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() {

+ 0 - 7
fs-service/src/main/resources/application-config-dev.yml

@@ -61,13 +61,6 @@ tencent_cloud_config:
   app_id: 1323137866
   region: chongqing
   proxy: hzyy
-tmp_secret_config:
-  secret_id: AKIDCj7NSNAovtqeJpBau8GZ4CGB71thXIxX
-  secret_key: lTB5zwqqz7CNhzDOWivFWedgfTBgxgBT
-  bucket: fs-1319721001
-  app_id: 1319721001
-  region: ap-chongqing
-  proxy: fs
 cloud_host:
   company_name: 润天
 

+ 30 - 14
fs-service/src/main/resources/application-config-druid-jz.yml

@@ -8,20 +8,20 @@ logging:
     me.chanjar.weixin: DEBUG
 wx:
   cp:
-    corpId: wwb2a1055fb6c9a7c2
+    corpId: wwb2a10556c9a7c2
     appConfigs:
-      - agentId: 1000005
-        secret: ec7okROXJqkNafq66-L6aKNv0asTzQIG0CYrj3vyBbo
-        token: PPKOdAlCoMO
-        aesKey: PKvaxtpSv8NGpfTDm7VUHIK8Wok2ESyYX24qpXJAdMP
+      - agentId: 100005
+        secret: ec7okROXJqkNafq66aKNv0asTzQIG0CYrj3vyBbo
+        token: PPKOdAloMO
+        aesKey: PKvaxtpSvNGpfTDm7VUHIK8Wok2ESyYX24qpXJAdMP
   pay:
-    appId: wx73f85f8d62769119 #微信公众号或者小程序等的appid
-    mchId: 1611402045 #微信支付商户号
-    mchKey: 8cab128997a3547c1363b0898b877f38 #微信支付商户密钥
+    appId: wx73f85f8d6119 #微信公众号或者小程序等的appid
+    mchId: 1611045 #微信支付商户号
+    mchKey: 8cab128997a3547c10898b877f38 #微信支付商户密钥
     subAppId:  #服务商模式下的子商户公众账号ID
     subMchId:  #服务商模式下的子商户号
     keyPath: c:\\cert\\apiclient_cert.p12 # p12证书的位置,可以指定绝对路径,也可以指定类路径(以classpath:开头)
-    notifyUrl: https://userapp.his.runtzh.com/app/wxpay/wxPayNotify
+    notifyUrl: https://usepp.his.runtzh.com/app/wxpay/wxPayNotify
   mp:
     useRedis: false
     redisConfig:
@@ -29,12 +29,12 @@ wx:
       port: 6379
       timeout: 2000
     configs:
-      - appId: wx894a6220c608f5c1 # 第一个公众号的appid  //公众号名称:成都九州在线互联网医院
-        secret: dabd5168d58c66e97be1ab1eee346b20 # 公众号的appsecret
+      - appId: wx894a622c608f5c1 # 第一个公众号的appid  //公众号名称:成都九州在线互联网医院
+        secret: dabd5168d5866e97b1ab1eee346b20 # 公众号的appsecret
         token: PPKOdAlCoMO # 接口配置里的Token值
-        aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
+        aesKey: Eswa6VjwtVcw03qZy6Wllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
 aifabu:  #爱链接
-  appKey: 7b471be905ab17e00f3b858c6710dd117601d008
+  appKey: 7b471be905ab17ef358c610dd117601d008
 watch:
   watchUrl: watch.ylrzcloud.com/prod-api
 #  account: tcloud
@@ -52,7 +52,23 @@ fs :
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16
-
+# 存储捅配置
+tencent_cloud_config:
+  secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
+  secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
+  bucket: sxjz-1323137866
+  app_id: 1323137866
+  region: ap-chongqing
+  proxy: sxjz
+tmp_secret_config:
+  secret_id: AKIDCj7NSNAovtqeJpBau8GZ4CGB71thXIxX
+  secret_key: lTB5zwqqz7CNhzDOWivFWedgfTBgxgBT
+  bucket: sxjz-1323137866
+  app_id: 1319721001
+  region: ap-chongqing
+  proxy: sxjz
+cloud_host:
+  company_name: 今正
 
 
 

+ 11 - 15
fs-service/src/main/resources/application-druid-jz.yml

@@ -1,19 +1,15 @@
 # 数据源配置
 spring:
-    profiles:
-        include: config-druid-jz,common
     # redis 配置
     redis:
-        # 地址
-        host: 127.0.0.1
-        # 端口,默认为6379
+        host: 172.27.0.13
         port: 6379
         # 数据库索引
         database: 0
         # 密码
-        password:
+        password: Sxdtcbm@#+!2025
         # 连接超时时间
-        timeout: 20s
+        timeout: 10s
         lettuce:
             pool:
                 # 连接池中的最小空闲连接
@@ -28,7 +24,7 @@ spring:
         #        clickhouse:
         #            type: com.alibaba.druid.pool.DruidDataSource
         #            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
-        #            url: jdbc:clickhouse://cc-2vc8zzo26w0l7m2l6.public.clickhouse.ads.aliyuncs.com/sop?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
+        #            url: jdbc:clickhouse://1.14.104.71:8123/sop_test?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
         #            username: rt_2024
         #            password: Yzx_19860213
         #            initialSize: 10
@@ -41,9 +37,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://192.168.0.137:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.27.0.6:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: Ylrztek250218!3@.
+                    password: Sxdtcbm@#+!2025
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -56,7 +52,7 @@ spring:
                 # 最小连接池数量
                 minIdle: 10
                 # 最大连接池数量
-                maxActive: 20
+                maxActive: 2000
                 # 配置获取连接等待超时的时间
                 maxWait: 60000
                 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
@@ -96,15 +92,15 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://192.168.0.137:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.27.0.6:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: Ylrztek250218!3@.
+                    password: Sxdtcbm@#+!2025
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量
                 minIdle: 10
                 # 最大连接池数量
-                maxActive: 20
+                maxActive: 200
                 # 配置获取连接等待超时的时间
                 maxWait: 60000
                 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
@@ -145,6 +141,6 @@ rocketmq:
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
     consumer:
-        group: test-group
+        group: voice-group
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey