From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码

---
 MessagePushTravel/src/main/java/com/sinata/push/util/echo/DiscardServerHandler.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MessagePushTravel/src/main/java/com/sinata/push/util/echo/DiscardServerHandler.java b/MessagePushTravel/src/main/java/com/sinata/push/util/echo/DiscardServerHandler.java
index 797138d..c0351a9 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/util/echo/DiscardServerHandler.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/util/echo/DiscardServerHandler.java
@@ -21,7 +21,7 @@
 	public void channelRead(ChannelHandlerContext ctx, Object msg) {
 		InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
 		if(isdebug) {
-//			System.err.println(insocket.getAddress() + ": 收到客户端数据.......");
+			System.err.println(insocket.getAddress() + ": 收到客户端数据.......");
 		}
 		try {
 			// 调用service
@@ -37,7 +37,7 @@
 	protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
 		InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
 		if(isdebug) {
-//			System.err.println(insocket.getAddress() + ": 收到客户端数据.......");
+			System.err.println(insocket.getAddress() + ": 收到客户端数据.......");
 		}
 		try {
 			// 调用service
@@ -68,7 +68,7 @@
 	public void channelActive(final ChannelHandlerContext ctx) throws Exception {
 		InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
 		if(isdebug) {
-//			System.err.println(insocket.getAddress() + ": Connect successful......");
+			System.err.println(insocket.getAddress() + ": Connect successful......");
 		}
 	}
 
@@ -90,7 +90,7 @@
 				String msg = NettyMsg.setMsg(Method.ok, new HashMap<String, Object>());
 				if(ctx != null && ctx.channel().isActive()) {
 					ctx.writeAndFlush(Unpooled.copiedBuffer((msg).getBytes()));
-//					System.err.println(msg);
+					System.err.println(msg);
 				}
 			}
 		}
@@ -101,11 +101,11 @@
 	public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 		if(isdebug) {
 			InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
-//			System.err.println(insocket.getAddress() + ": Disconnect connection......");
+			System.err.println(insocket.getAddress() + ": Disconnect connection......");
 		}
 		NettyChannelMap.remove(ctx);
-//		System.err.println("清除通道" + ctx);
-//		super.channelInactive(ctx);
+		System.err.println("清除通道" + ctx);
+		super.channelInactive(ctx);
 	}
 
 	public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {

--
Gitblit v1.7.1