fix:fix app starting failed when user using custom OpenAPI bean. (#1330)

Tencent · Jul 2, 2024 · 098b709 · 098b709
1 parent 7a59918
commit 098b709
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,4 +21,5 @@
 - [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1319)
 - [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1322)
 - [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1324)
-- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1329)
+- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1329)
+- [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1330)
diff --git a/pom.xml b/pom.xml
@@ -89,13 +89,13 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-2022.0.5-SNAPSHOT</revision>
+		<revision>2.0.0.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
-		<spring.framework.version>6.0.17</spring.framework.version>
+		<spring.framework.version>6.0.22</spring.framework.version>
 
 		<!-- Spring Boot -->
-		<spring.boot.version>3.1.8</spring.boot.version>
+		<spring.boot.version>3.1.12</spring.boot.version>
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>2022.0.5</spring.cloud.version>

diff --git a/...ct/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java b/...ct/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java
@@ -46,7 +46,7 @@ public class PolarisContractProperties implements ContractProperties {
 	/**
 	 * Group to create swagger docket.
 	 */
-	private String group = "default";
+	private String group = "polaris";
 	/**
 	 * Base paths to be scanned. Split by ",".
 	 */

diff --git a/.../main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java b/.../main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java
@@ -83,6 +83,7 @@ public GroupedOpenApi polarisGroupedOpenApi(PolarisContractProperties polarisCon
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public OpenAPI polarisOpenAPI() {
 		return new OpenAPI()
 				.info(new Info()

diff --git a/...-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java b/...-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java
@@ -39,7 +39,7 @@ public class TsfContractProperties implements ExtendedContractProperties {
 	@Value("${tsf.swagger.enabled:true}")
 	private boolean enabled;
 
-	@Value("${tsf.swagger.group:default}")
+	@Value("${tsf.swagger.group:polaris}")
 	private String groupName;
 
 	@Value("${tsf.swagger.basePath:/**}")

diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
@@ -71,10 +71,10 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-2022.0.5-SNAPSHOT</revision>
+		<revision>2.0.0.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Polaris SDK version -->
-		<polaris.version>1.15.8-SNAPSHOT</polaris.version>
+		<polaris.version>2.0.0.0-SNAPSHOT</polaris.version>
 
 		<!-- Dependencies -->
 		<guava.version>32.0.1-jre</guava.version>