diff --git a/framework/eureka/pom.xml b/framework/eureka/pom.xml index 9a7a834dbf..a9fb7cf98a 100644 --- a/framework/eureka/pom.xml +++ b/framework/eureka/pom.xml @@ -24,18 +24,7 @@ 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 11c9fffa77..9f7be2a9d8 100644 --- a/framework/gateway/pom.xml +++ b/framework/gateway/pom.xml @@ -25,19 +25,6 @@ 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/gateway/src/main/java/io/metersphere/gateway/filter/LoginFilter.java b/framework/gateway/src/main/java/io/metersphere/gateway/filter/LoginFilter.java index 46e948bf55..52cef44c40 100644 --- a/framework/gateway/src/main/java/io/metersphere/gateway/filter/LoginFilter.java +++ b/framework/gateway/src/main/java/io/metersphere/gateway/filter/LoginFilter.java @@ -4,7 +4,6 @@ import io.metersphere.commons.utils.FilterChainUtils; import io.metersphere.security.ApiKeyHandler; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.springdoc.core.properties.SwaggerUiConfigProperties; import org.springframework.core.Ordered; diff --git a/framework/sdk-parent/sdk/pom.xml b/framework/sdk-parent/sdk/pom.xml index 8923965526..3d0401513f 100644 --- a/framework/sdk-parent/sdk/pom.xml +++ b/framework/sdk-parent/sdk/pom.xml @@ -109,19 +109,7 @@ 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 7120da13cd..96376d24f9 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,7 +41,6 @@ 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 e7d45f335b..6c1db61cf0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.5 + 3.2.0 @@ -20,7 +20,7 @@ 2.10 17 - 2022.0.4 + 2023.0.0 2.7.22 1.6.0 1.13.0 @@ -28,12 +28,12 @@ 3.1.1 2.1.4 32.0.1-jre - 5.3.2 + 6.0.0 1.5 1.0.8 - 3.23.3 + 3.25.0 5.1.0 - 3.0.2 + 3.0.3 0.10.2 1.70 2.11.0