Merge remote-tracking branch 'origin/master'

fs-admin/src/main/java/com/fs/his/controller/FsDoctorArticleController.java

@@ -100,9 +100,14 @@ public class FsDoctorArticleController extends BaseController
     {
         fsDoctorArticleService.updateFsDoctorArticle(fsDoctorArticle);
         Collection<String> keys = redisCache.keys("getDoctorArticleList*");
-        for (String key : keys) {
-            redisCache.deleteObject(key);
+        Collection<String> details = redisCache.keys("getDoctorArticleById::" +fsDoctorArticle.getArticleId());
+        keys.addAll(details);
+        if (!keys.isEmpty()) {
+            for (String key : keys) {
+                redisCache.deleteObject(key);
+            }
         }
+
         return toAjax(1);
     }
 

fs-common/src/main/java/com/fs/common/utils/CloudHostUtils.java

@@ -0,0 +1,23 @@
+package com.fs.common.utils;
+
+
+import com.fs.common.utils.spring.SpringUtils;
+
+public class CloudHostUtils {
+
+    /**
+     * 是否指定项目名称配置
+     */
+    public static boolean isCloudHostName(String cloudHostName) {
+        String cloudHostNameConfig = SpringUtils.getProperty("cloud_host.company_name");
+        if (StringUtils.isBlank(cloudHostNameConfig)) {
+            return false;
+        }
+
+        if (StringUtils.isBlank(cloudHostName)) {
+            return false;
+        }
+
+        return cloudHostNameConfig.equalsIgnoreCase(cloudHostName);
+    }
+}

fs-common/src/main/java/com/fs/common/utils/spring/SpringUtils.java

@@ -143,4 +143,14 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
         final String[] activeProfiles = getActiveProfiles();
         return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
     }
+
+    /**
+     * 获取配置文件配置项的值
+     *
+     * @param key 配置项key
+     * @return 属性值
+     */
+    public static String getProperty(String key) {
+        return applicationContext.getEnvironment().getProperty(key);
+    }
 }

fs-company-app/src/main/java/com/fs/app/config/WebMvcConfig.java

@@ -26,4 +26,4 @@ public class WebMvcConfig implements WebMvcConfigurer {
 //    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
 //        argumentResolvers.add(loginUserHandlerMethodArgumentResolver);
 //    }
-}
+}

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

@@ -1,6 +1,7 @@
 package com.fs.app.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fs.app.exception.FSException;
 import com.fs.app.utils.JwtUtils;
 import com.fs.common.core.redis.RedisCache;
@@ -34,7 +35,10 @@ public class AppBaseController {
 	{
 		String headValue =  ServletUtils.getRequest().getHeader("APPToken");
 		Claims claims=jwtUtils.getClaimByToken(headValue);
-		String userId = claims.getSubject().toString();
+		if (ObjectUtil.isEmpty(claims)){
+			throw new FSException("未授权,请先登录！");
+		}
+		String userId = claims.getSubject();
 		return userId;
 	}
 	public Long getCompanyUserId() {

fs-doctor-app/src/main/java/com/fs/app/controller/DoctorArticleController.java

@@ -103,8 +103,12 @@ public class DoctorArticleController extends  AppBaseController {
 
         if(doctorArticleService.updateFsDoctorArticle(param)>0){
             Collection<String> keys = redisCache.keys("getDoctorArticleList*");
-            for (String key : keys) {
-                redisCache.deleteObject(key);
+            Collection<String> details = redisCache.keys("getDoctorArticleById::" +param.getArticleId());
+            keys.addAll(details);
+            if (!keys.isEmpty()) {
+                for (String key : keys) {
+                    redisCache.deleteObject(key);
+                }
             }
             return R.ok();
         }

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseVideoRedPackageMapper.java

@@ -70,6 +70,7 @@ public interface FsUserCourseVideoRedPackageMapper
             "VALUES (#{companyId}, #{videoId}, #{redPacketMoney}) " +
             "ON DUPLICATE KEY UPDATE red_packet_money = VALUES(red_packet_money);")
     void insertOrUpdateFsUserCourseVideoRedPackage(FsUserCourseVideoParam fsUserCourseVideo);
+
     @Select("select * from fs_user_course_video_red_package where video_id =#{videoId} and company_id = #{companyId} and period_id = #{periodId}")
     FsUserCourseVideoRedPackage selectRedPacketByCompanyId(@Param("videoId") Long videoId,@Param("companyId") Long companyId, @Param("periodId") Long periodId);
 

fs-service/src/main/java/com/fs/course/param/PeriodCountParam.java

@@ -30,5 +30,8 @@ public class PeriodCountParam implements Serializable {
 
     private LocalDate maxDate;
 
+    @ApiModelProperty(value = "公司ID")
+    private Long companyId;
+
 }
 

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

@@ -245,6 +245,7 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
         CourseAnalysisParam courseAnalysisParam = new CourseAnalysisParam();
         courseAnalysisParam.setPeriodId(param.getPeriodId());
         courseAnalysisParam.setVideoIdList(param.getVideoIdList());
+        courseAnalysisParam.setCompanyId(param.getCompanyId());
         List<FsCourseAnalysisCountVO> courseCountList = fsUserMapper.courseAnalysisWatchLog(courseAnalysisParam);
         List<FsCourseAnalysisCountVO> redPacketCountList = fsUserMapper.courseAnalysisRedPacketCount(courseAnalysisParam);
         List<FsCourseAnalysisCountVO> answerCountList = fsUserMapper.courseAnalysisAnswerCount(courseAnalysisParam);

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

@@ -1194,7 +1194,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
                 try {
                     handleFsUserWx(user,param.getAppId());
                 }catch (Exception e){
-                    logger.error("zyp \n 【更新或插入用户与小程序的绑定关系失败】：{}", user.getUserId());
+                    logger.error("zyp \n 【更新或插入用户与小程序的绑定关系失败】：{}", user.getUserId(),e);
                 }
 
             }else {

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -570,11 +570,15 @@ public class FsUserServiceImpl implements IFsUserService
 
         List<SysDictData> courseProject = dictDataMapper.selectDictDataByType("sys_course_project");
         for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
-            // 项目
-            courseProject.stream()
-                    .filter(c -> c.getDictValue().equals(fsUserPageListVO.getProjectId().toString()))
-                    .findFirst()
-                    .ifPresent(c -> fsUserPageListVO.setProjectName(c.getDictLabel()));
+            if (courseProject != null && !courseProject.isEmpty()) {
+                if (fsUserPageListVO.getProjectId() != null){
+                    // 项目
+                    courseProject.stream()
+                            .filter(c -> c.getDictValue().equals(fsUserPageListVO.getProjectId().toString()))
+                            .findFirst()
+                            .ifPresent(c -> fsUserPageListVO.setProjectName(c.getDictLabel()));
+                }
+            }
             if (StringUtils.isEmpty(fsUserPageListVO.getNickname())){
                 fsUserPageListVO.setNickname("用户暂未授权昵称");
             }

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -43,7 +43,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
 
     public List<QwUser> batchGetQwUser(@Param("list") List<QwUserKeyDTO> qwUserId);
 
-    @Select("select company_user_id,company_id,welcome_text,qw_user_name from qw_user where id = #{id}")
+    @Select("select company_user_id,company_id,welcome_text,qw_user_name,send_msg_type from qw_user where id = #{id}")
     public QwUser selectQwUserByIdByWeComeText(@Param("id") Long id);
 
     @Select("select * from qw_user where qw_user_id = #{qwUserId} and corp_id = #{corpId} ")

fs-service/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

@@ -398,7 +398,7 @@ public class QwSopTempServiceImpl implements IQwSopTempService
                     rules.setIsOfficial("0");
                 }
 
-                if (day.getDayNum()==1){
+                if (day.getDayNum()==1 && sorts.get() == 0 && temp.getOpenOfficial().equals("1")){
                     rules.setTime("01:05");
                 }else {
                     rules.setTime(time);

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -745,10 +745,10 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
             String companyId = String.valueOf(qwUser.getCompanyId()).trim();
 
             //域名
-            String domainName = companyUserMapper.selectDomainByUserId(Long.parseLong(companyUserId));
-            if (StringUtils.isEmpty(domainName)){
-                domainName = config.getRealLinkDomainName();
-            }
+//            String domainName = companyUserMapper.selectDomainByUserId(Long.parseLong(companyUserId));
+//            if (StringUtils.isEmpty(domainName)){
+//                domainName = config.getRealLinkDomainName();
+//            }
 
             QwCompany qwCompany = iQwCompanyService.getQwCompanyByRedis(param.getCorpId());
 
@@ -757,7 +757,8 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
             }
 
 
-            String finalDomainName = domainName;
+            String finalDomainName = "domainName";
+
             sopUserLogsInfos.forEach(item->{
 
                 QwSopLogs sopLogs=new QwSopLogs();

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

@@ -77,7 +77,7 @@ tencent_cloud_config:
   region: ap-chongqing
   proxy: hdt
 cloud_host:
-  company_name: 弘德
+  company_name: 弘德堂
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png

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

@@ -87,7 +87,8 @@ cloud_host:
 headerImg:
   imgUrl: https://qdtst-1360717104.cos.ap-nanjing.myqcloud.com/qdtst-1360717104/20250624/937019e4090f46788ef29c4e7df479c3.jpg
 ipad:
-  ipadUrl: http://ipad.cdwjyyh.com
+  ipadUrl:
+  aiApi:
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:

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

@@ -77,9 +77,9 @@ cloud_host:
   company_name: 益善缘
 #看课授权时显示的头像
 headerImg:
-  imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
+  imgUrl: https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com/ysy/20250820/2c47e4f105b641b4a49df50a77338e32.png
 ipad:
-  ipadUrl: http://ipad.xintaihl.cn
+  ipadUrl: http://ipad.ysya.top
   aiApi:
 wx_miniapp_temp:
   pay_order_temp_id:

fs-service/src/main/resources/application-druid-qdtst-test.yml

@@ -0,0 +1,168 @@
+# 数据源配置
+spring:
+    profiles:
+        include: config-druid-qdtst,common
+    # redis 配置
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password:
+        # 连接超时时间
+        timeout: 20s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    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.250.185:2345/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Ylrz_1q2w3e4r5t6y
+                # 从库数据源
+                slave:
+                    # 从数据源开关/默认关闭
+                    enabled: false
+                    url:
+                    username:
+                    password:
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+        sop:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://10.206.0.2:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Ylrz_1q2w3e4r5t6y
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+rocketmq:
+    name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址
+    producer:
+        group: my-producer-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+    consumer:
+        group: test-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+custom:
+    token: "1o62d"
+    encoding-aes-key: "UJfTQ5qKTK"
+    corp-id: "ww517"
+    secret: "6ODAmw-"
+    private-key-path: ""
+    webhook-url: ""
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 180
+openIM:
+    secret:
+    userID:

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

@@ -148,3 +148,21 @@ rocketmq:
         group: test-group
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+custom:
+    token: "1o62d"
+    encoding-aes-key: "UJfTQ5qKTK"
+    corp-id: "ww517"
+    secret: "6ODAmw-"
+    private-key-path: ""
+    webhook-url: ""
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 180
+openIM:
+    secret:
+    userID:

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

@@ -7,6 +7,7 @@ import com.fs.app.annotation.Login;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.domain.R;
 import com.fs.common.exception.CustomException;
+import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.ip.IpUtils;
@@ -170,7 +171,13 @@ public class InquiryOrderController extends  AppBaseController {
         }
 
         FsUser user=userService.selectFsUserByUserId(Long.parseLong(getUserId()));
-        if(user!=null&& StringUtils.isNotEmpty(user.getMaOpenId())){
+        if(user!=null){
+
+            // 红德堂特殊处理
+            if (!CloudHostUtils.isCloudHostName("弘德堂") && StringUtils.isBlank(user.getMaOpenId())) {
+                return R.error("用户OPENID不存在");
+            }
+
             if(param.getUserCouponId()!=null&&param.getUserCouponId()>0l){
                 FsUserCoupon userCoupon=userCouponService.selectFsUserCouponById(param.getUserCouponId());
                 if(userCoupon==null){

fs-user-app/src/main/java/com/fs/app/controller/store/StoreOrderScrmController.java

@@ -68,7 +68,7 @@ import java.util.concurrent.TimeUnit;
 @RequestMapping(value="/store/app/storeOrder")
 public class StoreOrderScrmController extends AppBaseController {
 
-    private static final String STORE_PAY_CONF = "store.pay";
+    private static final String STORE_PAY_CONF = "his.pay";
 
     Logger logger= LoggerFactory.getLogger(getClass());