From 7039da1ad9bb99598cbf1ac12bae87bc4e9ce61d Mon Sep 17 00:00:00 2001
From: zihenz <1290829032@qq.com>
Date: Tue, 8 Jul 2025 21:37:14 +0800
Subject: [PATCH] fix some minor issues

---
 .../registry/PolarisServiceRegistry.java        | 17 +++++++++++++----
 ...dditional-spring-configuration-metadata.json |  2 +-
 .../src/main/resources/application.yml          |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

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 6eae53041..084b20915 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
@@ -61,6 +61,7 @@ import org.springframework.http.HttpHeaders;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
+import org.springframework.beans.factory.annotation.Value;
 
 /**
  * Service registry of Polaris.
@@ -80,6 +81,12 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 	private final StaticMetadataManager staticMetadataManager;
 	private final PolarisStatProperties polarisStatProperties;
 
+	@Value("${spring.cloud.polaris.discovery.heartbeat-enabled:true}")
+	private Boolean heartbeatEnabled = true;
+
+	@Value("${spring.cloud.polaris.discovery.heartbeat-interval:5}")
+	private Integer heartbeatInterval = 5;
+
 	public PolarisServiceRegistry(PolarisDiscoveryProperties polarisDiscoveryProperties,
 			PolarisSDKContextManager polarisSDKContextManager, PolarisDiscoveryHandler polarisDiscoveryHandler,
 			StaticMetadataManager staticMetadataManager, PolarisStatProperties polarisStatProperties) {
@@ -128,13 +135,15 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 		try {
 			ProviderAPI providerClient = polarisSDKContextManager.getProviderAPI();
 			InstanceRegisterResponse instanceRegisterResponse;
-			
-			if (!polarisDiscoveryProperties.getHeartbeatEnabled()) {
-				// Use register() when heartbeat is disabled - this doesn't start the SDK's heartbeat
+
+			// 结合heartbeatEnabled和healthCheckUrl判断
+			if (!polarisDiscoveryProperties.getHeartbeatEnabled()
+				|| StringUtils.isBlank(polarisDiscoveryProperties.getHealthCheckUrl())) {
+				// 不启用心跳 或 未配置healthCheckUrl
 				instanceRegisterResponse = providerClient.register(instanceRegisterRequest);
 				LOGGER.info("Registered instance without heartbeat.");
 			} else {
-				// Use registerInstance() when heartbeat is enabled - this starts the SDK's heartbeat
+				// 启用心跳 且 配置了healthCheckUrl
 				instanceRegisterRequest.setTtl(polarisDiscoveryProperties.getHeartbeatInterval());
 				instanceRegisterResponse = providerClient.registerInstance(instanceRegisterRequest);
 				LOGGER.info("Registered instance with heartbeat enabled.");
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index d35c2294e..5b12c9290 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -19,7 +19,7 @@
       "description": "enable polaris discovery or not."
     },
     {
-      "name": "spring.cloud.polaris.discovery.heartbeat.enabled",
+      "name": "spring.cloud.polaris.discovery.heartbeat-enabled",
       "type": "java.lang.Boolean",
       "defaultValue": true,
       "description": "enable polaris heartbeat or not."
diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/application.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/application.yml
index 1fa63d14c..5137fc5f7 100644
--- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/application.yml
+++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
         enabled: true
         register: true
         heartbeat:
-          enabled: false
+          enabled: true
       contract:
         exposure: true
         report: