Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fs-company/src/main/resources/application.yml

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

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

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

@@ -8,4 +8,6 @@ spring:
 #    active: druid-jzzx
 #    include: common,config-druid-jzzx
 #    active: druid-hdt
-#    include: common,config-druid-hdt
+#    include: common,config-druid-
+#    active: druid-sxjz
+#    include: common,config-druid-sxjz

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

@@ -63,7 +63,5 @@ tencent_cloud_config:
   proxy: hzyy
 cloud_host:
   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-hdt.yml

@@ -29,8 +29,8 @@ wx:
       port: 6379
       timeout: 2000
     configs:
-      - appId: wxbc45c3882797e662 # 第一个公众号的appid  //公众号名称:成都九州在线互联网医院
-        secret: 5da9ae6d354c130dc81cde1a6d097480 # 公众号的appsecret
+      - appId: wx7670b3b1b1cfcd47 # 第一个公众号的appid  //公众号名称:成都九州在线互联网医院
+        secret: c6e5726c7039092a907c3242c8d3e406 # 公众号的appsecret
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVcw03qZy6Wllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
 aifabu:  #爱链接
@@ -58,7 +58,7 @@ tencent_cloud_config:
   secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
   bucket: hdt-1323137866
   app_id: 1323137866
-  region: ap-beijing
+  region: ap-chongqing
   proxy: hdt
 cloud_host:
   company_name: 弘德

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

@@ -52,9 +52,6 @@ fs :
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16
-
 headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
 
-
-

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

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