Commit ad41dc1

authored

Merge branch 'dev' into tooltip_for_buttons

2 parents 8974731 + ea54110 commit ad41dc1Copy full SHA for ad41dc1

File tree

+11

-2

lines changed

server/api-service
- lowcoder-domain/src/main/java/org/lowcoder/domain/query/service
  - QueryExecutionServiceImpl.java
- lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient
  - WebClientBuildHelper.java

+11

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public class QueryExecutionServiceImpl implements QueryExecutionService {`
`44`	`44`	`public Mono<QueryExecutionResult> executeQuery(Datasource datasource, Map<String, Object> queryConfig, Map<String, Object> requestParams,`
`45`	`45`	`String timeoutStr, QueryVisitorContext queryVisitorContext) {`
`46`	`46`
`47`		`- int timeoutMs = QueryTimeoutUtils.parseQueryTimeoutMs(timeoutStr, requestParams, common.getMaxQueryTimeout());`
	`47`	`+ int timeoutMs = QueryTimeoutUtils.parseQueryTimeoutMs(timeoutStr, requestParams, common.getMaxQueryTimeout() * 1000);`
`48`	`48`	`queryConfig.putIfAbsent("timeoutMs", String.valueOf(timeoutMs));`
`49`	`49`
`50`	`50`	`return Mono.defer(() -> {`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,11 @@`
`1`	`1`	`package org.lowcoder.sdk.webclient;`
`2`	`2`
	`3`	`+import io.netty.channel.ChannelOption;`
`3`	`4`	`import io.netty.handler.ssl.SslContext;`
`4`	`5`	`import io.netty.handler.ssl.SslContextBuilder;`
`5`	`6`	`import io.netty.handler.ssl.util.InsecureTrustManagerFactory;`
	`7`	`+import io.netty.handler.timeout.ReadTimeoutHandler;`
	`8`	`+import io.netty.handler.timeout.WriteTimeoutHandler;`
`6`	`9`	`import lombok.extern.slf4j.Slf4j;`
`7`	`10`	`import org.apache.commons.collections4.CollectionUtils;`
`8`	`11`	`import org.apache.commons.lang3.StringUtils;`
`@@ -24,6 +27,7 @@`
`24`	`27`	`import java.security.cert.X509Certificate;`
`25`	`28`	`import java.time.Duration;`
`26`	`29`	`import java.util.Set;`
	`30`	`+import java.util.concurrent.TimeUnit;`
`27`	`31`
`28`	`32`	`@Slf4j`
`29`	`33`	`public class WebClientBuildHelper {`
`@@ -87,7 +91,12 @@ public Builder toWebClientBuilder() {`
`87`	`91`	`HttpClient httpClient = HttpClient.create();`
`88`	`92`	`if (timeoutMs != null)`
`89`	`93`	`{`
`90`		`- httpClient.responseTimeout(Duration.ofMillis(timeoutMs));`
	`94`	`+ httpClient = httpClient`
	`95`	`+ .responseTimeout(Duration.ofMillis(timeoutMs))`
	`96`	`+ .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, timeoutMs.intValue())`
	`97`	`+ .doOnConnected(conn -> conn`
	`98`	`+ .addHandlerLast(new ReadTimeoutHandler(timeoutMs, TimeUnit.MILLISECONDS))`
	`99`	`+ .addHandlerLast(new WriteTimeoutHandler(timeoutMs, TimeUnit.MILLISECONDS)));`
`91`	`100`	`}`
`92`	`101`
`93`	`102`	`if (sslConfig != null) {`

Comments

(0)