From 07a17ff9d441de06fee372ef6b26c4a2dd7edd12 Mon Sep 17 00:00:00 2001
From: shedfreewu <shedfreewu@tencent.com>
Date: Thu, 17 Jul 2025 20:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=20bootstrap=20=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20application.yml=20?=
 =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/polaris/extend/consul/ConsulDiscoveryUtil.java | 2 +-
 .../cloud/polaris/registry/PolarisServiceRegistry.java   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulDiscoveryUtil.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulDiscoveryUtil.java
index 3bfba0fa4..9a29e6481 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulDiscoveryUtil.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulDiscoveryUtil.java
@@ -65,7 +65,7 @@ public final class ConsulDiscoveryUtil {
 		if (StringUtils.isNotBlank(appName)) {
 			return appName;
 		}
-		return env.getProperty("spring.application.name", "application");
+		return env.getProperty("spring.application.name");
 	}
 
 	public static String getInstanceId(ConsulDiscoveryProperties properties, ApplicationContext context) {
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
index a5ed8373f..0a823a9db 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ScheduledExecutorService;
 
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.metadata.StaticMetadataManager;
+import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
 import com.tencent.cloud.common.util.OkHttpUtil;
 import com.tencent.cloud.common.util.OtUtils;
 import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
@@ -101,12 +102,16 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 	@Override
 	public void register(PolarisRegistration registration) {
 
-		if (StringUtils.isBlank(registration.getServiceId())) {
+		String serviceId = registration.getServiceId();
+		if (StringUtils.isBlank(serviceId)) {
+			serviceId = ApplicationContextAwareUtils.getProperties("spring.application.name");
+		}
+
+		if (StringUtils.isBlank(serviceId)) {
 			LOGGER.warn("No service to register for polaris client...");
 			return;
 		}
 		registration.customize();
-		String serviceId = registration.getServiceId();
 		MetadataContext.setLocalService(serviceId);
 
 		// Register instance.