From 4c3791275735cb1a245d1fad29ff22027bb08442 Mon Sep 17 00:00:00 2001
From: zihenz <1290829032@qq.com>
Date: Sat, 19 Jul 2025 15:58:10 +0800
Subject: [PATCH] fix heartbeatEnabled and heartbeatInterval must be in
 PolarisDiscoveryProperties.

---
 .../cloud/polaris/PolarisDiscoveryProperties.java | 15 +++++++--------
 .../polaris/registry/PolarisServiceRegistry.java  | 12 +++---------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java
index 82e64d426..5c139c02e 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java
@@ -80,21 +80,20 @@ public class PolarisDiscoveryProperties {
 	/**
 	 * Enable heartbeat or not.
 	 */
-	@Value("${spring.cloud.polaris.discovery.heartbeat.enabled:true}")
+	@Value("${spring.cloud.polaris.discovery.heartbeat-enabled:true}")
 	private Boolean heartbeatEnabled = true;
 
 	/**
-	 * If instance registered.
+	 * Heartbeat interval (seconds).
 	 */
-	@Value("${spring.cloud.polaris.discovery.register:#{true}}")
-	private Boolean registerEnabled;
+	@Value("${spring.cloud.polaris.discovery.heartbeat-interval:5}")
+	private Integer heartbeatInterval = 5;
 
 	/**
-	 * Heartbeat interval ( 0 < interval <= 60).
-	 * Time unit: second. Default: 5.
-	 * @see ContextConstant#DEFAULT_REGISTRY_HEARTBEAT_TIME_INTERVAL
+	 * If instance registered.
 	 */
-	private Integer heartbeatInterval = DEFAULT_REGISTRY_HEARTBEAT_TIME_INTERVAL;
+	@Value("${spring.cloud.polaris.discovery.register:#{true}}")
+	private Boolean registerEnabled;
 
 	/**
 	 * Custom health check url to override default.
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 084b20915..cac68186b 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
@@ -81,12 +81,6 @@ 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) {
@@ -136,14 +130,14 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 			ProviderAPI providerClient = polarisSDKContextManager.getProviderAPI();
 			InstanceRegisterResponse instanceRegisterResponse;
 
-			// 结合heartbeatEnabled和healthCheckUrl判断
+			// heartbeatEnabled and healthCheckUrl
 			if (!polarisDiscoveryProperties.getHeartbeatEnabled()
 				|| StringUtils.isBlank(polarisDiscoveryProperties.getHealthCheckUrl())) {
-				// 不启用心跳 或 未配置healthCheckUrl
+				// Do not enable heartbeat or configure healthCheckURL
 				instanceRegisterResponse = providerClient.register(instanceRegisterRequest);
 				LOGGER.info("Registered instance without heartbeat.");
 			} else {
-				// 启用心跳 且 配置了healthCheckUrl
+				// Enable heartbeat and configure healthCheckURL
 				instanceRegisterRequest.setTtl(polarisDiscoveryProperties.getHeartbeatInterval());
 				instanceRegisterResponse = providerClient.registerInstance(instanceRegisterRequest);
 				LOGGER.info("Registered instance with heartbeat enabled.");