zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
chenbowen
2026-01-06 15:24:46 +08:00
parent 0ad14fbe73 b86a9a2811
commit b245bed7da
33 changed files with 578 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/controller/admin/gateway/vo/definition/ApiDefinitionStepSaveReqVO.java
View File

@@ -36,7 +36,7 @@ public class ApiDefinitionStepSaveReqVO {
@Schema(description = "响应映射表达式(JSON)")
private String responseMappingExpr;
@Schema(description = "超时时间(毫秒)", example = "5000")
@Schema(description = "超时时间(毫秒)，缺省 20000(20s)", example = "20000")
private Long timeout;
@Schema(description = "降级策略(JSON)")

3
zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/gateway/step/impl/HttpStepHandler.java
View File

@@ -48,6 +48,7 @@ public class HttpStepHandler implements ApiStepHandler {
private static final Duration RETRY_DELAY = Duration.ofMillis(200);
private static final int RETRY_ATTEMPTS = 3;
private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(20);
private static final Set<String> DEFAULT_FORWARDED_HEADERS = Set.of(
"authorization",
@@ -229,7 +230,7 @@ public class HttpStepHandler implements ApiStepHandler {
private Duration resolveTimeout(ApiStepDefinition stepDefinition) {
Long timeout = stepDefinition.getStep().getTimeout();
if (timeout == null || timeout <= 0) {
return Duration.ofSeconds(5);
return DEFAULT_TIMEOUT;
}
return Duration.ofMillis(timeout);
}

17
zt-module-databus/zt-module-databus-server/src/main/resources/application-dev.yml
View File

@@ -37,14 +37,20 @@ spring:
primary: master
datasource:
master:
url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
#url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
#username: SYSDBA
#password: pgbsci6ddJ6Sqj@e
url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
username: SYSDBA
password: pgbsci6ddJ6Sqj@e
password: P@ssword25
slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
lazy: true # 开启懒加载，保证启动速度
url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
#url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
#username: SYSDBA
#password: pgbsci6ddJ6Sqj@e
url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
username: SYSDBA
password: pgbsci6ddJ6Sqj@e
password: P@ssword25
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
data:
@@ -52,9 +58,8 @@ spring:
host: 172.16.46.63 # 地址
port: 30379 # 端口
database: 0 # 数据库索引
username: zt-redis
username: zt-redis # 密码，建议生产环境开启
password: P@ssword25
# password: 123456 # 密码，建议生产环境开启
xxl:
job:

17
zt-module-databus/zt-module-databus-server/src/main/resources/application-local.yml
View File

@@ -39,14 +39,20 @@ spring:
primary: master
datasource:
master:
url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
#url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
#username: SYSDBA
#password: pgbsci6ddJ6Sqj@e
url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
username: SYSDBA
password: pgbsci6ddJ6Sqj@e
password: P@ssword25
slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
lazy: true # 开启懒加载，保证启动速度
url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
#url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
#username: SYSDBA
#password: pgbsci6ddJ6Sqj@e
url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
username: SYSDBA
password: pgbsci6ddJ6Sqj@e
password: P@ssword25
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
data:
@@ -54,7 +60,8 @@ spring:
host: 172.16.46.63 # 地址
port: 30379 # 端口
database: 0 # 数据库索引
# password: 123456 # 密码，建议生产环境开启
username: zt-redis # 密码，建议生产环境开启
password: P@ssword25
xxl:
job:

2
zt-module-databus/zt-module-databus-server/src/main/resources/application.yml
View File

@@ -50,7 +50,7 @@ spring:
time-to-live: 1h # 设置过期时间为 1 小时
server:
port: 48100
port: 48108
logging:
file: