From 728fe531ad0f0d61011061843353ad76fb61218f Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Thu, 11 Jan 2024 09:25:59 +0800 Subject: [PATCH 1/5] [fix] --- wu-lazy-cloud-heartbeat-client/Native-Dockerfile | 2 +- wu-lazy-cloud-heartbeat-client/README.md | 6 +++--- .../client/netty/config/NettyServerProperties.java | 4 ++-- .../src/main/resources/application-dev.yml | 2 +- .../entity/InternalNetworkPenetrationMappingDO.java | 2 +- .../infrastructure/entity/NettyClientBlacklistDO.java | 2 +- .../server/infrastructure/entity/NettyClientStateDO.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-client/Native-Dockerfile b/wu-lazy-cloud-heartbeat-client/Native-Dockerfile index 9264610..9a7595d 100644 --- a/wu-lazy-cloud-heartbeat-client/Native-Dockerfile +++ b/wu-lazy-cloud-heartbeat-client/Native-Dockerfile @@ -5,7 +5,7 @@ MAINTAINER wujiawei <1207537021@qq.com> RUN echo "Asia/Shanghai" > /etc/timezone -COPY target/middleground-under-cloud-heartbeat-client /native-app +COPY target/lazy-cloud-heartbeat-client /native-app ENTRYPOINT ["/bin/sh" ,"-c", "exec ./native-app"] diff --git a/wu-lazy-cloud-heartbeat-client/README.md b/wu-lazy-cloud-heartbeat-client/README.md index 3389def..8a58ab9 100644 --- a/wu-lazy-cloud-heartbeat-client/README.md +++ b/wu-lazy-cloud-heartbeat-client/README.md @@ -9,8 +9,8 @@ mvn native:build -Pnative ``` ### 构建docker镜像 ```shell -docker build -t docker-registry.laihui.com/middleground/middleground-under-cloud-heartbeat-client:middleground-2.4.2-native-SNAPSHOT_latest -f Native-Dockerfile . -docker push docker-registry.laihui.com/middleground/middleground-under-cloud-heartbeat-client:middleground-2.4.2-native-SNAPSHOT_latest +docker build -t docker-registry.laihui.com/lazy/lazy-under-cloud-heartbeat-client:lazy-2.4.2-native-SNAPSHOT_latest -f Native-Dockerfile . +docker push docker-registry.laihui.com/lazy/lazy-under-cloud-heartbeat-client:lazy-2.4.2-native-SNAPSHOT_latest ``` @@ -29,7 +29,7 @@ docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-cl ### run ```shell -docker run -d -it --name client -e spring.middleground.netty.inet-host=124.222.48.62 -e spring.middleground.netty.inet-port=30676 -e spring.middleground.netty.client-id=node1 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client:server-jdk17-master +docker run -d -it --name client -e spring.lazy.netty.inet-host=124.222.48.62 -e spring.lazy.netty.inet-port=30676 -e spring.lazy.netty.client-id=node1 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client:server-jdk17-master 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 2f33541..df75aaa 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 @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @Data public class NettyServerProperties { - public static final String PREFIX = "spring.middleground.netty"; + public static final String PREFIX = "spring.lazy.netty"; /** * 服务端地址 */ @@ -23,7 +23,7 @@ public class NettyServerProperties { /** * 服务端path */ - private String inetPath = "middleground-on-cloud-heartbeat-server"; + private String inetPath = "lazy-cloud-heartbeat-server"; /** * 客户端ID */ diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml index b78397e..869eeaa 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ spring: - middleground: + lazy: netty: # inet-host: 192.168.17.221 # inet-port: 4923 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/InternalNetworkPenetrationMappingDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/InternalNetworkPenetrationMappingDO.java index d16e4df..19810f3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/InternalNetworkPenetrationMappingDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/InternalNetworkPenetrationMappingDO.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; **/ @Data @Accessors(chain = true) -@LazyTable(tableName = "internal_network_penetration_mapping",schema = "middleground_cloud_netty_server",comment = "内网穿透映射") +@LazyTable(tableName = "internal_network_penetration_mapping",comment = "内网穿透映射") @Schema(title = "internal_network_penetration_mapping",description = "内网穿透映射") public class InternalNetworkPenetrationMappingDO { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientBlacklistDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientBlacklistDO.java index d5ee90f..31f8b66 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientBlacklistDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientBlacklistDO.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; **/ @Data @Accessors(chain = true) -@LazyTable(tableName = "netty_client_blacklist", schema = "middleground_cloud_netty_server", comment = "客户端黑名单") +@LazyTable(tableName = "netty_client_blacklist", comment = "客户端黑名单") @Schema(title = "netty_client_blacklist", description = "客户端黑名单") public class NettyClientBlacklistDO { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientStateDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientStateDO.java index 26ae442..91710fe 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientStateDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientStateDO.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; **/ @Data @Accessors(chain = true) -@LazyTable(tableName = "netty_client_state", schema = "middleground_cloud_netty_server", comment = "客户端状态") +@LazyTable(tableName = "netty_client_state", comment = "客户端状态") @Schema(title = "netty_client_state", description = "客户端状态") public class NettyClientStateDO { From af418faf28948866ef5497cb0957d00112c48d9d Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Thu, 11 Jan 2024 09:27:42 +0800 Subject: [PATCH 2/5] [fix] --- .../pom.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml index 4947885..e77b51a 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml @@ -27,6 +27,28 @@ + + org.graalvm.buildtools + native-maven-plugin + + + ${project.artifactId} + + wu.framework.lazy.cloud.heartbeat.client.LazyCloudHeartbeatClient + + --no-fallback + + + + + build-native + + compile-no-fork + + package + + + org.springframework.boot spring-boot-maven-plugin From 60eb66c2aacdc04adf48cc10be33296c6060671f Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Thu, 11 Jan 2024 10:52:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9bean=20=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tion.java => ClientAutoConfiguration.java} | 14 ++-- .../config/HeartbeatClientConfiguration.java | 66 ++++++++++++++++ .../NettyClientVisitorRealHandler.java | 3 + .../main/resources/META-INF/spring.factories | 5 +- ...ot.autoconfigure.AutoConfiguration.imports | 3 + .../pom.xml | 44 +++++------ .../src/main/resources/bootstrap.yml | 12 --- .../config/HeartbeatServerConfiguration.java | 78 +++++++++++++++++++ ...tion.java => ServerAutoConfiguration.java} | 4 +- .../main/resources/META-INF/spring.factories | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 + 11 files changed, 188 insertions(+), 47 deletions(-) rename wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/{AutoConfiguration.java => ClientAutoConfiguration.java} (81%) create mode 100644 wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/HeartbeatClientConfiguration.java delete mode 100644 wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/bootstrap.yml create mode 100644 wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/HeartbeatServerConfiguration.java rename wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/{AutoConfiguration.java => ServerAutoConfiguration.java} (91%) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/AutoConfiguration.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/ClientAutoConfiguration.java similarity index 81% rename from wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/AutoConfiguration.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/ClientAutoConfiguration.java index 9135f5c..a47788a 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/AutoConfiguration.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/ClientAutoConfiguration.java @@ -6,7 +6,6 @@ import wu.framework.lazy.cloud.heartbeat.client.application.ClientNettyConfigApp import wu.framework.lazy.cloud.heartbeat.client.netty.socket.NettyClientSocket; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -23,9 +22,8 @@ import java.util.concurrent.TimeUnit; */ @Slf4j @Configuration -public class AutoConfiguration implements CommandLineRunner { +public class ClientAutoConfiguration implements CommandLineRunner { - private final ServerProperties serverProperties; private final NettyServerProperties nettyServerProperties; private final ClientNettyConfigApplication clientNettyConfigApplication; @@ -35,11 +33,9 @@ public class AutoConfiguration implements CommandLineRunner { ThreadPoolExecutor NETTY_CLIENT_EXECUTOR = new ThreadPoolExecutor(1, 1, 200, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(1)); - public AutoConfiguration(ServerProperties serverProperties, - NettyServerProperties nettyServerProperties, - ClientNettyConfigApplication clientNettyConfigApplication, - List channelTypeAdvancedList) { - this.serverProperties = serverProperties; + public ClientAutoConfiguration(NettyServerProperties nettyServerProperties, + ClientNettyConfigApplication clientNettyConfigApplication, + List channelTypeAdvancedList) { this.nettyServerProperties = nettyServerProperties; this.clientNettyConfigApplication = clientNettyConfigApplication; this.channelTypeAdvancedList = channelTypeAdvancedList; @@ -47,7 +43,7 @@ public class AutoConfiguration implements CommandLineRunner { @Bean(destroyMethod = "shutdown") - public NettyClientSocket nettyServerSocket() { + public NettyClientSocket nettyClientSocket() { String inetHost = nettyServerProperties.getInetHost(); int inetPort = nettyServerProperties.getInetPort(); String clientId = nettyServerProperties.getClientId(); 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 new file mode 100644 index 0000000..51ad902 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/HeartbeatClientConfiguration.java @@ -0,0 +1,66 @@ +package wu.framework.lazy.cloud.heartbeat.client.netty.config; + + +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Role; +import wu.framework.lazy.cloud.heartbeat.client.application.ClientNettyConfigApplication; +import wu.framework.lazy.cloud.heartbeat.client.netty.advanced.*; +import wu.framework.lazy.cloud.heartbeat.client.netty.config.NettyServerProperties; +import wu.framework.lazy.cloud.heartbeat.common.advanced.ChannelTypeAdvanced; + +import java.util.List; +@Role(BeanDefinition.ROLE_INFRASTRUCTURE) +public class HeartbeatClientConfiguration { + + /** + * 服务端 处理客户端心跳 + * + * @return ClientChannelHeartbeatTypeAdvanced + */ + @Bean + public ClientChannelHeartbeatTypeAdvanced clientChannelHeartbeatTypeAdvanced() { + return new ClientChannelHeartbeatTypeAdvanced(); + } + + /** + * 处理 客户端代理的真实端口自动读写 + * @return ClientDistributeSingleClientRealAutoReadConnectTypeAdvanced + */ + @Bean + public ClientDistributeSingleClientRealAutoReadConnectTypeAdvanced clientDistributeSingleClientRealAutoReadConnectTypeAdvanced(){ + return new ClientDistributeSingleClientRealAutoReadConnectTypeAdvanced(); + } + @Bean + public ClientDistributeSingleClientRealCloseVisitorTypeAdvanced clientDistributeSingleClientRealCloseVisitorTypeAdvanced(){ + return new ClientDistributeSingleClientRealCloseVisitorTypeAdvanced(); + } + + @Bean + public ClientReportChannelTransferTypeAdvanced clientReportChannelTransferTypeAdvanced(NettyServerProperties nettyServerProperties){ + return new ClientReportChannelTransferTypeAdvanced(nettyServerProperties); + } + @Bean + public DistributeConnectSuccessNotificationTypeAdvanced distributeConnectSuccessNotificationTypeAdvanced(ClientNettyConfigApplication clientNettyConfigApplication, NettyServerProperties nettyServerProperties){ + return new DistributeConnectSuccessNotificationTypeAdvanced(clientNettyConfigApplication, nettyServerProperties); + } + @Bean + public DistributeDisconnectTypeAdvanced distributeDisconnectTypeAdvanced(ClientNettyConfigApplication clientNettyConfigApplication){ + return new DistributeDisconnectTypeAdvanced(clientNettyConfigApplication); + } + @Bean + public DistributeStagingClosedTypeAdvanced distributeStagingClosedTypeAdvanced(){ + return new DistributeStagingClosedTypeAdvanced(); + } + @Bean + public DistributeStagingOpenedTypeAdvanced distributeStagingOpenedTypeAdvanced(){ + return new DistributeStagingOpenedTypeAdvanced(); + } + + + @Bean + public ClientDistributeSingleClientRealConnectTypeAdvanced clientDistributeSingleClientRealConnectTypeAdvanced(NettyServerProperties nettyServerProperties, + List channelTypeAdvancedList ){ + return new ClientDistributeSingleClientRealConnectTypeAdvanced(nettyServerProperties,channelTypeAdvancedList); + } +} diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/handler/NettyClientVisitorRealHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/handler/NettyClientVisitorRealHandler.java index 4ebc1ca..b475e79 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/handler/NettyClientVisitorRealHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/handler/NettyClientVisitorRealHandler.java @@ -11,6 +11,9 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import lombok.extern.slf4j.Slf4j; +/** + * 客户端访客通信通道 处理器 + */ @Slf4j public class NettyClientVisitorRealHandler extends SimpleChannelInboundHandler { private final ChannelTypeAdapter channelTypeAdapter; diff --git a/wu-lazy-cloud-heartbeat-client/src/main/resources/META-INF/spring.factories b/wu-lazy-cloud-heartbeat-client/src/main/resources/META-INF/spring.factories index 6a9612a..a5e1128 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/resources/META-INF/spring.factories +++ b/wu-lazy-cloud-heartbeat-client/src/main/resources/META-INF/spring.factories @@ -1,3 +1,6 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -wu.framework.lazy.cloud.heartbeat.client.EnableHeartbeatClientAutoConfiguration +wu.framework.lazy.cloud.heartbeat.client.EnableHeartbeatClientAutoConfiguration,\ +wu.framework.lazy.cloud.heartbeat.client.netty.config.NettyServerProperties,\ +wu.framework.lazy.cloud.heartbeat.client.netty.config.ClientAutoConfiguration,\ +wu.framework.lazy.cloud.heartbeat.client.netty.config.HeartbeatClientConfiguration diff --git a/wu-lazy-cloud-heartbeat-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/wu-lazy-cloud-heartbeat-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 2fa599c..f17862f 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/wu-lazy-cloud-heartbeat-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,4 @@ wu.framework.lazy.cloud.heartbeat.client.EnableHeartbeatClientAutoConfiguration +wu.framework.lazy.cloud.heartbeat.client.netty.config.NettyServerProperties +wu.framework.lazy.cloud.heartbeat.client.netty.config.ClientAutoConfiguration +wu.framework.lazy.cloud.heartbeat.client.netty.config.HeartbeatClientConfiguration diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml index e77b51a..ce11326 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml @@ -27,28 +27,28 @@ - - org.graalvm.buildtools - native-maven-plugin - - - ${project.artifactId} - - wu.framework.lazy.cloud.heartbeat.client.LazyCloudHeartbeatClient - - --no-fallback - - - - - build-native - - compile-no-fork - - package - - - + + + + + + + + + + + + + + + + + + + + + + org.springframework.boot spring-boot-maven-plugin diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/bootstrap.yml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/bootstrap.yml deleted file mode 100644 index 706ffe0..0000000 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,12 +0,0 @@ - - - -spring: - application: - name: middleground-under-cloud-heartbeat-client - cloud: - nacos: - discovery: - server-addr: 192.168.17.221:30569 - config: - server-addr: 192.168.17.221:30569 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/HeartbeatServerConfiguration.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/HeartbeatServerConfiguration.java new file mode 100644 index 0000000..5a90ff5 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/HeartbeatServerConfiguration.java @@ -0,0 +1,78 @@ +package wu.framework.lazy.cloud.heartbeat.server.netty.config; + + +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Role; +import wu.framework.lazy.cloud.heartbeat.server.application.InternalNetworkPenetrationMappingApplication; +import wu.framework.lazy.cloud.heartbeat.server.application.NettyClientBlacklistApplication; +import wu.framework.lazy.cloud.heartbeat.server.application.ServerNettyConfigApplication; +import wu.framework.lazy.cloud.heartbeat.server.netty.advanced.*; + + +@Role(BeanDefinition.ROLE_INFRASTRUCTURE) +public class HeartbeatServerConfiguration { + + /** + * 服务端 处理客户端心跳 + * + * @return ServerChannelHeartbeatTypeAdvanced + */ + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + @Bean + public ServerChannelHeartbeatTypeAdvanced serverChannelHeartbeatTypeAdvanced() { + return new ServerChannelHeartbeatTypeAdvanced(); + } + + /** + * 处理 服务端处理客户端数据传输 + * + * @return ServerReportChannelTransferTypeAdvanced + */ + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + @Bean + public ServerReportChannelTransferTypeAdvanced serverReportChannelTransferTypeAdvanced() { + return new ServerReportChannelTransferTypeAdvanced(); + } + + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + @Bean + public ServerReportConnectSuccessTypeAdvanced serverReportConnectSuccessTypeAdvanced( + ServerNettyConfigApplication serverNettyConfigApplication, + NettyClientBlacklistApplication nettyClientBlacklistApplication, + InternalNetworkPenetrationMappingApplication internalNetworkPenetrationMappingApplication) { + return new ServerReportConnectSuccessTypeAdvanced(serverNettyConfigApplication, nettyClientBlacklistApplication, internalNetworkPenetrationMappingApplication); + } + + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + @Bean + public ServerReportDisconnectTypeAdvanced serverReportDisconnectTypeAdvanced(ServerNettyConfigApplication serverNettyConfigApplication) { + return new ServerReportDisconnectTypeAdvanced(serverNettyConfigApplication); + } + + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + @Bean + public ServerReportSingleClientCloseVisitorTypeAdvanced serverReportSingleClientCloseVisitorTypeAdvanced() { + return new ServerReportSingleClientCloseVisitorTypeAdvanced(); + } + + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + @Bean + public ServerReportSingleClientRealConnectTypeAdvanced serverReportSingleClientRealConnectTypeAdvanced() { + return new ServerReportSingleClientRealConnectTypeAdvanced(); + } + + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + @Bean + public ServerReportStagingClosedTypeAdvanced serverReportStagingClosedTypeAdvanced(ServerNettyConfigApplication serverNettyConfigApplication) { + return new ServerReportStagingClosedTypeAdvanced(serverNettyConfigApplication); + } + + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + @Bean + public ServerReportStagingOpenedTypeAdvanced serverReportStagingOpenedTypeAdvanced(ServerNettyConfigApplication serverNettyConfigApplication) { + return new ServerReportStagingOpenedTypeAdvanced(serverNettyConfigApplication); + } + + +} diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/AutoConfiguration.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/ServerAutoConfiguration.java similarity index 91% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/AutoConfiguration.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/ServerAutoConfiguration.java index 31b5721..7bbbd70 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/AutoConfiguration.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/ServerAutoConfiguration.java @@ -22,14 +22,14 @@ import java.util.concurrent.TimeUnit; */ @Slf4j @Configuration -public class AutoConfiguration implements CommandLineRunner { +public class ServerAutoConfiguration implements CommandLineRunner { private final ServerProperties serverProperties; private final NettyServerFilter nettyServerFilter; ThreadPoolExecutor NETTY_SERVER_EXECUTOR = new ThreadPoolExecutor(1, 1, 200, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(1)); - public AutoConfiguration(ServerProperties serverProperties, NettyServerFilter nettyServerFilter) { + public ServerAutoConfiguration(ServerProperties serverProperties, NettyServerFilter nettyServerFilter) { this.serverProperties = serverProperties; this.nettyServerFilter = nettyServerFilter; } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/resources/META-INF/spring.factories b/wu-lazy-cloud-heartbeat-server/src/main/resources/META-INF/spring.factories index 17d27dd..7c55e77 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/resources/META-INF/spring.factories +++ b/wu-lazy-cloud-heartbeat-server/src/main/resources/META-INF/spring.factories @@ -1,3 +1,5 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -wu.framework.lazy.cloud.heartbeat.server.EnableHeartbeatServerAutoConfiguration +wu.framework.lazy.cloud.heartbeat.server.EnableHeartbeatServerAutoConfiguration,\ +wu.framework.lazy.cloud.heartbeat.server.netty.config.HeartbeatServerConfiguration,\ +wu.framework.lazy.cloud.heartbeat.server.netty.config.ServerAutoConfiguration diff --git a/wu-lazy-cloud-heartbeat-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/wu-lazy-cloud-heartbeat-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a36863c..0cfe589 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/wu-lazy-cloud-heartbeat-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,3 @@ wu.framework.lazy.cloud.heartbeat.server.EnableHeartbeatServerAutoConfiguration +wu.framework.lazy.cloud.heartbeat.server.netty.config.HeartbeatServerConfiguration +wu.framework.lazy.cloud.heartbeat.server.netty.config.ServerAutoConfiguration From fc588be36dda2536ee414a194fa076ca5130f039 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Thu, 11 Jan 2024 10:55:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=A8=A1=E5=9E=8B=E6=97=A0=E6=B3=95=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=91=BD=E4=B8=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/EnableHeartbeatServerAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/EnableHeartbeatServerAutoConfiguration.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/EnableHeartbeatServerAutoConfiguration.java index c2f72b4..01294d8 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/EnableHeartbeatServerAutoConfiguration.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/EnableHeartbeatServerAutoConfiguration.java @@ -1,7 +1,9 @@ package wu.framework.lazy.cloud.heartbeat.server; +import com.wu.framework.inner.lazy.stereotype.LazyScan; import org.springframework.context.annotation.ComponentScan; +@LazyScan(scanBasePackages = "wu.framework.lazy.cloud.heartbeat.server.infrastructure.entity") @ComponentScan(basePackages = "wu.framework.lazy.cloud.heartbeat.server") public class EnableHeartbeatServerAutoConfiguration { } From 7679130dfcad350bf1222866effa4bc8ede5aefe Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Fri, 12 Jan 2024 09:20:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=A8=A1=E5=9E=8B=E6=97=A0=E6=B3=95=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=91=BD=E4=B8=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wu-lazy-cloud-heartbeat-sample/pom.xml | 2 +- .../wu-lazy-cloud-heartbeat-client-sample/pom.xml | 4 ++-- .../src/main/resources/application-dev.yml | 10 +++++----- .../wu-lazy-cloud-heartbeat-server-sample/pom.xml | 4 ++-- .../src/main/resources/application-dev.yml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-sample/pom.xml b/wu-lazy-cloud-heartbeat-sample/pom.xml index d742728..dc09457 100644 --- a/wu-lazy-cloud-heartbeat-sample/pom.xml +++ b/wu-lazy-cloud-heartbeat-sample/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-network - 1.2.1-JDK17-SNAPSHOT + 1.2.2-JDK17-SNAPSHOT wu-lazy-cloud-heartbeat-sample diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml index ce11326..560712b 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-heartbeat-sample - 1.2.1-JDK17-SNAPSHOT + 1.2.2-JDK17-SNAPSHOT 4.0.0 @@ -21,7 +21,7 @@ top.wu2020 wu-lazy-cloud-heartbeat-client - 1.2.1-JDK17-SNAPSHOT + 1.2.2-JDK17-SNAPSHOT diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml index 869eeaa..fba541b 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml @@ -1,12 +1,12 @@ spring: lazy: netty: -# inet-host: 192.168.17.221 -# inet-port: 4923 -# inet-path: middleground-on-cloud-heartbeat-server - inet-host: 124.222.48.62 # 服务端地址 - inet-port: 30676 #服务端端口 + inet-host: 127.0.0.1 + inet-port: 7001 inet-path: middleground-on-cloud-heartbeat-server +# inet-host: 124.222.48.62 # 服务端地址 +# inet-port: 30676 #服务端端口 +# inet-path: middleground-on-cloud-heartbeat-server client-id: local # 客户端ID data: redis: diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/pom.xml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/pom.xml index 1c052e7..f12d2a4 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/pom.xml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-heartbeat-sample - 1.2.1-JDK17-SNAPSHOT + 1.2.2-JDK17-SNAPSHOT 4.0.0 @@ -22,7 +22,7 @@ top.wu2020 wu-lazy-cloud-heartbeat-server - 1.2.1-JDK17-SNAPSHOT + 1.2.2-JDK17-SNAPSHOT diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-dev.yml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-dev.yml index 016e553..0de0018 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-dev.yml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-dev.yml @@ -6,7 +6,7 @@ spring: password: laihui database: 2 datasource: - url: jdbc:mysql://127.0.0.1:3306/middleground_cloud_netty_server?allowMultiQueries=true&useUnicode=true&autoReconnect=true&useAffectedRows=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&databaseTerm=SCHEMA + url: jdbc:mysql://127.0.0.1:3306/lazy_cloud_netty_server?allowMultiQueries=true&useUnicode=true&autoReconnect=true&useAffectedRows=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&databaseTerm=SCHEMA username: root password: wujiawei driver-class-name: com.mysql.cj.jdbc.Driver