From fef8149ec454dcda59f8455caba736c788557480 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Tue, 23 Jan 2024 16:51:55 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=AF=BC=E8=87=B4=E9=80=9A=E9=81=93=E8=A2=AB?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandleClientChannelActiveAdvanced.java | 33 +++++++++++++++++++ ...SuccessNotificationTypeAdvancedHandle.java | 12 ++----- .../config/HeartbeatClientConfiguration.java | 24 ++++++++------ .../netty/handler/NettyClientHandler.java | 2 +- .../netty/socket/NettyClientRealSocket.java | 2 +- .../netty/socket/NettyClientSocket.java | 2 +- .../heartbeat/common/ChannelContext.java | 2 +- .../cloud/heartbeat/common/MessageType.java | 18 +++++++++- ...ractHandleClientChannelActiveAdvanced.java | 25 ++++++++++++++ ...ndleClientConnectSuccessTypeAdvanced.java} | 4 +-- ...HandleServerChannelActiveTypeAdvanced.java | 27 +++++++++++++++ .../common/enums/MessageTypeEnums.java | 10 +++++- .../src/main/resources/application-dev.yml | 10 +++--- .../README.md | 2 +- ...ndleClientConnectSuccessTypeAdvanced.java} | 6 ++-- .../config/HeartbeatServerConfiguration.java | 4 +-- .../netty/handler/NettyServerHandler.java | 4 ++- .../layoutpages/cloud_network/CloudClient.vue | 8 ++--- 18 files changed, 152 insertions(+), 43 deletions(-) create mode 100644 wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/advanced/HandleClientChannelActiveAdvanced.java create mode 100644 wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/client/AbstractHandleClientChannelActiveAdvanced.java rename wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/{AbstractHandleReportConnectSuccessTypeAdvanced.java => AbstractHandleClientConnectSuccessTypeAdvanced.java} (88%) create mode 100644 wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleServerChannelActiveTypeAdvanced.java rename wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/{ServerHandleReportConnectSuccessTypeAdvanced.java => ServerHandleClientConnectSuccessTypeAdvanced.java} (94%) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/advanced/HandleClientChannelActiveAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/advanced/HandleClientChannelActiveAdvanced.java new file mode 100644 index 0000000..35d2e9f --- /dev/null +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/advanced/HandleClientChannelActiveAdvanced.java @@ -0,0 +1,33 @@ +package wu.framework.lazy.cloud.heartbeat.client.netty.advanced; + +import io.netty.channel.Channel; +import wu.framework.lazy.cloud.heartbeat.client.netty.config.NettyServerProperties; +import wu.framework.lazy.cloud.heartbeat.common.ChannelContext; +import wu.framework.lazy.cloud.heartbeat.common.NettyProxyMsg; +import wu.framework.lazy.cloud.heartbeat.common.advanced.client.AbstractHandleClientChannelActiveAdvanced; +import wu.framework.lazy.cloud.heartbeat.common.utils.ChannelAttributeKeyUtils; + +/** + * 客户端通道 is active + */ +public class HandleClientChannelActiveAdvanced extends AbstractHandleClientChannelActiveAdvanced { + private final NettyServerProperties nettyServerProperties; + + public HandleClientChannelActiveAdvanced(NettyServerProperties nettyServerProperties) { + this.nettyServerProperties = nettyServerProperties; + } + + /** + * 处理当前数据 + * + * @param channel 当前通道 + * @param nettyProxyMsg 通道数据 + */ + @Override + protected void doHandler(Channel channel, NettyProxyMsg nettyProxyMsg) { + // 缓存当前通道 + String clientId = nettyServerProperties.getClientId(); + ChannelContext.push(channel, clientId); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); + } +} diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/advanced/HandleDistributeConnectSuccessNotificationTypeAdvancedHandle.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/advanced/HandleDistributeConnectSuccessNotificationTypeAdvancedHandle.java index 4495f6d..0b476b5 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/advanced/HandleDistributeConnectSuccessNotificationTypeAdvancedHandle.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/advanced/HandleDistributeConnectSuccessNotificationTypeAdvancedHandle.java @@ -22,11 +22,10 @@ import java.util.List; public class HandleDistributeConnectSuccessNotificationTypeAdvancedHandle extends AbstractHandleDistributeConnectSuccessNotificationTypeAdvancedHandle { private final ClientNettyConfigApplication clientNettyConfigApplication; - private final NettyServerProperties nettyServerProperties; - public HandleDistributeConnectSuccessNotificationTypeAdvancedHandle(ClientNettyConfigApplication clientNettyConfigApplication, NettyServerProperties nettyServerProperties) { + + public HandleDistributeConnectSuccessNotificationTypeAdvancedHandle(ClientNettyConfigApplication clientNettyConfigApplication) { this.clientNettyConfigApplication = clientNettyConfigApplication; - this.nettyServerProperties = nettyServerProperties; } /** @@ -39,12 +38,7 @@ public class HandleDistributeConnectSuccessNotificationTypeAdvancedHandle extend protected void doHandler(Channel channel, NettyProxyMsg msg) { log.warn("客户端ID：{},客户端:{}连接成功", new String(msg.getClientId()), new String(msg.getData())); - // 缓存当前通道 - String clientId = nettyServerProperties.getClientId(); - NettyProxyMsg nettyMsg = new NettyProxyMsg(); - nettyMsg.setClientId(clientId.getBytes(StandardCharsets.UTF_8)); - ChannelContext.push(channel, clientId); - ChannelAttributeKeyUtils.buildClientId(channel,clientId); + // 存储其他客户端状态 List clientIdList = JSONObject.parseArray(new String(msg.getData()), String.class); for (String tenantId : clientIdList) { 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 00ee1f1..f17807b 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 @@ -27,7 +27,7 @@ public class HeartbeatClientConfiguration { * @return ClientHandleDistributeSingleClientRealAutoReadConnectTypeAdvanced */ @Bean - public ClientHandleDistributeSingleClientRealAutoReadConnectTypeAdvanced clientDistributeSingleClientRealAutoReadConnectTypeAdvanced(){ + public ClientHandleDistributeSingleClientRealAutoReadConnectTypeAdvanced handleDistributeSingleClientRealAutoReadConnectTypeAdvanced(){ return new ClientHandleDistributeSingleClientRealAutoReadConnectTypeAdvanced(); } /** @@ -35,38 +35,42 @@ public class HeartbeatClientConfiguration { * @return ClientHandleDistributeSingleClientMessageTypeAdvanced */ @Bean - public ClientHandleDistributeSingleClientMessageTypeAdvanced clientDistributeSingleClientMessageTypeAdvanced(){ + public ClientHandleDistributeSingleClientMessageTypeAdvanced handleDistributeSingleClientMessageTypeAdvanced(){ return new ClientHandleDistributeSingleClientMessageTypeAdvanced(); } @Bean - public ClientHandleDistributeSingleClientRealCloseVisitorTypeAdvanced clientDistributeSingleClientRealCloseVisitorTypeAdvanced(){ + public ClientHandleDistributeSingleClientRealCloseVisitorTypeAdvanced handleDistributeSingleClientRealCloseVisitorTypeAdvanced(){ return new ClientHandleDistributeSingleClientRealCloseVisitorTypeAdvanced(); } @Bean - public ClientReportHandleChannelTransferTypeAdvancedHandleDistribute clientReportChannelTransferTypeAdvanced(NettyServerProperties nettyServerProperties){ + public ClientReportHandleChannelTransferTypeAdvancedHandleDistribute handleChannelTransferTypeAdvancedHandleDistribute(NettyServerProperties nettyServerProperties){ return new ClientReportHandleChannelTransferTypeAdvancedHandleDistribute(nettyServerProperties); } @Bean - public HandleDistributeConnectSuccessNotificationTypeAdvancedHandle distributeConnectSuccessNotificationTypeAdvanced(ClientNettyConfigApplication clientNettyConfigApplication, NettyServerProperties nettyServerProperties){ - return new HandleDistributeConnectSuccessNotificationTypeAdvancedHandle(clientNettyConfigApplication, nettyServerProperties); + public HandleDistributeConnectSuccessNotificationTypeAdvancedHandle handleDistributeConnectSuccessNotificationTypeAdvancedHandle(ClientNettyConfigApplication clientNettyConfigApplication){ + return new HandleDistributeConnectSuccessNotificationTypeAdvancedHandle(clientNettyConfigApplication); } @Bean - public HandleDistributeDisconnectTypeAdvancedHandle distributeDisconnectTypeAdvanced(ClientNettyConfigApplication clientNettyConfigApplication){ + public HandleClientChannelActiveAdvanced handleClientChannelActiveAdvanced(NettyServerProperties nettyServerProperties){ + return new HandleClientChannelActiveAdvanced(nettyServerProperties); + } + @Bean + public HandleDistributeDisconnectTypeAdvancedHandle handleDistributeDisconnectTypeAdvancedHandle(ClientNettyConfigApplication clientNettyConfigApplication){ return new HandleDistributeDisconnectTypeAdvancedHandle(clientNettyConfigApplication); } @Bean - public HandleDistributeStagingClosedTypeAdvanced distributeStagingClosedTypeAdvanced(){ + public HandleDistributeStagingClosedTypeAdvanced handleDistributeStagingClosedTypeAdvanced(){ return new HandleDistributeStagingClosedTypeAdvanced(); } @Bean - public HandleDistributeStagingOpenedTypeAdvanced distributeStagingOpenedTypeAdvanced(){ + public HandleDistributeStagingOpenedTypeAdvanced handleDistributeStagingOpenedTypeAdvanced(){ return new HandleDistributeStagingOpenedTypeAdvanced(); } @Bean - public ClientHandleDistributeSingleClientRealConnectTypeAdvanced clientDistributeSingleClientRealConnectTypeAdvanced(NettyServerProperties nettyServerProperties, + public ClientHandleDistributeSingleClientRealConnectTypeAdvanced clientHandleDistributeSingleClientRealConnectTypeAdvanced(NettyServerProperties nettyServerProperties, List handleChannelTypeAdvancedList){ return new ClientHandleDistributeSingleClientRealConnectTypeAdvanced(nettyServerProperties, handleChannelTypeAdvancedList); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/handler/NettyClientHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/handler/NettyClientHandler.java index 6009339..2a4b5cd 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/handler/NettyClientHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/handler/NettyClientHandler.java @@ -61,7 +61,7 @@ public class NettyClientHandler extends SimpleChannelInboundHandler { Channel channel = futureListener.channel(); if (futureListener.isSuccess()) { diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/socket/NettyClientSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/socket/NettyClientSocket.java index 3e0cd16..dc4ed06 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/socket/NettyClientSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/socket/NettyClientSocket.java @@ -72,7 +72,7 @@ public class NettyClientSocket { ChannelFuture future = bootstrap.connect(inetHost, inetPort); Channel channel = future.channel(); - log.info("使用的租户ID:" + clientId); + log.info("使用的客户端ID:" + clientId); future.addListener((ChannelFutureListener) futureListener -> { if (futureListener.isSuccess()) { diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/ChannelContext.java b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/ChannelContext.java index 4897a50..67a327d 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/ChannelContext.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/ChannelContext.java @@ -35,7 +35,7 @@ public class ChannelContext { clientChannelImpl.setClientId(clientId.getBytes(StandardCharsets.UTF_8)); // 如果客户端已经存在 移除 if(channelIdClientChannelDTOConcurrentHashMap.containsKey(clientId)){ - clear(clientId); +// clear(clientId); } channelIdClientChannelDTOConcurrentHashMap.put(clientId, clientChannelImpl); diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/MessageType.java b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/MessageType.java index 55fd271..a875eb1 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/MessageType.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/MessageType.java @@ -22,7 +22,7 @@ public class MessageType { * 客户端上报连接成功 * * @see MessageTypeEnums#REPORT_CLIENT_CONNECT_SUCCESS - * @see AbstractHandleReportConnectSuccessTypeAdvanced + * @see AbstractHandleClientConnectSuccessTypeAdvanced */ public static final byte REPORT_CLIENT_CONNECT_SUCCESS = 0X01; /** @@ -78,6 +78,13 @@ public class MessageType { * @see AbstractHandleReportSingleClientMessage2OtherClientTypeAdvanced */ public static final byte REPORT_SINGLE_CLIENT_MESSAGE = 0X09; + /** + * 服务端通道 is active + * + * @see MessageTypeEnums#SERVER_CHANNEL_ACTIVE + * @see AbstractHandleServerChannelActiveTypeAdvanced + */ + public static final byte SERVER_CHANNEL_ACTIVE = 0X10; /** * 下发 客户端接收连接成功通知 @@ -146,4 +153,13 @@ public class MessageType { * @see AbstractHandleDistributeSingleClientMessageTypeAdvanced */ public static final byte DISTRIBUTE_SINGLE_CLIENT_MESSAGE = -0X09; + + + /** + * 客户端通道 is active + * + * @see MessageTypeEnums#CLIENT_CHANNEL_ACTIVE + * @see AbstractHandleClientChannelActiveAdvanced + */ + public static final byte CLIENT_CHANNEL_ACTIVE = -0X10; } diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/client/AbstractHandleClientChannelActiveAdvanced.java b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/client/AbstractHandleClientChannelActiveAdvanced.java new file mode 100644 index 0000000..d24ebc3 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/client/AbstractHandleClientChannelActiveAdvanced.java @@ -0,0 +1,25 @@ +package wu.framework.lazy.cloud.heartbeat.common.advanced.client; + + +import wu.framework.lazy.cloud.heartbeat.common.NettyProxyMsg; +import wu.framework.lazy.cloud.heartbeat.common.advanced.AbstractHandleChannelTypeAdvanced; +import wu.framework.lazy.cloud.heartbeat.common.advanced.HandleChannelTypeAdvanced; +import wu.framework.lazy.cloud.heartbeat.common.enums.MessageTypeEnums; + +/** + * 客户端通道 is active + */ + +public abstract class AbstractHandleClientChannelActiveAdvanced extends AbstractHandleChannelTypeAdvanced implements HandleChannelTypeAdvanced { + + /** + * 是否支持当前类型 + * + * @param msg 通道数据 + * @return 布尔类型 是、否 + */ + @Override + public boolean doSupport(NettyProxyMsg msg) { + return MessageTypeEnums.CLIENT_CHANNEL_ACTIVE.getTypeByte() == msg.getType(); + } +} diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleReportConnectSuccessTypeAdvanced.java b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleClientConnectSuccessTypeAdvanced.java similarity index 88% rename from wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleReportConnectSuccessTypeAdvanced.java rename to wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleClientConnectSuccessTypeAdvanced.java index 92b6362..57cd84e 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleReportConnectSuccessTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleClientConnectSuccessTypeAdvanced.java @@ -6,9 +6,9 @@ import wu.framework.lazy.cloud.heartbeat.common.advanced.HandleChannelTypeAdvanc import wu.framework.lazy.cloud.heartbeat.common.enums.MessageTypeEnums; /** - * 客户端连接成功上报处理器 + * 服务端处理客户端连接成功 */ -public abstract class AbstractHandleReportConnectSuccessTypeAdvanced extends AbstractHandleChannelTypeAdvanced implements HandleChannelTypeAdvanced { +public abstract class AbstractHandleClientConnectSuccessTypeAdvanced extends AbstractHandleChannelTypeAdvanced implements HandleChannelTypeAdvanced { /** * 是否支持当前类型 diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleServerChannelActiveTypeAdvanced.java b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleServerChannelActiveTypeAdvanced.java new file mode 100644 index 0000000..215b482 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/advanced/server/AbstractHandleServerChannelActiveTypeAdvanced.java @@ -0,0 +1,27 @@ +package wu.framework.lazy.cloud.heartbeat.common.advanced.server; + + +import wu.framework.lazy.cloud.heartbeat.common.NettyProxyMsg; +import wu.framework.lazy.cloud.heartbeat.common.advanced.AbstractHandleChannelTypeAdvanced; +import wu.framework.lazy.cloud.heartbeat.common.advanced.HandleChannelTypeAdvanced; +import wu.framework.lazy.cloud.heartbeat.common.enums.MessageTypeEnums; + + +/** + * 服务端通道 is active + * SERVER_CHANNEL_ACTIVE + */ +public abstract class AbstractHandleServerChannelActiveTypeAdvanced extends AbstractHandleChannelTypeAdvanced implements HandleChannelTypeAdvanced { + + + /** + * 是否支持当前类型 + * + * @param msg 通道数据 + * @return 布尔类型 是、否 + */ + @Override + public boolean doSupport(NettyProxyMsg msg) { + return MessageTypeEnums.SERVER_CHANNEL_ACTIVE.getTypeByte() == msg.getType(); + } +} diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/enums/MessageTypeEnums.java b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/enums/MessageTypeEnums.java index 9203474..8f6c46e 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/enums/MessageTypeEnums.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/wu/framework/lazy/cloud/heartbeat/common/enums/MessageTypeEnums.java @@ -18,7 +18,7 @@ public enum MessageTypeEnums { */ TYPE_HEARTBEAT(MessageType.TYPE_HEARTBEAT, "心跳"), /** - * @see AbstractHandleReportConnectSuccessTypeAdvanced + * @see AbstractHandleClientConnectSuccessTypeAdvanced */ REPORT_CLIENT_CONNECT_SUCCESS(MessageType.REPORT_CLIENT_CONNECT_SUCCESS, "上报 客户端连接成功"), /** @@ -50,6 +50,10 @@ public enum MessageTypeEnums { * @see AbstractHandleReportSingleClientMessage2OtherClientTypeAdvanced */ REPORT_SINGLE_CLIENT_MESSAGE(MessageType.REPORT_SINGLE_CLIENT_MESSAGE, "上报 客户端消息到另一个客户端"), + /** + * @see AbstractHandleServerChannelActiveTypeAdvanced + */ + SERVER_CHANNEL_ACTIVE(MessageType.SERVER_CHANNEL_ACTIVE, "服务端通道 is active"), /** * @see AbstractHandleDistributeConnectSuccessNotificationTypeAdvancedHandle */ @@ -91,6 +95,10 @@ public enum MessageTypeEnums { * @see AbstractHandleDistributeSingleClientMessageTypeAdvanced */ DISTRIBUTE_SINGLE_CLIENT_MESSAGE(MessageType.DISTRIBUTE_SINGLE_CLIENT_MESSAGE, "下发 客户端消息"), + /** + * @see AbstractHandleClientChannelActiveAdvanced + */ + CLIENT_CHANNEL_ACTIVE(MessageType.CLIENT_CHANNEL_ACTIVE, "客户端通道 is active"), ; 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 f5d4a12..b57ea61 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,13 +1,13 @@ spring: lazy: netty: -# inet-host: 127.0.0.1 -# inet-port: 7001 + 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-host: 124.222.48.62 # 服务端地址 +# inet-port: 30676 #服务端端口 # inet-path: middleground-on-cloud-heartbeat-server - client-id: local # 客户端ID + client-id: wujiawei # 客户端ID data: redis: host: 192.168.17.221 diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/README.md b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/README.md index f8e6f57..53969f7 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/README.md +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/README.md @@ -6,7 +6,7 @@ #docker login --username=1207537021@qq.com registry.cn-hangzhou.aliyuncs.com -mvn clean install +#mvn clean install docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.2.2-JDK17-SNAPSHOT . docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.2.2-JDK17-SNAPSHOT diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleReportConnectSuccessTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleClientConnectSuccessTypeAdvanced.java similarity index 94% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleReportConnectSuccessTypeAdvanced.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleClientConnectSuccessTypeAdvanced.java index dffaa9d..0121815 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleReportConnectSuccessTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleClientConnectSuccessTypeAdvanced.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON; import wu.framework.lazy.cloud.heartbeat.common.ChannelContext; import wu.framework.lazy.cloud.heartbeat.common.MessageType; import wu.framework.lazy.cloud.heartbeat.common.NettyProxyMsg; -import wu.framework.lazy.cloud.heartbeat.common.advanced.server.AbstractHandleReportConnectSuccessTypeAdvanced; +import wu.framework.lazy.cloud.heartbeat.common.advanced.server.AbstractHandleClientConnectSuccessTypeAdvanced; import wu.framework.lazy.cloud.heartbeat.common.utils.ChannelAttributeKeyUtils; import wu.framework.lazy.cloud.heartbeat.server.application.InternalNetworkPenetrationMappingApplication; import wu.framework.lazy.cloud.heartbeat.server.application.NettyClientBlacklistApplication; @@ -25,13 +25,13 @@ import java.util.List; */ @Slf4j @Component -public class ServerHandleReportConnectSuccessTypeAdvanced extends AbstractHandleReportConnectSuccessTypeAdvanced { +public class ServerHandleClientConnectSuccessTypeAdvanced extends AbstractHandleClientConnectSuccessTypeAdvanced { private final ServerNettyConfigApplication serverNettyConfigApplication; private final NettyClientBlacklistApplication nettyClientBlacklistApplication; private final InternalNetworkPenetrationMappingApplication internalNetworkPenetrationMappingApplication; - public ServerHandleReportConnectSuccessTypeAdvanced(ServerNettyConfigApplication serverNettyConfigApplication, NettyClientBlacklistApplication nettyClientBlacklistApplication, InternalNetworkPenetrationMappingApplication internalNetworkPenetrationMappingApplication) { + public ServerHandleClientConnectSuccessTypeAdvanced(ServerNettyConfigApplication serverNettyConfigApplication, NettyClientBlacklistApplication nettyClientBlacklistApplication, InternalNetworkPenetrationMappingApplication internalNetworkPenetrationMappingApplication) { this.serverNettyConfigApplication = serverNettyConfigApplication; this.nettyClientBlacklistApplication = nettyClientBlacklistApplication; this.internalNetworkPenetrationMappingApplication = internalNetworkPenetrationMappingApplication; 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 index 772c8fd..2b739c0 100644 --- 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 @@ -37,11 +37,11 @@ public class HeartbeatServerConfiguration { @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean - public ServerHandleReportConnectSuccessTypeAdvanced serverReportConnectSuccessTypeAdvanced( + public ServerHandleClientConnectSuccessTypeAdvanced serverReportConnectSuccessTypeAdvanced( ServerNettyConfigApplication serverNettyConfigApplication, NettyClientBlacklistApplication nettyClientBlacklistApplication, InternalNetworkPenetrationMappingApplication internalNetworkPenetrationMappingApplication) { - return new ServerHandleReportConnectSuccessTypeAdvanced(serverNettyConfigApplication, nettyClientBlacklistApplication, internalNetworkPenetrationMappingApplication); + return new ServerHandleClientConnectSuccessTypeAdvanced(serverNettyConfigApplication, nettyClientBlacklistApplication, internalNetworkPenetrationMappingApplication); } @Role(BeanDefinition.ROLE_INFRASTRUCTURE) diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/handler/NettyServerHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/handler/NettyServerHandler.java index 3ada08a..de0a1c3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/handler/NettyServerHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/handler/NettyServerHandler.java @@ -101,12 +101,14 @@ public class NettyServerHandler extends SimpleChannelInboundHandler