test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ci: spring boot version spring cloud version

This commit is contained in:
CaptainB 2023-12-07 09:28:18 +08:00 committed by 刘瑞斌
parent f2506f047b
commit 93481bec20
6 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framework/eureka/pom.xml
View File

@ -24,18 +24,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>

13
framework/gateway/pom.xml
View File

@ -25,19 +25,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
</exclusion>
<!-- http2 配置-->
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>

1
framework/gateway/src/main/java/io/metersphere/gateway/filter/LoginFilter.java
View File

@ -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;

14
framework/sdk-parent/sdk/pom.xml
View File

@ -109,19 +109,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- http2 配置-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>

1
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/NodeResourcePoolService.java
View File

@ -41,7 +41,6 @@ public class NodeResourcePoolService {
HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
httpRequestFactory.setConnectionRequestTimeout(2000);
httpRequestFactory.setConnectTimeout(2000);
httpRequestFactory.setReadTimeout(1000);
restTemplateWithTimeOut.setRequestFactory(httpRequestFactory);
}

10
pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.5</version>
<version>3.2.0</version>
<relativePath/>
</parent>
@ -20,7 +20,7 @@
<properties>
<revision>2.10</revision>
<java.version>17</java.version>
<spring-cloud.version>2022.0.4</spring-cloud.version>
<spring-cloud.version>2023.0.0</spring-cloud.version>
<dubbo.version>2.7.22</dubbo.version>
<platform-plugin-sdk.version>1.6.0</platform-plugin-sdk.version>
<shiro.version>1.13.0</shiro.version>
@ -28,12 +28,12 @@
<easyexcel.version>3.1.1</easyexcel.version>
<dom4j.version>2.1.4</dom4j.version>
<guava.version>32.0.1-jre</guava.version>
<pagehelper.version>5.3.2</pagehelper.version>
<pagehelper.version>6.0.0</pagehelper.version>
<metersphere-jmeter-functions.version>1.5</metersphere-jmeter-functions.version>
<quartz-starter.version>1.0.8</quartz-starter.version>
<redisson-starter.version>3.23.3</redisson-starter.version>
<redisson-starter.version>3.25.0</redisson-starter.version>
<guice.version>5.1.0</guice.version>
<mybatis-starter.version>3.0.2</mybatis-starter.version>
<mybatis-starter.version>3.0.3</mybatis-starter.version>
<reflections.version>0.10.2</reflections.version>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
<commons-io.version>2.11.0</commons-io.version>