From 5cfdb89ea9e530fc6bcdc6fb1c7307780cc4a097 Mon Sep 17 00:00:00 2001
From: lijw <lijw@123.com>
Date: Tue, 1 Apr 2025 19:10:09 +0800
Subject: [PATCH] =?UTF-8?q?netty=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspect/tcpserver/tcp/NettyServer.java    |  4 ++--
 .../tcpserver/tcp/NettyServerHandler.java     | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
index 35623b0..57586a6 100644
--- a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
+++ b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
@@ -159,7 +159,7 @@ public class NettyServer {
             allBuf.writeByte(0xEB);
             allBuf.writeByte(0x90);
             redisTemplate.opsForValue().set(String.valueOf(sendIndex), allBuf.toString(CharsetUtil.US_ASCII), 60L, TimeUnit.SECONDS);
-            nettyServerHandler.sendMsg(uuid, clientKey, allBuf, compact(xml));
+            nettyServerHandler.sendMsg(uuid, clientKey, allBuf, compact(xml), request);
             sendIndex++;
         } else {
             logger.warn(Color.RED + "###### 客户端[{}]离线! ######" + Color.END, clientKey);
@@ -188,7 +188,7 @@ public class NettyServer {
             allBuf.writeByte(0xEB);
             allBuf.writeByte(0x90);
             redisTemplate.opsForValue().set(String.valueOf(sendIndex), allBuf.toString(CharsetUtil.US_ASCII), 60L, TimeUnit.SECONDS);
-            nettyServerHandler.sendMsg(uuid, client, allBuf, compact(xml));
+            nettyServerHandler.sendMsg(uuid, client, allBuf, compact(xml), request);
             sendIndex++;
             try {
                 Thread.sleep(1);
diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyServerHandler.java b/src/main/java/com/inspect/tcpserver/tcp/NettyServerHandler.java
index 85b2181..479de99 100644
--- a/src/main/java/com/inspect/tcpserver/tcp/NettyServerHandler.java
+++ b/src/main/java/com/inspect/tcpserver/tcp/NettyServerHandler.java
@@ -18,19 +18,31 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
         this.nettyServer = nettyServer;
     }
 
-    public void sendMsg(String uuid, String clientKey, ByteBuf byteBuf, String xml) {
+    public void sendMsg(String uuid, String clientKey, ByteBuf byteBuf, String xml, boolean request) {
         ChannelHandlerContext ctx = ChannelCache.getInstance().get(clientKey);
         if(ctx != null) {
             ctx.writeAndFlush(Unpooled.wrappedBuffer(byteBuf)).addListener(
                     (ChannelFuture future) -> {
                         if (future.isSuccess()) {
-                            logger.info(Color.CYAN + "###### 活动连接:{},向客户端[{}]下发消息成功:{}######" + Color.END, ChannelCache.getInstance().getClients(), clientKey, xml);
+                            if(request) {
+                                logger.info(Color.CYAN + "###### 活动连接:{},向客户端[{}]下发消息成功:{}######" + Color.END, ChannelCache.getInstance().getClients(), clientKey, xml);
+                            } else {
+                                logger.info(Color.CYAN + "###### 活动连接:{},向客户端[{}]响应成功######" + Color.END, ChannelCache.getInstance().getClients(), clientKey);
+                            }
                         } else {
-                            logger.error(Color.RED + "###### 活动连接:{},向客户端[{}]下发消息失败:{}######" + Color.END, ChannelCache.getInstance().getClients(), clientKey, xml);
+                            if(request) {
+                                logger.error(Color.RED + "###### 活动连接:{},向客户端[{}]下发消息失败:{}######" + Color.END, ChannelCache.getInstance().getClients(), clientKey, xml);
+                            } else {
+                                logger.error(Color.RED + "###### 活动连接:{},向客户端[{}]响应失败######" + Color.END, ChannelCache.getInstance().getClients(), clientKey);
+                            }
                         }
                     });
         } else {
-            logger.error(Color.RED + "###### 活动连接:{},无法向客户端[{}]下发消息,ctx==null######" + Color.END, ChannelCache.getInstance().getClients(), clientKey);
+            if(request) {
+                logger.error(Color.RED + "###### 活动连接:{},无法向客户端[{}]下发消息,ctx==null######" + Color.END, ChannelCache.getInstance().getClients(), clientKey);
+            } else {
+                logger.error(Color.RED + "###### 活动连接:{},无法向客户端[{}]响应,ctx==null######" + Color.END, ChannelCache.getInstance().getClients(), clientKey);
+            }
         }
     }