From 1f258674c57bb0e754cc79fbea297222629f64bf Mon Sep 17 00:00:00 2001
From: Fishtail <49390359+fuyuwei01@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:23:59 +0800
Subject: [PATCH] fix:fix app starting failed when user using custom OpenAPI
 bean. (#1414)

Co-authored-by: Haotian Zhang <skyebefreeman@qq.com>
---
 CHANGELOG.md                                                  | 1 +
 pom.xml                                                       | 2 +-
 .../polaris/contract/config/PolarisContractProperties.java    | 2 +-
 .../contract/config/PolarisSwaggerAutoConfiguration.java      | 1 +
 .../cloud/polaris/contract/tsf/TsfContractProperties.java     | 2 +-
 spring-cloud-tencent-dependencies/pom.xml                     | 4 ++--
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 316283464..3415f8dab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,3 +23,4 @@
 - [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1411)
 - [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1412)
 - [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1413)
+- [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1414)
diff --git a/pom.xml b/pom.xml
index 07c37c265..09470505f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-2023.0.0-RC2</revision>
+		<revision>2.0.0.0-2023.0.0-RC2</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>6.1.6</spring.framework.version>
diff --git a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java
index 0fdc0a1d4..3f698288d 100644
--- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java
+++ b/spring-cloud-starter-tencent-polaris-contract/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/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java
index 885c9ffd8..72174143b 100644
--- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java
+++ b/spring-cloud-starter-tencent-polaris-contract/src/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/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java
index 74e48d801..64cd71051 100644
--- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java
+++ b/spring-cloud-starter-tencent-polaris-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
index 59aeffbe0..84b29b4f0 100644
--- 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-2023.0.0-RC2</revision>
+		<revision>2.0.0.0-2023.0.0-RC2</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>