From fe274e4afd3214d91a7b1625c47fc79a9b3b4842 Mon Sep 17 00:00:00 2001
From: zihenz <1290829032@qq.com>
Date: Tue, 17 Jun 2025 12:09:24 +0800
Subject: [PATCH] fix

---
 .../cloud/polaris/PolarisDiscoveryProperties.java   | 13 +++++++++++++
 .../polaris/registry/PolarisServiceRegistry.java    |  3 ++-
 .../additional-spring-configuration-metadata.json   |  6 ++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

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 c8487ea26..34264ae31 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
@@ -77,6 +77,11 @@ public class PolarisDiscoveryProperties {
 	 */
 	private Boolean enabled = true;
 
+	/**
+	 * Enable heartbeat or not.
+	 */
+	private Boolean heartbeatEnabled = true;
+
 	/**
 	 * If instance registered.
 	 */
@@ -279,6 +284,14 @@ public class PolarisDiscoveryProperties {
 		this.detect = detect;
 	}
 
+	public Boolean getHeartbeatEnabled() {
+		return heartbeatEnabled;
+	}
+
+	public void setHeartbeatEnabled(Boolean heartbeatEnabled) {
+		this.heartbeatEnabled = heartbeatEnabled;
+	}
+
 	@Override
 	public String toString() {
 		return "PolarisDiscoveryProperties{" +
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 40e5ab59a..171b38a3a 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
@@ -87,7 +87,8 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 		this.polarisDiscoveryHandler = polarisDiscoveryHandler;
 		this.staticMetadataManager = staticMetadataManager;
 
-		if (StringUtils.isNotBlank(polarisDiscoveryProperties.getHealthCheckUrl())) {
+		if (StringUtils.isNotBlank(polarisDiscoveryProperties.getHealthCheckUrl()) 
+				&& polarisDiscoveryProperties.getHeartbeatEnabled()) {
 			this.heartbeatExecutor = Executors
 					.newSingleThreadScheduledExecutor(new NamedThreadFactory("polaris-heartbeat"));
 		}
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 aa4fe5f87..d35c2294e 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
@@ -18,6 +18,12 @@
       "defaultValue": true,
       "description": "enable polaris discovery or not."
     },
+    {
+      "name": "spring.cloud.polaris.discovery.heartbeat.enabled",
+      "type": "java.lang.Boolean",
+      "defaultValue": true,
+      "description": "enable polaris heartbeat or not."
+    },
     {
       "name": "spring.cloud.polaris.discovery.register",
       "type": "java.lang.Boolean",