From 4b8ec0b33b26f64f4568e482b3696d1017904b53 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sun, 23 Oct 2022 13:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/client/core/RealServerChannelHandler.java         | 4 ++--
 .../java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java | 2 +-
 .../java/fun/asgc/neutrino/proxy/core/ProxyMessage.java     | 5 ++---
 .../proxy/server/proxy/core/VisitorChannelHandler.java      | 6 +++---
 .../java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
index da9847f6..24ef9aa4 100755
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
@@ -49,7 +49,7 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
         } else {
             byte[] bytes = new byte[buf.readableBytes()];
             buf.readBytes(bytes);
-            String visitorId = ProxyUtil.getRealServerChannelVisitorId(realServerChannel);
+            String visitorId = ProxyUtil.getVisitorIdByRealServerChannel(realServerChannel);
             channel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));
         }
     }
@@ -62,7 +62,7 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         Channel realServerChannel = ctx.channel();
-        String visitorId = ProxyUtil.getRealServerChannelVisitorId(realServerChannel);
+        String visitorId = ProxyUtil.getVisitorIdByRealServerChannel(realServerChannel);
         ProxyUtil.removeRealServerChannel(visitorId);
         Channel channel = realServerChannel.attr(Constants.NEXT_CHANNEL).get();
         if (channel != null) {
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
index fe59c4af..4d3b27f3 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
@@ -101,7 +101,7 @@ public class ProxyUtil {
 		realServerChannel.attr(Constants.VISITOR_ID).set(visitorId);
 	}
 
-	public static String getRealServerChannelVisitorId(Channel realServerChannel) {
+	public static String getVisitorIdByRealServerChannel(Channel realServerChannel) {
 		return realServerChannel.attr(Constants.VISITOR_ID).get();
 	}
 
diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java b/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
index d17432da..7e3041fc 100644
--- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
+++ b/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
@@ -27,7 +27,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  *
@@ -125,9 +124,9 @@ public class ProxyMessage {
             .setInfo(info);
     }
 
-    public static ProxyMessage buildTransferMessage(String info, byte[] data) {
+    public static ProxyMessage buildTransferMessage(String visitorId, byte[] data) {
         return create().setType(TYPE_TRANSFER)
-            .setInfo(info)
+            .setInfo(visitorId)
             .setData(data);
     }
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
index 62839841..0ca26919 100755
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
@@ -63,8 +63,8 @@ public class VisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf>
         } else {
             byte[] bytes = new byte[buf.readableBytes()];
             buf.readBytes(bytes);
-            String userId = ProxyUtil.getVisitorChannelUserId(visitorChannel);
-            proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(userId, bytes));
+            String visitorId = ProxyUtil.getVisitorIdByChannel(visitorChannel);
+            proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));
         }
     }
 
@@ -104,7 +104,7 @@ public class VisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf>
         } else {
 
             // 用户连接断开，从控制连接中移除
-            String userId = ProxyUtil.getVisitorChannelUserId(userChannel);
+            String userId = ProxyUtil.getVisitorIdByChannel(userChannel);
             ProxyUtil.removeVisitorChannelFromCmdChannel(cmdChannel, userId);
 
             Channel proxyChannel = userChannel.attr(Constants.NEXT_CHANNEL).get();
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
index 738f8b76..ce1fc2b5 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
@@ -217,12 +217,12 @@ public class ProxyUtil {
 	}
 
 	/**
-	 * 获取用户编号
+	 * 获取访问者ID
 	 *
 	 * @param visitorChannel
 	 * @return
 	 */
-	public static String getVisitorChannelUserId(Channel visitorChannel) {
+	public static String getVisitorIdByChannel(Channel visitorChannel) {
 		if (null == visitorChannel || null == getAttachInfo(visitorChannel)) {
 			return null;
 		}