Merge remote-tracking branch 'base-version/main' into dev

# Conflicts:
#	zt-dependencies/pom.xml

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

@@ -1,6 +1,9 @@
 server:
   port: 48080
 
+sync:
+  encrypt-key: 25@jygk # 中铝 加密 key
+
 --- #################### 数据库相关配置 ####################
 
 spring:
@@ -44,21 +47,21 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
-          username: root
-          password: 123456
+          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          username: SYSDBA
+          password: pgbsci6ddJ6Sqj@e
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
-          username: root
-          password: 123456
+          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          username: SYSDBA
+          password: pgbsci6ddJ6Sqj@e
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
     redis:
-      host: 400-infra.server.iocoder.cn # 地址
-      port: 6379 # 端口
-      database: 1 # 数据库索引
+      host: 172.16.46.63 # 地址
+      port: 30379 # 端口
+      database: 0 # 数据库索引
 #    password: 123456 # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################

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

@@ -3,7 +3,7 @@ spring:
     name: zt-server
 
   profiles:
-    active: local
+    active: ${env.name}
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
@@ -37,6 +37,10 @@ server:
       charset: UTF-8 # 必须设置 UTF-8，避免 WebFlux 流式返回（AI 场景）会乱码问题
       force: true
 
+# 默认关闭 Seata ，单体部署无需启动分布式事务；分布式场景通过环境变量 SEATA_ENABLED=true 覆盖即可
+seata:
+  enabled: false
+
 --- #################### Spring Cloud 禁用配置 ####################
 
 spring:
@@ -67,6 +71,49 @@ knife4j:
   setting:
     language: zh_cn
 
+iwork:
+  base-url:
+  app-id:
+  client-public-key:
+  user-id:
+  workflow-id:
+  paths:
+    register: /api/ec/dev/auth/regist
+    apply-token: /api/ec/dev/auth/applytoken
+    user-info: /api/workflow/paService/getUserInfo
+    create-workflow: /api/workflow/paService/doCreateRequest
+    void-workflow: /api/workflow/paService/doCancelRequest
+  token:
+    ttl-seconds: 3600
+    refresh-ahead-seconds: 60
+  client:
+    connect-timeout: 5s
+    response-timeout: 30s
+  org:
+    token-seed:
+    paths:
+      subcompany-page:
+      department-page:
+      job-title-page:
+      user-page:
+      sync-subcompany:
+      sync-department:
+      sync-job-title:
+      sync-user:
+
+eplat:
+  share:
+    url-prefix: http://10.1.7.110
+    client-id: ztjgj5gsJ2uU20900h9j
+    client-secret: DC82AD38EA764719B6DC7D71AAB4856C
+    scope: read
+    token-cache-key: eplat:cache:shareToken
+    refresh-token-cache-key: eplat:cache:shareRefreshToken
+    token-header-name: Xplat-Token
+    token-endpoint-path: /eplat/oauth/token
+    token-ttl: 5000s
+    refresh-token-ttl: 10000s
+
 # 工作流 Flowable 配置
 flowable:
   # 1. false: 默认值，Flowable 启动时，对比数据库表中保存的版本，如果不匹配。将抛出异常