From 35c439cc6fbb3902abc6904280571306cc232613 Mon Sep 17 00:00:00 2001
From: wulingxiao <1251605638@qqcom>
Date: Fri, 19 Aug 2022 21:30:03 +0800
Subject: [PATCH] =?UTF-8?q?optimize=EF=BC=9Aoptimize=20config=20module=20c?=
 =?UTF-8?q?ode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spring-cloud-tencent-dependencies/pom.xml       |  1 -
 .../pom.xml                                     | 17 +++++------------
 .../PolarisStatPushGatewayProperties.java       |  4 ++--
 ...dditional-spring-configuration-metadata.json |  4 ++--
 spring-cloud-tencent-rpc-enhancement/pom.xml    |  5 -----
 5 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index bfae46a0b..46379fe35 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -79,7 +79,6 @@
 		<protobuf-java.version>3.16.1</protobuf-java.version>
 		<bcprov-jdk15on.version>1.69</bcprov-jdk15on.version>
 		<guava.version>31.0.1-jre</guava.version>
-		<pushgateway.version>0.12.0</pushgateway.version>
 
 		<!-- Maven Plugin Versions -->
 		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/pom.xml b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/pom.xml
index 7ad4982e9..b6650d682 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/pom.xml
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/pom.xml
@@ -21,18 +21,11 @@
             <groupId>com.tencent.cloud</groupId>
             <artifactId>spring-cloud-tencent-polaris-context</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
-            <version>2.6.10</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.21.0</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/java/com/tencent/cloud/plugin/pushgateway/PolarisStatPushGatewayProperties.java b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/java/com/tencent/cloud/plugin/pushgateway/PolarisStatPushGatewayProperties.java
index d9aaa01d5..b2db8833c 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/java/com/tencent/cloud/plugin/pushgateway/PolarisStatPushGatewayProperties.java
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/java/com/tencent/cloud/plugin/pushgateway/PolarisStatPushGatewayProperties.java
@@ -39,12 +39,12 @@ public class PolarisStatPushGatewayProperties {
 	private String address;
 
 	/**
-	 * Service.
+	 * Service for pushGateway.
 	 */
 	private String service;
 
 	/**
-	 * Namespace.
+	 * Namespace for pushGateway.
 	 */
 	private String namespace;
 
diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 09acc1c36..d1fb8e4f3 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -16,7 +16,7 @@
     {
       "name": "spring.cloud.polaris.stat.pushgateway.namespace",
       "type": "java.lang.String",
-      "description": "Namespace.",
+      "description": "Namespace for pushGateway.",
       "sourceType": "com.tencent.cloud.plugin.pushgateway.PolarisStatPushGatewayProperties"
     },
     {
@@ -28,7 +28,7 @@
     {
       "name": "spring.cloud.polaris.stat.pushgateway.service",
       "type": "java.lang.String",
-      "description": "Service.",
+      "description": "Service for pushGateway.",
       "sourceType": "com.tencent.cloud.plugin.pushgateway.PolarisStatPushGatewayProperties"
     }
   ]
diff --git a/spring-cloud-tencent-rpc-enhancement/pom.xml b/spring-cloud-tencent-rpc-enhancement/pom.xml
index e15674c47..e311cbff0 100644
--- a/spring-cloud-tencent-rpc-enhancement/pom.xml
+++ b/spring-cloud-tencent-rpc-enhancement/pom.xml
@@ -69,11 +69,6 @@
 			<artifactId>mockito-inline</artifactId>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_pushgateway</artifactId>
-		</dependency>
 	</dependencies>
 
 </project>
\ No newline at end of file