From 0f79643e35af90cb63a4b3c67ee72abfe0e37770 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 01 八月 2025 12:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 MessagePushTravel/src/main/java/com/sinata/push/util/echo/DiscardServerHandler.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 f83843a..c2a291d 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
@@ -1,5 +1,6 @@
 package com.sinata.push.util.echo;
 
+import com.sinata.push.util.SpringUtil;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
@@ -7,13 +8,14 @@
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
 import io.netty.util.ReferenceCountUtil;
+import org.springframework.data.redis.core.RedisTemplate;
 
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 
 public class DiscardServerHandler extends SimpleChannelInboundHandler<String>  {
 
-	private NettyServerController nettyServerController = new NettyServerController();
+	private NettyServerController nettyServerController = SpringUtil.getObject(NettyServerController.class);
 	
 	public static boolean isdebug = true;
 
@@ -21,7 +23,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 +39,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 +70,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......");
 		}
 	}
 

--
Gitblit v1.7.1