From 6a53cfdd7daff6d5de00e1cf1e68590ec0a43720 Mon Sep 17 00:00:00 2001
From: yangjuanying <531948963@qq.com>
Date: Wed, 26 Jul 2023 18:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E6=88=96-D?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E5=8C=97=E6=9E=81=E6=98=9F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/config/PolarisConfigProperties.java     |  9 +++++++--
 .../context/config/PolarisContextProperties.java   | 14 ++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/config/PolarisConfigProperties.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/config/PolarisConfigProperties.java
index 50e8fde54..b3e44abe6 100644
--- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/config/PolarisConfigProperties.java
+++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/config/PolarisConfigProperties.java
@@ -20,10 +20,11 @@ package com.tencent.cloud.polaris.config.config;
 
 import java.util.List;
 
-import com.tencent.cloud.polaris.config.enums.RefreshType;
-
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import com.tencent.cloud.polaris.config.enums.RefreshType;
+
 /**
  * polaris config module bootstrap configs.
  *
@@ -35,22 +36,26 @@ public class PolarisConfigProperties {
 	/**
 	 * Whether to open the configuration center.
 	 */
+    @Value("${spring.cloud.polaris.config.enabled:#{'true'}}")
 	private boolean enabled = true;
 
 	/**
 	 * Configuration center service address list.
 	 */
+	@Value("${spring.cloud.polaris.config.address:}")
 	private String address;
 
 	/**
 	 * Polaris config grpc port.
 	 */
+	@Value("${spring.cloud.polaris.config.port:#{'8093'}}")
 	private int port = 8093;
 
 	/**
 	 * Whether to automatically update to the spring context when the configuration file.
 	 * is updated
 	 */
+	@Value("${spring.cloud.polaris.config.autoRefresh:#{'true'}}")
 	private boolean autoRefresh = true;
 
 	private boolean shutdownIfConnectToConfigServerFailed = true;
diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java
index 7bde159b3..e4544e3a0 100644
--- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java
+++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java
@@ -24,15 +24,16 @@ import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.CollectionUtils;
+
 import com.tencent.cloud.polaris.context.PolarisConfigModifier;
 import com.tencent.polaris.api.config.ConfigProvider;
 import com.tencent.polaris.api.config.Configuration;
 import com.tencent.polaris.factory.ConfigAPIFactory;
 import com.tencent.polaris.factory.config.ConfigurationImpl;
-import org.apache.commons.lang.StringUtils;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.util.CollectionUtils;
 
 /**
  * Properties for Polaris {@link com.tencent.polaris.client.api.SDKContext}.
@@ -45,26 +46,31 @@ public class PolarisContextProperties {
 	/**
 	 * polaris server address.
 	 */
+    @Value("${spring.cloud.polaris.address:}")
 	private String address;
 
 	/**
 	 * current server local ip address.
 	 */
+    @Value("${spring.cloud.polaris.localIpAddress:}")
 	private String localIpAddress;
 
 	/**
 	 * current server local port.
 	 */
+	@Value("${spring.cloud.polaris.localPort:}")
 	private Integer localPort;
 
 	/**
 	 * If polaris enabled.
 	 */
+	@Value("${spring.cloud.polaris.enabled:#{'true'}}")
 	private Boolean enabled;
 
 	/**
 	 * polaris namespace.
 	 */
+	@Value("${spring.cloud.polaris.namespace:#{'default'}}")
 	private String namespace = "default";
 
 	/**