diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b8b5e91b..2dcb8ba35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log --- +- [fix: add gateway context config example.](https://github.com/Tencent/spring-cloud-tencent/pull/1563) +- [feat:support config empty protection.](https://github.com/Tencent/spring-cloud-tencent/pull/1585) +- [feat:upgrade springframework version.](https://github.com/Tencent/spring-cloud-tencent/pull/1590) +- [feat:support dynamic multi-discovery.](https://github.com/Tencent/spring-cloud-tencent/pull/1595) +- [feat:support ipv6.](https://github.com/Tencent/spring-cloud-tencent/pull/1598) +- [feat:support config all recover enabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1604) +- [feat:support stat reporting path aggregation.](https://github.com/Tencent/spring-cloud-tencent/pull/1608) +- [feat:support instance detect.](https://github.com/Tencent/spring-cloud-tencent/pull/1617) +- [fix: polaris.discovery.heartbeat.enabled not effective.](https://github.com/Tencent/spring-cloud-tencent/pull/1621) - [fix:fix PolarisContextProperties instantiated twice causing NPE.](https://github.com/Tencent/spring-cloud-tencent/pull/1638) - [feat:support setting load balancing strategy per service.](https://github.com/Tencent/spring-cloud-tencent/pull/1633) - [feat: support tsf 2024.](https://github.com/Tencent/spring-cloud-tencent/pull/1635) @@ -16,4 +25,4 @@ - [fix: fix lb configuration on bootstrap step.](https://github.com/Tencent/spring-cloud-tencent/issues/1673) - [feat:support 2024.0.2.](https://github.com/Tencent/spring-cloud-tencent/issues/1674) - [feat:support fault injection.](https://github.com/Tencent/spring-cloud-tencent/pull/1672) -- [feat: support config event and monitor address list.](https://github.com/Tencent/spring-cloud-tencent/pull/1675) +- [feat: support config event and monitor address list.](https://github.com/Tencent/spring-cloud-tencent/pull/1675) \ No newline at end of file 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 5c7b3b5fe..199ca402d 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 @@ -208,6 +208,14 @@ public class PolarisDiscoveryProperties { this.serviceListRefreshInterval = serviceListRefreshInterval; } + public Boolean getHeartbeatEnabled() { + return heartbeatEnabled; + } + + public void setHeartbeatEnabled(Boolean heartbeatEnabled) { + this.heartbeatEnabled = heartbeatEnabled; + } + public Integer getHeartbeatInterval() { if (this.heartbeatInterval <= 0 || this.heartbeatInterval > 60) { heartbeatInterval = DEFAULT_REGISTRY_HEARTBEAT_TIME_INTERVAL; @@ -291,6 +299,7 @@ public class PolarisDiscoveryProperties { ", protocol='" + protocol + '\'' + ", enabled=" + enabled + ", registerEnabled=" + registerEnabled + + ", heartbeatEnabled=" + heartbeatEnabled + ", heartbeatInterval=" + heartbeatInterval + ", healthCheckUrl='" + healthCheckUrl + '\'' + ", serviceListRefreshInterval=" + serviceListRefreshInterval + 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 c1ffb9f34..5f3416f97 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 @@ -24,6 +24,12 @@ "defaultValue": true, "description": "enable polaris registration 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.heartbeat-interval", "type": "java.lang.Integer",