From f905f4377db462640a4fdd53dc5daa1adfc8c542 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 14 Oct 2025 18:30:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
index 7fbf709..3a1ec4b 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
@@ -7,7 +7,7 @@
 import com.ard.work.component.netty.handler.MessageProtocolEncoder;
 import com.ard.work.domain.cache.TyTcpServerCache;
 import com.ard.work.domain.entity.ArdServerInfo;
-import com.ard.work.service.IArdServerService;
+import com.ard.work.service.IArdServerInfoService;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -36,7 +36,7 @@
     private final EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
 
     @Resource
-    private IArdServerService ardServerService; // ← 从数据库读取边缘服务器配置
+    private IArdServerInfoService ardServerService; // ← 从数据库读取边缘服务器配置
 
     @Resource
     private ClientHandler clientHandler;

--
Gitblit v1.9.3