From ef6e95948de6bb923ef9cce08a73a2ba854aa9a4 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Fri, 23 Feb 2024 15:37:35 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AEspr?= =?UTF-8?q?ing.lazy.netty.enable=20=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=98=AF=E5=85=B3=E9=97=AD=E7=9A=84=20=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.md | 3 ++- .../client/EnableHeartbeatClientAutoConfiguration.java | 3 +++ .../client/netty/config/ClientAutoConfiguration.java | 2 ++ .../client/netty/config/HeartbeatClientConfiguration.java | 2 ++ .../heartbeat/client/netty/config/NettyServerProperties.java | 4 ++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/version.md b/version.md index 0edc128..91eda6d 100644 --- a/version.md +++ b/version.md @@ -1,3 +1,4 @@ ### 版本更新 #### 1.2.2-JDK17-SNAPSHOT - 【fix】修正流量计算保存两位小数 \ No newline at end of file + 【fix】修正流量计算保存两位小数 + [fix] 添加配置spring.lazy.netty.enable 控制是否开启客户端默认是关闭的 需要手动开启 \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/EnableHeartbeatClientAutoConfiguration.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/EnableHeartbeatClientAutoConfiguration.java index 8b6df69..ba450c2 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/EnableHeartbeatClientAutoConfiguration.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/EnableHeartbeatClientAutoConfiguration.java @@ -1,8 +1,11 @@ package wu.framework.lazy.cloud.heartbeat.client; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.ComponentScan; +import wu.framework.lazy.cloud.heartbeat.client.netty.config.NettyServerProperties; +@ConditionalOnProperty(prefix = NettyServerProperties.PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) @ComponentScan(basePackages = "wu.framework.lazy.cloud.heartbeat.client") public class EnableHeartbeatClientAutoConfiguration { } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/ClientAutoConfiguration.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/ClientAutoConfiguration.java index 2b93a4b..baacc69 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/ClientAutoConfiguration.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/ClientAutoConfiguration.java @@ -3,6 +3,7 @@ package wu.framework.lazy.cloud.heartbeat.client.netty.config; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import wu.framework.lazy.cloud.heartbeat.client.application.ClientNettyConfigApplication; @@ -22,6 +23,7 @@ import java.util.concurrent.TimeUnit; */ @Slf4j @Configuration +@ConditionalOnProperty(prefix = NettyServerProperties.PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) public class ClientAutoConfiguration implements CommandLineRunner { private final NettyServerProperties nettyServerProperties; diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/HeartbeatClientConfiguration.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/HeartbeatClientConfiguration.java index 46b95da..1dc9edf 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/HeartbeatClientConfiguration.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/HeartbeatClientConfiguration.java @@ -2,6 +2,7 @@ package wu.framework.lazy.cloud.heartbeat.client.netty.config; import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Role; import wu.framework.lazy.cloud.heartbeat.client.application.ClientNettyConfigApplication; @@ -11,6 +12,7 @@ import wu.framework.lazy.cloud.heartbeat.common.advanced.HandleChannelTypeAdvanc import java.util.List; @Role(BeanDefinition.ROLE_INFRASTRUCTURE) +@ConditionalOnProperty(prefix = NettyServerProperties.PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) public class HeartbeatClientConfiguration { /** diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/NettyServerProperties.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/NettyServerProperties.java index df75aaa..b42d40f 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/NettyServerProperties.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/NettyServerProperties.java @@ -28,4 +28,8 @@ public class NettyServerProperties { * 客户端ID */ private String clientId = "1024"; + /** + * 是否开启 默认否 + */ + private boolean enabled = false; }