Merge branch 'main' into prod

ensign-gateway/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
 
       routes:
         - id: proxy_route # ??????
-          uri: ${kingdee.test-inner-end-point}
+          uri: ${kingdee.prod-inner-end-point}
           predicates:
             - Path=/crm-api/proxy/do/**
           filters:

ensign-server/src/main/resources/application-dev.yaml

@@ -43,21 +43,21 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/ensign-crm-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/ensign-crm-prod?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          username: crmuser
+          username: root
-          password: yx.CRM.user@240920
+          password: yxzg-123456
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:mysql://127.0.0.1:3306/ensign-crm-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/ensign-crm-prod?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          username: crmuser
+          username: root
-          password: yx.CRM.user@240920
+          password: yxzg-123456
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口
     database: 0 # 数据库索引
-#    password: 123456 # 密码，建议生产环境开启
+    password: yxzg-123456 # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
 

ensign-server/src/main/resources/application-local.yaml

@@ -46,9 +46,9 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://10.64.111.141:3306/ensign-crm-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://10.64.111.165:3306/ensign-crm-prod?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          username: crmuser
+          username: root
-          password: yx.CRM.user@240920
+          password: yxzg-123456
           #          username: sa # SQL Server 连接的示例
           #          password: Ensign@2024 # SQL Server 连接的示例
           #          username: SYSDBA # DM 连接的示例
@@ -57,15 +57,15 @@ spring:
           #          password: Ensign@2024 # OpenGauss 连接的示例
         slave: # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:mysql://10.64.111.141:3306/ensign-crm-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://10.64.111.165:3306/ensign-crm-prod?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          username: crmuser
+          username: root
-          password: yx.CRM.user@240920
+          password: yxzg-123456
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口
-    database: 0 # 数据库索引
+    database: 5 # 数据库索引
 #    password: dev # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################

ensign-server/src/main/resources/application.yaml

@@ -267,18 +267,18 @@ ensign:
         key: pLXUGAwK5305
         customer: E77DF18BE109F454A5CD319E44BF5177
   kingdee:
-    env: test
+    env: prod
     test-public-end-point: 'http://122.4.221.133:8022'
     test-inner-end-point: 'http://10.64.112.152:8022'
     prod-public-end-point: 'http://122.4.221.130:8022'
     prod-inner-end-point: 'http://10.64.111.134:8022'
     appToken:
       appId: 'CRM'
-      appSecuret: 'yx.CRM.tksecurit@240924'
+      appSecuret: 'nAM*syDUL0Q&vf#x'
-      tenantid: 'yxzg-topview-dev'
+      tenantid: 'yxgz-prod'
-      accountId: '1878420900609526784'
+      accountId: '2125551696414245888'
       language: 'zh_CN'
     accessToken:
-      user: 'COSMIC'
+      user: '18053637992'
-      usertype: 'UserName'
+      usertype: 'Mobile'
 debug: false