【fix】log

wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettyServerProxyClientVisitorInboundHandler.java

@@ -27,12 +27,12 @@ public class NettyServerProxyClientVisitorInboundHandler extends SimpleChannelIn
 
     @Override
     public void channelRead0(ChannelHandlerContext ctx, NettyByteBuf nettyByteBuf) throws Exception {
-        log.info("【socks】转发客户端的请求到代理服务器");
+        log.info("【socks】转发服务端请求到客户端");
         // 结果下发
         Channel channel = ctx.channel();
         byte[] bytes = nettyByteBuf.getData();
         log.debug("bytes.length:{}",bytes.length);
-        log.debug("客户端代理服务端,socks本地接收请求数据:{}", new String(bytes));
+        log.debug("服务端代理客户端,socks本地接收请求数据:{}", new String(bytes));
         Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel);
 
         if (nextChannel.isActive()) {

wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientTransferHandler.java

@@ -36,7 +36,7 @@ public class NettySocksServerProxyClientTransferHandler extends SimpleChannelInb
         String clientId = ChannelAttributeKeyUtils.getClientId(ctx.channel());
         String visitorId = ChannelAttributeKeyUtils.getVisitorId(ctx.channel());
         Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(ctx.channel());
-        log.warn("close client permeate client transfer real clientId:{} visitorId:{}", clientId, visitorId);
+        log.warn("close server proxy client transfer real clientId:{} visitorId:{}", clientId, visitorId);
         // 关闭访客
         if (nextChannel != null) {
 

wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/constant/ProxyMessageType.java

@@ -243,49 +243,31 @@ public class ProxyMessageType {
      */
     public static final byte SOCKS_SERVER_PROXY_CLIENT_ = SOCKS_REPORT_CLIENT_PROXY_CLIENT_TRANSFER_CLOSE_ + 1;
 
-    /**
+
-     * socket 下发客户端代理服务端连接初始化
-     *
-     * @see ProxyMessageTypeEnums#SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_INIT_
-     * @see AbstractHandleSocksDistributeServerProxyClientConnectionInitTypeAdvanced
-     */
-    public static final byte SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_INIT_ = SOCKS_SERVER_PROXY_CLIENT_ - 1;
     /**
      * socket 上报客户端代理服务端连接初始化成功
      *
      * @see ProxyMessageTypeEnums#SOCKS_REPORT_SERVER_PROXY_CLIENT_CONNECTION_SUCCESS_
      * @see AbstractHandleSocksReportServerProxyClientConnectionSuccessTypeAdvanced
      */
-    public static final byte SOCKS_REPORT_SERVER_PROXY_CLIENT_CONNECTION_SUCCESS_ = SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_INIT_ - 1;
+    public static final byte SOCKS_REPORT_SERVER_PROXY_CLIENT_CONNECTION_SUCCESS_ = SOCKS_SERVER_PROXY_CLIENT_ + 1;
+
 
-    /**
-     * socket 下发客户端代理服务端 请求数据
-     *
-     * @see ProxyMessageTypeEnums#SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_REQUEST_
-     * @see AbstractHandleSocksDistributeServerProxyClientRequestTypeAdvanced
-     */
-    public static final byte SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_REQUEST_ = SOCKS_REPORT_SERVER_PROXY_CLIENT_CONNECTION_SUCCESS_ - 1;
     /**
      * socket 上报客户端代理服务端 结果返回
      *
      * @see ProxyMessageTypeEnums#SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_RESPONSE_
      * @see AbstractHandleSocksReportServerProxyClientResponseTypeAdvanced
      */
-    public static final byte SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_RESPONSE_ = SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_REQUEST_ - 1;
+    public static final byte SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_RESPONSE_ = SOCKS_REPORT_SERVER_PROXY_CLIENT_CONNECTION_SUCCESS_ + 1;
-    /**
+
-     * socket 下发客户端代理服务端 传输通道关闭
-     *
-     * @see ProxyMessageTypeEnums#SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_
-     * @see AbstractHandleSocksDistributeServerProxyClientTransferCloseAdvanced
-     */
-    public static final byte SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_ = SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_RESPONSE_ - 1;
     /**
      * socket 上报客户端代理服务端 传输通道关闭
      *
      * @see ProxyMessageTypeEnums#SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_
      * @see AbstractHandleSocksReportServerProxyClientTransferCloseTypeAdvanced
      */
-    public static final byte SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_ = SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_ - 1;
+    public static final byte SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_ = SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_RESPONSE_ + 1;
 
 
 
@@ -466,6 +448,28 @@ public class ProxyMessageType {
     public static final byte SOCKS_DISTRIBUTE_CLIENT_PROXY_CLIENT_TRANSFER_CLOSE_ = SOCKS_DISTRIBUTE_CLIENT_PROXY_CLIENT_TRANSFER_RESPONSE_ - 1;
 
 
+    /**
+     * socket 下发客户端代理服务端连接初始化
+     *
+     * @see ProxyMessageTypeEnums#SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_INIT_
+     * @see AbstractHandleSocksDistributeServerProxyClientConnectionInitTypeAdvanced
+     */
+    public static final byte SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_INIT_ = SOCKS_DISTRIBUTE_CLIENT_PROXY_CLIENT_TRANSFER_CLOSE_ - 1;
+    /**
+     * socket 下发客户端代理服务端 请求数据
+     *
+     * @see ProxyMessageTypeEnums#SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_REQUEST_
+     * @see AbstractHandleSocksDistributeServerProxyClientRequestTypeAdvanced
+     */
+    public static final byte SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_REQUEST_ = SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_INIT_ - 1;
+    /**
+     * socket 下发客户端代理服务端 传输通道关闭
+     *
+     * @see ProxyMessageTypeEnums#SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_
+     * @see AbstractHandleSocksDistributeServerProxyClientTransferCloseAdvanced
+     */
+    public static final byte SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_ = SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_REQUEST_ - 1;
+
 
 
 }