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

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

Browse Source
This commit is contained in:
chenbowen
2025-11-06 23:10:12 +08:00
parent c1ea3c6754 f25ee5091e
commit b8b8495dfe
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,8 +112,17 @@ public class HttpStepHandler implements ApiStepHandler {
Map<String, String> headerMap = resolveHeaders(stepDefinition, payload); Map<String, String> headerMap = resolveHeaders(stepDefinition, payload);
Duration timeout = resolveTimeout(stepDefinition); Duration timeout = resolveTimeout(stepDefinition);
WebClient client = webClientBuilder.build(); WebClient client = webClientBuilder.build();
WebClient.RequestHeadersSpec<?> requestSpec = buildRequest(client, callSpec, requestPayload, headerMap, supportsBody); final HttpRequestPayload resolvedPayload = requestPayload;
Mono<Object> responseMono = requestSpec.retrieve().bodyToMono(Object.class); boolean finalSupportsBody = supportsBody;
Mono<Object> responseMono = Mono.defer(() -> {
// 每次订阅（含重试）都会重新构建请求，避免缓存第一次结果
HttpRequestPayload payloadForAttempt = resolvedPayload == null
? HttpRequestPayload.of(null, Collections.emptyMap())
: resolvedPayload;
return buildRequest(client, callSpec, payloadForAttempt, headerMap, finalSupportsBody)
.retrieve()
.bodyToMono(Object.class);
});
responseMono = applyResilientRetry(responseMono, stepDefinition); responseMono = applyResilientRetry(responseMono, stepDefinition);
Object response = timeout == null ? responseMono.block() : responseMono.block(timeout); Object response = timeout == null ? responseMono.block() : responseMono.block(timeout);
payload.addStepResult(ApiStepResult.builder() payload.addStepResult(ApiStepResult.builder()