feat: Upgrade to Spring Cloud 2025.0.2.

Co-Authored-By: Claude-Opus-4.7 (1M) <noreply@anthropic.com> Signed-off-by: Haotian Zhang <928016560@qq.com>
3 months ago · 7ce7f45868
parent 68253fd2c7
commit 7ce7f45868
38 changed files with 62 additions and 53 deletions
--- a/.github/workflows/junit.yml
+++ b/.github/workflows/junit.yml
@ -3,6 +3,7 @@ name: Junit Test
 on:
  push:
    branches:
+      - 2025.0
      - 2024
      - 2023
      - 2022
@ -15,6 +16,7 @@ on:
      - '**.md'
  pull_request:
    branches:
+      - 2025.0
      - 2024
      - 2023
      - 2022
@ -41,7 +43,9 @@ jobs:
             branch_name=${{ github.base_ref }}
          fi
          echo $branch_name
-          if [[ "$branch_name" == "2024" ]]; then
+          if [[ "$branch_name" == "2025.0" ]]; then
+            echo "jdks=[17,21,25]" >> $GITHUB_OUTPUT
+          elif [[ "$branch_name" == "2024" ]]; then
            echo "jdks=[17,21]" >> $GITHUB_OUTPUT
          elif [[ "$branch_name" == "2023" ]]; then
            echo "jdks=[17,21]" >> $GITHUB_OUTPUT
--- a/.github/workflows/license-checker.yml
+++ b/.github/workflows/license-checker.yml
@ -3,6 +3,7 @@ name: License checker
 on:
  push:
    branches:
+      - 2025.0
      - 2024
      - 2023
      - 2022
@ -15,6 +16,7 @@ on:
      - '**.md'
  pull_request:
    branches:
+      - 2025.0
      - 2024
      - 2023
      - 2022
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@ -3,6 +3,7 @@ name: Snapshot
 on:
  push:
    branches:
+      - 2025.0
      - 2024
      - 2023
      - 2022
@ -41,7 +42,9 @@ jobs:
        id: set-jdk
        run: |
          shopt -s nocasematch
-          if [[ "${{ github.ref_name }}" == "2024" ]]; then
+          if [[ "${{ github.ref_name }}" == "2025.0" ]]; then
+            echo "jdk=17" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.ref_name }}" == "2024" ]]; then
            echo "jdk=17" >> $GITHUB_OUTPUT
          elif [[ "${{ github.ref_name }}" == "2023" ]]; then
            echo "jdk=17" >> $GITHUB_OUTPUT
--- a/README-zh.md
+++ b/README-zh.md
@ -5,8 +5,8 @@
 [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)

-[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml/badge.svg?branch=2024)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml)
-[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2024/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2024)
+[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml/badge.svg?branch=2025.0)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml)
+[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2025.0/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2025.0)

 [English](./README.md) | 简体中文

--- a/README.md
+++ b/README.md
@ -5,8 +5,8 @@
 [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)

-[![Junit Test](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml/badge.svg?branch=2024)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml)
-[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2024/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2024)
+[![Junit Test](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml/badge.svg?branch=2025.0)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml)
+[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2025.0/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2025.0)

 English | [简体中文](./README-zh.md)

--- a/pom.xml
+++ b/pom.xml
@ -16,7 +16,7 @@
 	<version>${revision}</version>
 	<name>Spring Cloud Tencent</name>
 	<description>Spring Cloud Tencent</description>
-	<url>https://github.com/Tencent/spring-cloud-tencent/tree/2024</url>
+	<url>https://github.com/Tencent/spring-cloud-tencent/tree/2025.0</url>

 	<organization>
 		<name>Tencent</name>
@ -26,7 +26,7 @@
 	<licenses>
 		<license>
 			<name>The BSD 3-Clause License (BSD3)</name>
-			<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2024/LICENSE</url>
+			<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2025.0/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@ -90,16 +90,16 @@

 	<properties>
 		<!-- Project revision -->
-		<revision>2.1.2.0-2024.0.3-SNAPSHOT</revision>
+		<revision>2.1.2.0-2025.0.2-SNAPSHOT</revision>

 		<!-- Spring Framework -->
 		<spring.framework.version>6.2.15</spring.framework.version>

 		<!-- Spring Boot -->
-		<spring.boot.version>3.4.12</spring.boot.version>
+		<spring.boot.version>3.5.11</spring.boot.version>

 		<!-- Spring Cloud -->
-		<spring.cloud.version>2024.0.3</spring.cloud.version>
+		<spring.cloud.version>2025.0.2</spring.cloud.version>

 		<!-- Test -->
 		<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
--- a/spring-cloud-starter-tencent-metadata-transfer/pom.xml
+++ b/spring-cloud-starter-tencent-metadata-transfer/pom.xml
@ -23,7 +23,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway</artifactId>
+			<artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
 			<optional>true</optional>
 		</dependency>

--- a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilterTest.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilterTest.java
@ -46,7 +46,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 		classes = DecodeTransferMetadataServletFilterTest.TestApplication.class,
 		properties = {"spring.config.location = classpath:application-test.yml",
 				"spring.main.web-application-type = servlet",
-				"spring.cloud.gateway.enabled = false"})
+				"spring.cloud.gateway.server.webflux.enabled = false"})
 public class DecodeTransferMetadataServletFilterTest {

 	@Autowired
--- a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java
@ -49,7 +49,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 		classes = EncodeTransferMedataFeignInterceptorTest.TestApplication.class,
 		properties = {"server.port=48081", "spring.config.location = classpath:application-test.yml",
 				"spring.main.web-application-type = servlet",
-				"spring.cloud.gateway.enabled = false"})
+				"spring.cloud.gateway.server.webflux.enabled = false"})
 public class EncodeTransferMedataFeignInterceptorTest {

 	@Autowired
--- a/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml
@ -40,7 +40,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway</artifactId>
+			<artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
 			<optional>true</optional>
 		</dependency>

--- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/GatewayPolarisCircuitBreakerAutoConfiguration.java
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/GatewayPolarisCircuitBreakerAutoConfiguration.java
@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration;
 * @author seanyu 2023-02-27
 */
@Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true)
+@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.enabled", matchIfMissing = true)
@ConditionalOnClass(name = {"org.springframework.web.reactive.DispatcherHandler", "org.springframework.cloud.gateway.config.GatewayAutoConfiguration"})
 public class GatewayPolarisCircuitBreakerAutoConfiguration {

--- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/LosslessConfigModifierTest.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/LosslessConfigModifierTest.java
@ -44,7 +44,7 @@ public class LosslessConfigModifierTest {
 			.withPropertyValues("spring.cloud.polaris.admin.port=20000")
 			.withPropertyValues("spring.cloud.polaris.lossless.delayRegisterInterval=10")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	private final ApplicationContextRunner healthCheckContextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(TestApplication.class))
@ -55,14 +55,14 @@ public class LosslessConfigModifierTest {
 			.withPropertyValues("spring.cloud.polaris.lossless.healthCheckPath=/xxx")
 			.withPropertyValues("spring.cloud.polaris.lossless.healthCheckInterval=5")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");
 	private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(TestApplication.class))
 			.withPropertyValues("spring.cloud.nacos.discovery.enabled=false")
 			.withPropertyValues("spring.cloud.polaris.enabled=true")
 			.withPropertyValues("spring.cloud.polaris.lossless.enabled=false")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	@BeforeEach
 	void setUp() {
--- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/WarmupConfigModifierTest.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/WarmupConfigModifierTest.java
@ -42,14 +42,14 @@ public class WarmupConfigModifierTest {
 			.withPropertyValues("spring.cloud.polaris.enabled=true")
 			.withPropertyValues("spring.cloud.polaris.warmup.enabled=true")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");
 	private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(TestApplication.class))
 			.withPropertyValues("spring.cloud.nacos.discovery.enabled=false")
 			.withPropertyValues("spring.cloud.polaris.enabled=true")
 			.withPropertyValues("spring.cloud.polaris.warmup.enabled=false")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	@BeforeEach
 	void setUp() {
--- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/refresh/ServiceInstanceChangeCallbackTest.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/refresh/ServiceInstanceChangeCallbackTest.java
@ -45,7 +45,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 		classes = ServiceInstanceChangeCallbackTest.TestApplication.class,
 		properties = {"spring.config.location = classpath:application-test.yml",
 				"spring.main.web-application-type = servlet",
-				"spring.cloud.gateway.enabled = false"})
+				"spring.cloud.gateway.server.webflux.enabled = false"})
 public class ServiceInstanceChangeCallbackTest {

 	@Autowired
--- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/feign/FeignEagerLoadContextInitializerTest.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/feign/FeignEagerLoadContextInitializerTest.java
@ -68,7 +68,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 				"server.port=48085",
 				"spring.config.location = classpath:application-test.yml",
 				"spring.main.web-application-type = servlet",
-				"spring.cloud.gateway.enabled = false",
+				"spring.cloud.gateway.server.webflux.enabled = false",
 				"spring.cloud.polaris.discovery.eager-load.enabled = true",
 				"spring.cloud.polaris.discovery.eager-load.feign.enabled = true",
 				"spring.cloud.loadbalancer.eager-load.enabled = true",
--- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/loadbalancer/PolarisLoadBalancerEagerContextInitializerTest.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/loadbalancer/PolarisLoadBalancerEagerContextInitializerTest.java
@ -56,7 +56,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 				"server.port=48086",
 				"spring.config.location = classpath:application-test.yml",
 				"spring.main.web-application-type = servlet",
-				"spring.cloud.gateway.enabled = false",
+				"spring.cloud.gateway.server.webflux.enabled = false",
 				"spring.cloud.polaris.discovery.eager-load.enabled = true",
 				"spring.cloud.loadbalancer.eager-load.enabled = true",
 				"spring.cloud.loadbalancer.eager-load.clients = test-service-1,test-service-2,test-service-3"
--- a/spring-cloud-starter-tencent-polaris-router/pom.xml
+++ b/spring-cloud-starter-tencent-polaris-router/pom.xml
@ -36,7 +36,7 @@
 		<!-- spring cloud gateway dependencies start -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-gateway-server</artifactId>
+			<artifactId>spring-cloud-gateway-server-webflux</artifactId>
 			<optional>true</optional>
 		</dependency>

@ -50,7 +50,7 @@
 		<!-- spring cloud gateway mvc dependencies start -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-gateway-server-mvc</artifactId>
+			<artifactId>spring-cloud-gateway-server-webmvc</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<!-- spring cloud gateway mvc dependencies end -->
--- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java
+++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java
@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock;
 */
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = RouterLabelFeignInterceptorTest.TestApplication.class,
-		properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.cloud.gateway.enabled=false"})
+		properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.cloud.gateway.server.webflux.enabled=false"})
 public class RouterLabelFeignInterceptorTest {

 	@Test
--- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java
+++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java
@ -55,7 +55,7 @@ import static org.mockito.Mockito.when;
 */
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = RouterLabelRestTemplateInterceptorTest.TestApplication.class,
-		properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.cloud.gateway.enabled=false"})
+		properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.cloud.gateway.server.webflux.enabled=false"})
 public class RouterLabelRestTemplateInterceptorTest {

 	@Mock
--- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scg/RouterLabelGlobalFilterTest.java
+++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scg/RouterLabelGlobalFilterTest.java
@ -45,7 +45,7 @@ import static org.springframework.cloud.gateway.filter.ReactiveLoadBalancerClien
 */
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = RouterLabelGlobalFilterTest.TestApplication.class,
-		properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.main.web-application-type=reactive", "spring.cloud.gateway.mvc.enabled=false"})
+		properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.main.web-application-type=reactive", "spring.cloud.gateway.server.webmvc.enabled=false"})
 public class RouterLabelGlobalFilterTest {

 	@Test
--- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scgmvc/RouterLabelMvcFilterTest.java
+++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scgmvc/RouterLabelMvcFilterTest.java
@ -47,7 +47,7 @@ import static org.springframework.cloud.gateway.server.mvc.filter.FormFilter.FOR
 */
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = RouterLabelMvcFilterTest.TestApplication.class,
-		properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.main.web-application-type=servlet", "spring.cloud.gateway.enabled=false"})
+		properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.main.web-application-type=servlet", "spring.cloud.gateway.server.webflux.enabled=false"})
 public class RouterLabelMvcFilterTest {

 	@Test
--- a/spring-cloud-tencent-commons/pom.xml
+++ b/spring-cloud-tencent-commons/pom.xml
@ -65,7 +65,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway</artifactId>
+			<artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
 			<optional>true</optional>
 		</dependency>

--- a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/OkHttpUtilTest.java
+++ b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/OkHttpUtilTest.java
@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 		properties = {
 			"spring.application.name=test",
 			"spring.cloud.polaris.discovery.register=false",
-			"spring.cloud.gateway.enabled=false"
+			"spring.cloud.gateway.server.webflux.enabled=false"
 		})
 public class OkHttpUtilTest {

--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
-		<version>4.2.4</version>
+		<version>4.3.3</version>
 		<relativePath/>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@ -16,7 +16,7 @@
 	<packaging>pom</packaging>
 	<name>Spring Cloud Tencent Dependencies</name>
 	<description>Spring Cloud Tencent Dependencies</description>
-	<url>https://github.com/Tencent/spring-cloud-tencent/tree/2024</url>
+	<url>https://github.com/Tencent/spring-cloud-tencent/tree/2025.0</url>

 	<organization>
 		<name>Tencent</name>
@ -26,7 +26,7 @@
 	<licenses>
 		<license>
 			<name>The BSD 3-Clause License (BSD3)</name>
-			<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2024/LICENSE</url>
+			<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2025.0/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@ -71,7 +71,7 @@

 	<properties>
 		<!-- Project revision -->
-		<revision>2.1.2.0-2024.0.3-SNAPSHOT</revision>
+		<revision>2.1.2.0-2025.0.2-SNAPSHOT</revision>

 		<!-- Polaris SDK version -->
 		<polaris.version>2.1.2.0-SNAPSHOT</polaris.version>
--- a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml
+++ b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml
@ -25,7 +25,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway</artifactId>
+			<artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
 		</dependency>
 	</dependencies>

--- a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-mvc-service/pom.xml
+++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-mvc-service/pom.xml
@ -21,7 +21,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway-mvc</artifactId>
+			<artifactId>spring-cloud-starter-gateway-server-webmvc</artifactId>
 		</dependency>

 	</dependencies>
--- a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/pom.xml
+++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/pom.xml
@ -21,7 +21,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway</artifactId>
+			<artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
 		</dependency>
 	</dependencies>
 </project>
--- a/spring-cloud-tencent-examples/tsf-example/msgw-scg/pom.xml
+++ b/spring-cloud-tencent-examples/tsf-example/msgw-scg/pom.xml
@ -21,7 +21,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway</artifactId>
+			<artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
 		</dependency>

 		<dependency>
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/pom.xml
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/pom.xml
@ -32,7 +32,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-gateway-server</artifactId>
+			<artifactId>spring-cloud-gateway-server-webflux</artifactId>
 			<optional>true</optional>
 		</dependency>

--- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/GatewayPluginAutoConfigurationTest.java
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/GatewayPluginAutoConfigurationTest.java
@ -56,7 +56,7 @@ class GatewayPluginAutoConfigurationTest {
 					GatewayPluginAutoConfiguration.class
 			))
 			.withPropertyValues(
-					"spring.cloud.gateway.enabled=false", // not needed for this test
+					"spring.cloud.gateway.server.webflux.enabled=false", // not needed for this test
 					"spring.cloud.tencent.plugin.scg.enabled=true",
 					"spring.cloud.tencent.plugin.scg.context.enabled=true",
 					"spring.cloud.tencent.gateway.routes.test_group.uri=lb://test-group"
--- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/config/location/PolarisLocationConfigModifierTest.java
+++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/config/location/PolarisLocationConfigModifierTest.java
@ -43,14 +43,14 @@ class PolarisLocationConfigModifierTest {
 			.withPropertyValues("spring.cloud.polaris.enabled=true")
 			.withPropertyValues("spring.cloud.polaris.location.cloud.enabled=true")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner()
 			.withUserConfiguration(TestApplication.class)
 			.withPropertyValues("spring.cloud.polaris.enabled=true")
 			.withPropertyValues("spring.cloud.polaris.location.cloud.enabled=false")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	@BeforeEach
 	void setUp() {
--- a/spring-cloud-tencent-rpc-enhancement/pom.xml
+++ b/spring-cloud-tencent-rpc-enhancement/pom.xml
@ -55,7 +55,7 @@

 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-gateway-server</artifactId>
+			<artifactId>spring-cloud-gateway-server-webflux</artifactId>
 			<optional>true</optional>
 		</dependency>

--- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java
+++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java
@ -49,7 +49,7 @@ public class RpcEnhancementAutoConfigurationTest {
 					RpcEnhancementAutoConfiguration.class,
 					PolarisRestTemplateAutoConfigurationTester.class,
 					FeignLoadBalancerAutoConfiguration.class))
-			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true", "spring.application.name=test", "spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true", "spring.application.name=test", "spring.cloud.gateway.server.webflux.enabled=false");

 	@Test
 	public void testDefaultInitialization() {
--- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementPropertiesTest.java
+++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementPropertiesTest.java
@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = RpcEnhancementPropertiesTest.TestApplication.class, properties = {
 		"spring.application.name=test",
-		"spring.cloud.gateway.enabled=false",
+		"spring.cloud.gateway.server.webflux.enabled=false",
 		"spring.cloud.tencent.rpc-enhancement=true",
 		"spring.cloud.tencent.rpc-enhancement.ignore-body=false"
 })
--- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementReporterPropertiesTest.java
+++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementReporterPropertiesTest.java
@ -40,7 +40,7 @@ import static org.springframework.http.HttpStatus.Series.SERVER_ERROR;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = RpcEnhancementReporterPropertiesTest.TestApplication.class, properties = {
 		"spring.application.name=test",
-		"spring.cloud.gateway.enabled=false",
+		"spring.cloud.gateway.server.webflux.enabled=false",
 		"spring.cloud.tencent.rpc-enhancement.reporter=true"
 })
@ActiveProfiles("test")
--- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClientTest.java
+++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClientTest.java
@ -59,7 +59,7 @@ import static org.mockito.Mockito.mock;
 */
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = EnhancedFeignClientTest.TestApplication.class,
-		properties = {"spring.cloud.polaris.namespace=Test", "spring.cloud.polaris.service=TestApp", "spring.cloud.gateway.enabled=false"})
+		properties = {"spring.cloud.polaris.namespace=Test", "spring.cloud.polaris.service=TestApp", "spring.cloud.gateway.server.webflux.enabled=false"})
 public class EnhancedFeignClientTest {

 	@Autowired
--- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java
+++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java
@ -45,7 +45,7 @@ public class PolarisStatPropertiesTest {
 			.withPropertyValues("spring.cloud.polaris.stat.pushgateway.service=test-service")
 			.withPropertyValues("spring.cloud.polaris.stat.pushgateway.push-interval=1000")
 			.withPropertyValues("spring.cloud.polaris.stat.pushgateway.override-host=127.0.0.1")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	@Test
 	public void testDefaultInitialization() {
--- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifierTest.java
+++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifierTest.java
@ -45,7 +45,7 @@ public class StatConfigModifierTest {
 			.withPropertyValues("spring.cloud.polaris.stat.port=20000")
 			.withPropertyValues("spring.cloud.polaris.stat.path=/xxx")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	private final ApplicationContextRunner pushContextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(TestApplication.class))
@ -59,14 +59,14 @@ public class StatConfigModifierTest {
 			.withPropertyValues("spring.cloud.polaris.stat.pushgateway.service=test-service")
 			.withPropertyValues("spring.cloud.polaris.stat.pushgateway.override-host=127.0.0.1")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(TestApplication.class))
 			.withPropertyValues("spring.cloud.polaris.enabled=true")
 			.withPropertyValues("spring.cloud.polaris.stat.enabled=false")
 			.withPropertyValues("spring.application.name=test")
-			.withPropertyValues("spring.cloud.gateway.enabled=false");
+			.withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false");

 	@BeforeEach
 	void setUp() {