Merge remote-tracking branch 'origin/master'

fs-admin/src/main/resources/application.yml

@@ -4,6 +4,14 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-myhk
+#    active: dev
+#    include: common,config-myhk
+#    active: druid-hdt
+#    include: common,config-druid-hdt
+#    active: druid-yzt
+#    include: common,config-druid-yzt
+#    active: druid-sxjz
+#    include: common,config-druid-sxjz
+    active: druid-sft
+    include: common,config-druid-sft
 

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

@@ -5,5 +5,7 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+#    active: dev
+#    include: common,config-dev
+    active: druid-sxjz
+    include: common,config-druid-sxjz

fs-company/src/main/resources/application.yml

@@ -3,11 +3,17 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+#    active: dev
+#    include: common,config-dev
 #    active: druid-jzzx
 #    include: common,config-druid-jzzx
 #    active: druid-hdt
-#    include: common,config-druid-
+#    include: common,config-druid-hdt
 #    active: druid-sxjz
 #    include: common,config-druid-sxjz
+#    active: druid-yzt
+#    include: common,config-druid-yzt
+#    active: druid-myhk
+#    include: common,config-myhk
+    active: druid-sft
+    include: common,config-druid-sft

fs-qw-api-msg/src/main/java/com/fs/app/controller/test.java

@@ -1,34 +0,0 @@
-package com.fs.app.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.fs.common.annotation.Excel;
-import com.fs.fastGpt.domain.FastGptChatSession;
-import com.fs.fastgptApi.util.AiImgUtil;
-import com.fs.qw.domain.QwExternalContactInfo;
-import com.fs.wxwork.dto.WxwSilkVoceDTO;
-import com.fs.wxwork.utils.WxWorkHttpUtil;
-
-import javax.validation.constraints.Null;
-import java.lang.reflect.Field;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class test {
-    public static void main(String[] args) {
-        AiImgUtil aiImgUtil = new AiImgUtil();
-        String imageParse = aiImgUtil.getImageParse("https://wework.qpic.cn/wwpic3az/wwwx_3cf5c3be937316fcad124d8fb1b1f1b2/0");
-        System.out.println(imageParse);
-    }
-
-
-
-
-    void voice(){
-        String  url="http://162.14.193.126:8009/app/common/voice?voice="+"你好"+"&id="+2020;
-        String json = WxWorkHttpUtil.get(url);
-        System.out.println(json);
-        WxwSilkVoceDTO wxwSilkVoceDTO = JSON.parseObject(json, WxwSilkVoceDTO.class);
-    }
-}

fs-qw-api/src/main/java/com/fs/app/controller/testTask.java

@@ -1,53 +0,0 @@
-package com.fs.app.controller;//package com.fs.app.controller;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.fs.app.service.QwDataCallbackService;
-//import com.fs.common.core.redis.RedisCache;
-//import com.fs.fastGpt.service.AiNewService;
-//import com.fs.fastGpt.service.AiService;
-//import com.fs.qw.domain.QwMessageGather;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//
-//@Service
-//public class testTask {
-//
-//    @Autowired
-//    QwDataCallbackService qwDataCallbackService;
-//    @Autowired
-//    private AiNewService aiService;
-//
-//    @Scheduled(fixedRate = 5000) // 每10执行一次
-//    public void getMsg(){
-//        // 拉取会话存档内容
-//        List<String> chatContents = qwDataCallbackService.getChatData("wweb0666cc79d79da5");
-//        for (String chatContent : chatContents) {
-//            QwMessageGather qwMessageGather = JSON.parseObject(chatContent, QwMessageGather.class);
-//            if (!qwMessageGather.getAction().equals("send")){
-//                System.out.println("非send");
-//                continue;
-//            }
-//            if (!qwMessageGather.getMsgtype().equals("text")){
-//                System.out.println("非text");
-//                continue;
-//            }
-//            if (qwMessageGather.getRoomid()!=null&&!qwMessageGather.getRoomid().equals("")){
-//                System.out.println("群聊消息");
-//                continue;
-//            }
-//            String from = qwMessageGather.getFrom();
-//            if (from.startsWith("wo")||from.startsWith("wm")){
-//                System.out.println("用户发消息");
-//                aiService.qwHookNotifyAiReply(qwMessageGather,"wweb0666cc79d79da5");
-//            }else {
-//                aiService.qwHookNotifyAddMsg(qwMessageGather,"wweb0666cc79d79da5");
-//                System.out.println("客服发送消息");
-//            }
-//            QwMessageGather.TextContent text = qwMessageGather.getText();
-//            System.out.println(text.getContent());
-//        }
-//    }
-//}

fs-qw-api/src/main/resources/application.yml

@@ -7,5 +7,7 @@ spring:
   profiles:
 #    active: dev
 #    include: common,config-dev
-    active: druid-hdt
-    include: common,config-druid-hdt,mq-hdt
+#    active: druid-hdt
+#    include: common,config-druid-hdt
+    active: druid-sft
+    include: common,config-druid-sft

fs-qw-task/src/main/resources/application.yml

@@ -6,5 +6,13 @@ server:
 # Spring配置
 spring:
   profiles:
+#    active: dev
+#    include: common,config-dev
+#    active: druid-hcl
+#    include: common,config-druid-hcl
+#    active: druid-sxjz
+#    include: common,config-druid-sxjz
+#    active: druid-hdt
+#    include: common,config-druid-hdt
     active: druid-myhk
     include: common,config-myhk

fs-qwhook-msg/src/main/resources/application.yml

@@ -5,5 +5,9 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+#    active: dev
+#    include: common,config-dev
+#    active: druid-sxjz
+#    include: common,config-druid-sxjz
+    active: druid-hdt
+    include: common,config-druid-hdt

fs-qwhook-sop/src/main/resources/application.yml

@@ -6,5 +6,13 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+#    active: dev
+#    include: common,config-dev
+#    active: druid-yzt
+#    include: common,config-druid-yzt
+#    active: druid-hdt
+#    include: common,config-druid-hdt
+#    active: druid-sxjz
+#    include: common,config-druid-sxjz
+    active: druid-sft
+    include: common,config-druid-sft

fs-qwhook/src/main/resources/application.yml

@@ -6,5 +6,13 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+#    active: dev
+#    include: common,config-dev
+#    active: druid-yzt
+#    include: common,config-druid-yzt
+#    active: druid-hdt
+#    include: common,config-druid-hdt
+#    active: druid-sxjz
+#    include: common,config-druid-sxjz
+    active: druid-sft
+    include: common,config-druid-sft

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

@@ -0,0 +1,71 @@
+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: wx292bf58b269bbb8c #微信公众号或者小程序等的appid
+    mchId: 1717412669 #微信支付商户号
+    mchKey: a3f0bec59cebeb60553ec80bbfd5dfdf #微信支付商户密钥
+    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: wx73aadc283984a8ee # 第一个公众号的appid  //公众号名称:四福堂商城
+        secret: 50c5fee7d107ecbeda4328ef4976a6a0 # 公众号的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: sft-1323137866
+  app_id: 1323137866
+  region: ap-chongqing
+  proxy: sft
+cloud_host:
+  company_name: 四福堂
+#看课授权时显示的头像
+headerImg:
+  imgUrl: https://cos.his.cdwjyyh.com/fs/20250606/fdf4b41abc0741758ab6c2c70dafb5be.png
+ipad:
+  ipadUrl: http://ipad.cdwjyyh.com
+
+

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

@@ -0,0 +1,137 @@
+
+# 数据源配置
+spring:
+    # redis 配置
+    redis:
+        host: 172.30.0.13
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: Sft13245600*
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 80
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    datasource:
+        mysql:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://172.30.0.15:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Sft13245600*
+                # 从库数据源
+                slave:
+                    # 从数据源开关/默认关闭
+                    enabled: false
+                    url:
+                    username:
+                    password:
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 2000
+                # 配置获取连接等待超时的时间
+                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://172.30.0.15:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Sft13245600*
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 200
+                # 配置获取连接等待超时的时间
+                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: voice-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey

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

@@ -0,0 +1,71 @@
+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/resources/application.yml

@@ -6,11 +6,17 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+#    active: dev
+#    include: common,config-dev
 #    active: druid-jzzx
 #    include: common,config-druid-jzzx
+#    active: druid-yzt
+#    include: common,config-druid-yzt
 #    active: druid-hdt
 #    include: common,config-druid-hdt
-#    active: druid-jnmy
-#    include: common,config-druid-jnmy
+#    active: druid-sxjz
+#    include: common,config-druid-sxjz
+#    active: druid-yzt
+#    include: common,config-druid-yzt
+    active: druid-sft
+    include: common,config-druid-sft