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

revert: spring boot version spring cloud 还没升级 

This reverts commit 2f0445cbb7.
This commit is contained in:
CaptainB 2023-11-28 11:50:41 +08:00
parent 2f0445cbb7
commit 7b4bfb0756
5 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framework/eureka/pom.xml
View File

@ -24,7 +24,18 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId> <artifactId>spring-boot-starter-jetty</artifactId>
</dependency> </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> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>

13
framework/gateway/pom.xml
View File

@ -25,6 +25,19 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId> <artifactId>spring-boot-starter-jetty</artifactId>
</exclusion> </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> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId> <artifactId>spring-boot-starter-mail</artifactId>

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

@ -109,7 +109,19 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId> <artifactId>spring-boot-starter-websocket</artifactId>
</dependency> </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> <dependency>
<groupId>org.redisson</groupId> <groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId> <artifactId>redisson-spring-boot-starter</artifactId>

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

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

6
pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.0</version> <version>3.1.5</version>
<relativePath/> <relativePath/>
</parent> </parent>
@ -28,12 +28,12 @@
<easyexcel.version>3.1.1</easyexcel.version> <easyexcel.version>3.1.1</easyexcel.version>
<dom4j.version>2.1.4</dom4j.version> <dom4j.version>2.1.4</dom4j.version>
<guava.version>32.0.1-jre</guava.version> <guava.version>32.0.1-jre</guava.version>
<pagehelper.version>6.0.0</pagehelper.version> <pagehelper.version>5.3.2</pagehelper.version>
<metersphere-jmeter-functions.version>1.5</metersphere-jmeter-functions.version> <metersphere-jmeter-functions.version>1.5</metersphere-jmeter-functions.version>
<quartz-starter.version>1.0.8</quartz-starter.version> <quartz-starter.version>1.0.8</quartz-starter.version>
<redisson-starter.version>3.23.3</redisson-starter.version> <redisson-starter.version>3.23.3</redisson-starter.version>
<guice.version>5.1.0</guice.version> <guice.version>5.1.0</guice.version>
<mybatis-starter.version>3.0.3</mybatis-starter.version> <mybatis-starter.version>3.0.2</mybatis-starter.version>
<reflections.version>0.10.2</reflections.version> <reflections.version>0.10.2</reflections.version>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version> <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
<commons-io.version>2.11.0</commons-io.version> <commons-io.version>2.11.0</commons-io.version>