From 1924e87c7dddb650e6bd687de55e74aa28859bf5 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Thu, 21 Nov 2024 22:54:19 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=20=E4=BC=98=E5=8C=96=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ributeConnectSuccessNotificationTypeAdvancedHandle.java | 4 ++-- .../heartbeat/common/NettyClientVisitorContext.java | 4 +++- .../record/LazyNettyClientStateRecordQueryListCommand.java | 4 +++- .../application/dto/LazyNettyClientStateRecordDTO.java | 7 +++++++ .../impl/LazyNettyClientStateApplicationImpl.java | 1 - 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/advanced/HandleDistributeConnectSuccessNotificationTypeAdvancedHandle.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/advanced/HandleDistributeConnectSuccessNotificationTypeAdvancedHandle.java index ccba641..ff6d138 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/advanced/HandleDistributeConnectSuccessNotificationTypeAdvancedHandle.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/advanced/HandleDistributeConnectSuccessNotificationTypeAdvancedHandle.java @@ -36,8 +36,8 @@ public class HandleDistributeConnectSuccessNotificationTypeAdvancedHandle extend // 存储其他客户端状态 List clientIdList = JSONObject.parseArray(new String(msg.getData()), String.class); - for (String tenantId : clientIdList) { - clientChangeEvent.clientOnLine(tenantId); + for (String clientId : clientIdList) { + clientChangeEvent.clientOnLine(clientId); } } diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyClientVisitorContext.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyClientVisitorContext.java index 7134989..a0ad166 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyClientVisitorContext.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyClientVisitorContext.java @@ -56,7 +56,9 @@ public class NettyClientVisitorContext { public static void removeVisitorSocket(String clientId, T visitorSocket) { List visitorSocketList = VISITOR_SOCKET.get(clientId); if(!ObjectUtils.isEmpty(visitorSocketList)){ - visitorSocketList.remove(visitorSocket); + while(visitorSocketList.iterator().hasNext()){ + visitorSocketList.iterator().remove(); + } VISITOR_SOCKET.put(clientId,visitorSocketList); } } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryListCommand.java index e138e5c..089f32b 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryListCommand.java @@ -3,6 +3,8 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.NettyClientStatus; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -45,7 +47,7 @@ public class LazyNettyClientStateRecordQueryListCommand { * 在线状态（true在线，false离线） */ @Schema(description ="在线状态（true在线，false离线）",name ="onLineState",example = "") - private String onLineState; + private NettyClientStatus onLineState; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateRecordDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateRecordDTO.java index 0db01eb..0637c92 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateRecordDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateRecordDTO.java @@ -63,5 +63,12 @@ public class LazyNettyClientStateRecordDTO { */ @Schema(description ="暂存状态（开启、关闭）",name ="stagingState",example = "") private String stagingState; + /** + * 原始IP + * byte[] 长度 4 + * + * @since 1.2.9 + */ + private String originalIp; } \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientStateApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientStateApplicationImpl.java index 9bdaf1d..c211cbf 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientStateApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientStateApplicationImpl.java @@ -209,7 +209,6 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState // 关闭访客 List nettyServerPermeateClientVisitorSocketList = NettyClientVisitorContext.getVisitorSockets(clientId); if (!ObjectUtils.isEmpty(nettyServerPermeateClientVisitorSocketList)) { - log.info("size:{}",nettyServerPermeateClientVisitorSocketList.size()); for (NettyServerPermeateClientVisitorSocket nettyServerPermeateClientVisitorSocket : nettyServerPermeateClientVisitorSocketList) { nettyServerPermeateClientVisitorSocket.close(); }