From 0382c300d7479c9e1b788ee1b859ccca72897ec5 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Tue, 23 Jan 2024 17:38:32 +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 --- .../src/main/resources/application-dev.yml | 8 ++++---- ...erHandleClientConnectSuccessTypeAdvanced.java | 2 +- .../server/netty/handler/VisitorHandler.java | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) 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 b57ea61..562705a 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,11 +1,11 @@ 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: wujiawei # 客户端ID data: diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleClientConnectSuccessTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleClientConnectSuccessTypeAdvanced.java index 0121815..69e7e78 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleClientConnectSuccessTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/advanced/ServerHandleClientConnectSuccessTypeAdvanced.java @@ -52,7 +52,7 @@ public class ServerHandleClientConnectSuccessTypeAdvanced extends AbstractHandle ChannelContext.push(newChannel, clientId); ChannelAttributeKeyUtils.buildClientId(newChannel,clientId); - log.info("客户端:{}连接成功",new String(msg.getClientId())); + log.info("客户端:{}，IP:{}连接成功",new String(msg.getClientId()),newChannel.remoteAddress().toString()); // 验证客户端是否时黑名单 NettyClientBlacklist nettyClientBlacklist = new NettyClientBlacklist(); nettyClientBlacklist.setClientId(clientId); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/handler/VisitorHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/handler/VisitorHandler.java index 6326ee2..a702186 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/handler/VisitorHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/handler/VisitorHandler.java @@ -40,20 +40,20 @@ public class VisitorHandler extends SimpleChannelInboundHandler { // 当前通道绑定访客ID ChannelAttributeKeyUtils.buildVisitorId(visitorChannel, visitorId); ChannelAttributeKeyUtils.buildClientId(visitorChannel, clientId); - NettyProxyMsg myMsg = new NettyProxyMsg(); - myMsg.setType(MessageType.DISTRIBUTE_SINGLE_CLIENT_REAL_CONNECT); - myMsg.setClientId(clientId); - myMsg.setVisitorPort(visitorPort); - myMsg.setClientTargetIp(clientTargetIp); - myMsg.setClientTargetPort(clientTargetPort); + NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); + nettyProxyMsg.setType(MessageType.DISTRIBUTE_SINGLE_CLIENT_REAL_CONNECT); + nettyProxyMsg.setClientId(clientId); + nettyProxyMsg.setVisitorPort(visitorPort); + nettyProxyMsg.setClientTargetIp(clientTargetIp); + nettyProxyMsg.setClientTargetPort(clientTargetPort); - myMsg.setVisitorId(visitorId); + nettyProxyMsg.setVisitorId(visitorId); // 客户端心跳通道 ChannelContext.ClientChannel clientChannel = ChannelContext.get(clientId); if (clientChannel != null) { Channel channel = clientChannel.getChannel(); - channel.writeAndFlush(myMsg); + channel.writeAndFlush(nettyProxyMsg); }else { log.error("无法通过客户端ID获取客户端通道"); }