From 0e07140dac69e931b2e75571580faffa90e1c7fb Mon Sep 17 00:00:00 2001
From: yangmuyi <1791500400@qq.com>
Date: Fri, 5 Jan 2024 17:16:03 +0800
Subject: [PATCH] fix: Fixed conflicts between flink-table-planner-loader and
 flink-table-planner_ fix: Fixed an IP issue where doris connection could not
 get 1.x-2.x versions of BE correctly

---
 chunjun-clients/pom.xml                       |  8 +++----
 .../doris/rest/module/BackendRow.java         |  2 +-
 pom.xml                                       | 22 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/chunjun-clients/pom.xml b/chunjun-clients/pom.xml
index 6b02aa0f12..7a64a80620 100755
--- a/chunjun-clients/pom.xml
+++ b/chunjun-clients/pom.xml
@@ -226,10 +226,10 @@
 			<artifactId>flink-clients</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-table-planner-loader</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.apache.flink</groupId>-->
+<!--			<artifactId>flink-table-planner-loader</artifactId>-->
+<!--		</dependency>-->
 		<!-- flink dependency end -->
 
 	</dependencies>
diff --git a/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/BackendRow.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/BackendRow.java
index 8b00611376..7b474e496a 100644
--- a/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/BackendRow.java
+++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/BackendRow.java
@@ -29,7 +29,7 @@ public class BackendRow {
     @JsonProperty(value = "HttpPort")
     private String HttpPort;
 
-    @JsonProperty(value = "IP")
+    @JsonProperty(value = "Host")
     private String IP;
 
     @JsonProperty(value = "Alive")
diff --git a/pom.xml b/pom.xml
index 5ce3ae4940..3576db2132 100755
--- a/pom.xml
+++ b/pom.xml
@@ -808,17 +808,17 @@
 				</exclusions>
 			</dependency>
 
-			<dependency>
-				<groupId>org.apache.flink</groupId>
-				<artifactId>flink-table-planner-loader</artifactId>
-				<version>${flink.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>slf4j-api</artifactId>
-						<groupId>org.slf4j</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
+<!--			<dependency>-->
+<!--				<groupId>org.apache.flink</groupId>-->
+<!--				<artifactId>flink-table-planner-loader</artifactId>-->
+<!--				<version>${flink.version}</version>-->
+<!--				<exclusions>-->
+<!--					<exclusion>-->
+<!--						<artifactId>slf4j-api</artifactId>-->
+<!--						<groupId>org.slf4j</groupId>-->
+<!--					</exclusion>-->
+<!--				</exclusions>-->
+<!--			</dependency>-->
 			<!-- ***************** flink end *****************-->
 		</dependencies>
 	</dependencyManagement>