zyp

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

@@ -684,7 +684,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
         if (videoDuration==null){
             FsUserCourseVideo video = courseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
             videoDuration=video.getDuration();
-            redisCache.setCacheObject(videoRedisKey,video.getDuration().toString());
+            redisCache.setCacheObject(videoRedisKey,video.getDuration());
         }
         return videoDuration;
     }

fs-service/src/main/java/com/fs/qw/vo/QwSopRuleTimeVO.java

@@ -89,4 +89,7 @@ public class QwSopRuleTimeVO extends BaseEntity {
     */
     private Integer tempGap;
 
+    // 是否固定营期
+    private Integer isFixed;
+
 }

fs-service/src/main/resources/mapper/application-config-druid-sft.yml

@@ -1,71 +0,0 @@
-baidu:
-  token: 1231321232
-#配置
-logging:
-  level:
-    org.springframework.web: INFO
-    com.github.binarywang.demo.wx.cp: DEBUG
-    me.chanjar.weixin: DEBUG
-wx:
-  cp:
-    corpId: wwb2a10556a7c2
-    appConfigs:
-      - agentId: 100005
-        secret: ec7okROXJqkNafq66aKNasTzQIG0CYrj3vyBbo
-        token: PPKOdAlMO
-        aesKey: PKvaxtpSvNGpfT7VUHIK8Wok2ESyYX24qpXJAdMP
-  pay:
-    appId: wx73f858d6119 #微信公众号或者小程序等的appid
-    mchId: 161145 #微信支付商户号
-    mchKey: 8cab18997a3547c10898b877f38 #微信支付商户密钥
-    subAppId:  #服务商模式下的子商户公众账号ID
-    subMchId:  #服务商模式下的子商户号
-    keyPath: c:\\cert\\apiclient_cert.p12 # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
-    notifyUrl: https://usepp.his.runtzh.com/app/wxpay/wxPayNotify
-  mp:
-    useRedis: false
-    redisConfig:
-      host: 127.0.0.1
-      port: 6379
-      timeout: 2000
-    configs:
-      - appId: wx5b979cb3448d6fa5 # 第一个公众号的appid  //公众号名称:成都九州在线互联网医院
-        secret: c66f99034e06e4ae1f857895e3868bb0 # 公众号的appsecret
-        token: PPKOdAlCoMO # 接口配置里的Token值
-        aesKey: Eswa6VjwtVcw03qZy6Wllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
-aifabu:  #爱链接
-  appKey: 7b471be905ab17ef358c0dd117601d008
-watch:
-  watchUrl: watch.ylrzcloud.com/prod-api
-#  account: tcloud
-#  password: mdf-m2h_6yw2$hq
-  account1: ccif #866655060138751
-  password1: cp-t5or_6xw7$mt
-  account2: tcloud #rt500台
-  password2: mdf-m2h_6yw2$hq
-  account3: whr
-  password3: v9xsKuqn_$d2y
-
-fs :
-  commonApi: http://172.16.0.16:8010
-  h5CommonApi: http://119.29.195.254:8010
-nuonuo:
-  key: 10924508
-  secret: A2EB20764D304D16
-# 存储捅配置
-tencent_cloud_config:
-  secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
-  secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
-  bucket: yzt-1323137866
-  app_id: 1323137866
-  region: ap-chongqing
-  proxy: yzt
-cloud_host:
-  company_name: 易诊通
-#看课授权时显示的头像
-headerImg:
-  imgUrl: https://cos.his.cdwjyyh.com/fs/20250522/28c3d8d5c42a4bcdb85292c2e5eb2a37.png
-ipad:
-  ipadUrl: http://ipad.cdwjyyh.com
-
-

fs-user-app/src/main/java/com/fs/app/controller/CourseController.java

@@ -411,6 +411,7 @@ public class CourseController extends  AppBaseController{
         String videoRedisKey = "h5user:video:duration:" + param.getVideoId();
         Long videoDuration = redisCache.getCacheObject(videoRedisKey);
         if (videoDuration==null){
+
             redisCache.setCacheObject(videoRedisKey,course.getDuration());
         }
         // 返回是否开启评论/弹幕。优先获取sop任务配置的是否开启评论/弹幕，如果没有配置就取总后台的配置；