diff --git a/framework/eureka/pom.xml b/framework/eureka/pom.xml index a9fb7cf98a..9a7a834dbf 100644 --- a/framework/eureka/pom.xml +++ b/framework/eureka/pom.xml @@ -24,7 +24,18 @@ org.springframework.boot spring-boot-starter-jetty - + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + + + org.eclipse.jetty.http2 + http2-server + org.apache.commons commons-lang3 diff --git a/framework/gateway/pom.xml b/framework/gateway/pom.xml index 9f7be2a9d8..11c9fffa77 100644 --- a/framework/gateway/pom.xml +++ b/framework/gateway/pom.xml @@ -25,6 +25,19 @@ org.springframework.boot spring-boot-starter-jetty + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + + + org.eclipse.jetty.http2 + http2-server + org.springframework.boot spring-boot-starter-mail diff --git a/framework/sdk-parent/sdk/pom.xml b/framework/sdk-parent/sdk/pom.xml index 3d0401513f..8923965526 100644 --- a/framework/sdk-parent/sdk/pom.xml +++ b/framework/sdk-parent/sdk/pom.xml @@ -109,7 +109,19 @@ org.springframework.boot spring-boot-starter-websocket - + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + + + org.eclipse.jetty.http2 + http2-server + org.redisson redisson-spring-boot-starter diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/NodeResourcePoolService.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/NodeResourcePoolService.java index 96376d24f9..7120da13cd 100644 --- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/NodeResourcePoolService.java +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/service/NodeResourcePoolService.java @@ -41,6 +41,7 @@ public class NodeResourcePoolService { HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory(); httpRequestFactory.setConnectionRequestTimeout(2000); httpRequestFactory.setConnectTimeout(2000); + httpRequestFactory.setReadTimeout(1000); restTemplateWithTimeOut.setRequestFactory(httpRequestFactory); } diff --git a/pom.xml b/pom.xml index 899a821da4..e7d45f335b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0 + 3.1.5 @@ -28,12 +28,12 @@ 3.1.1 2.1.4 32.0.1-jre - 6.0.0 + 5.3.2 1.5 1.0.8 3.23.3 5.1.0 - 3.0.3 + 3.0.2 0.10.2 1.70 2.11.0