Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openIm

fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -249,6 +249,12 @@ public class FsUserCourseVideoController extends AppBaseController {
         return fsUserCourseVideoService.setWatchCourseTime(collect);
     }
 
+    @GetMapping("/getProjectCode")
+    public R getProjectCode() {
+        return courseLinkService.getProjectCode();
+    }
+
+
     /**
      * 获取跳转微信小程序的链接地址
      */

fs-service/src/main/java/com/fs/course/service/IFsCourseLinkService.java

@@ -94,4 +94,6 @@ public interface IFsCourseLinkService
     String getGotoWxAppLink(String linkStr,String appid);
 
     R getWxaCodeGenerateScheme(String linkStr,String appId);
+
+    R getProjectCode();
 }

fs-service/src/main/java/com/fs/course/service/impl/FsCourseLinkServiceImpl.java

@@ -778,12 +778,12 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
                 //处理参数
                 String query = split[1];
                 query = URLEncoder.encode(query, StandardCharsets.UTF_8.toString());
-                String json = configService.selectConfigByKey("course.config");
-                CourseConfig config = JSON.parseObject(json, CourseConfig.class);
-                String miniprogramAppid = config.getMiniprogramAppid();
-                if (StringUtils.isBlank(miniprogramAppid)) {
-                    return "未配置点播小程序id";
-                }
+//                String json = configService.selectConfigByKey("course.config");
+//                CourseConfig config = JSON.parseObject(json, CourseConfig.class);
+//                String miniprogramAppid = config.getMiniprogramAppid();
+//                if (StringUtils.isBlank(miniprogramAppid)) {
+//                    return "未配置点播小程序id";
+//                }
                 //获取微信token
                 final WxMaService wxService = WxMaConfiguration.getMaService(appId);
                 String token = wxService.getAccessToken();
@@ -913,5 +913,12 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
         return R.ok();
     }
 
-
+    @Override
+    public R getProjectCode() {
+        String code = cloudHostProper.getProjectCode();
+        if (StringUtils.isEmpty(code)){
+            return R.error("项目编号配置不存在！");
+        }
+        return R.ok().put("code",code);
+    }
 }

fs-service/src/main/java/com/fs/utils/FileCacheService.java

@@ -1,5 +1,6 @@
 package com.fs.utils;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -17,15 +18,20 @@ public class FileCacheService {
     @Value("${getTuiFont}")
     private String getTuiFont;
 
+    @Value("${tuiImgCache:0}")
+    private String tuiImgCache;
+
     private byte[] templateBytes;
     private byte[] fontBytes;
 
     @PostConstruct
     public void init() throws IOException {
-        // 缓存模板图片文件
-        this.templateBytes = Files.readAllBytes(Paths.get(getTuiImg));
-        // 缓存字体文件
-        this.fontBytes = Files.readAllBytes(Paths.get(getTuiFont));
+        if(StringUtils.equals("1",tuiImgCache)) {
+            // 缓存模板图片文件
+            this.templateBytes = Files.readAllBytes(Paths.get(getTuiImg));
+            // 缓存字体文件
+            this.fontBytes = Files.readAllBytes(Paths.get(getTuiFont));
+        }
     }
 
     /**

fs-service/src/main/resources/application-common.yml

@@ -138,3 +138,4 @@ image:
   storage:
     local-path: C:\logoFile\logo.jpg
     server-path: C:\logoFile\logo.jpg
+

fs-service/src/main/resources/application-druid-xzt.yml

@@ -144,3 +144,7 @@ openIM:
     userID: imAdmin
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: true
+#图片模板是否缓存
+tuiImgCache: '1'
+getTuiImg: 'C:\Tools\ylrm_his_scrm\images\36f5863ffbbbdfc31620ea177c75284c.jpg'
+getTuiFont: 'C:\Tools\ylrm_his_scrm\images\simsunb.ttf'

fs-service/src/main/resources/application-druid-fcky-test.yml → fs-service/src/main/resources/application-druid-zkzh-test.yml

@@ -1,19 +1,17 @@
 # 数据源配置
 spring:
     profiles:
-        include: config-druid-fcky,common
+        include: config-zkzh,common
     # redis 配置
     redis:
         # 地址
         host: 127.0.0.1
         # 端口，默认为6379
         port: 6379
-        # 数据库索引
-        database: 0
         # 密码
         password:
         # 连接超时时间
-        timeout: 20s
+        timeout: 30s
         lettuce:
             pool:
                 # 连接池中的最小空闲连接
@@ -24,26 +22,17 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
+        database: 0
     datasource:
-        #        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
-        #            username: rt_2024
-        #            password: Yzx_19860213
-        #            initialSize: 10
-        #            maxActive: 100
-        #            minIdle: 10
-        #            maxWait: 6000
         mysql:
             type: com.alibaba.druid.pool.DruidDataSource
             driverClassName: com.mysql.cj.jdbc.Driver
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://119.45.165.149:2345/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://47.111.26.148:2345/jz_store_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: Ylrz_1q2w3e4r5t6y
+                    password: Zkhj951753@#
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -96,9 +85,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://119.45.165.149:2345/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://47.111.26.148:2345/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: Ylrz_1q2w3e4r5t6y
+                    password: Zkhj951753@#
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量
@@ -148,3 +137,10 @@ rocketmq:
         group: test-group
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+cloud_host:
+    company_name: 中康智慧
+openIM:
+    secret: openIM123
+    userID: imAdmin
+#是否为新商户，新商户不走mpOpenId
+isNewWxMerchant: false

fs-user-app/src/main/resources/application.yml

@@ -13,6 +13,4 @@ spring:
 #    active: druid-sxjz
 #    active: druid-yzt
 #    active: druid-fcky-test
-getTuiImg: 'C:\Tools\ylrm_his_scrm\images\36f5863ffbbbdfc31620ea177c75284c.jpg'
-getTuiFont: 'C:\Tools\ylrm_his_scrm\images\simsunb.ttf'