From b9afa996234cc50fec2c280d08c50d8ffe8ddd1b Mon Sep 17 00:00:00 2001
From: gaoyutao <duguprogromer@163.com>
Date: Tue, 6 Jan 2026 19:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96agent=E5=A4=9A=E7=BD=91?=
 =?UTF-8?q?=E5=8D=A1ip=E6=8E=A2=E6=B5=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agent/client/service/impl/AgentServiceImpl.java       | 4 +++-
 .../tongran/agent/client/utils/NetworkInterfaceUtil.java  | 8 ++++----
 .../java/com/tongran/agent/client/utils/NetworkUtil.java  | 2 +-
 src/main/resources/application-dev.yml                    | 2 +-
 src/main/resources/application.yml                        | 3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/tongran/agent/client/service/impl/AgentServiceImpl.java b/src/main/java/com/tongran/agent/client/service/impl/AgentServiceImpl.java
index c8bebde..fa3e64c 100644
--- a/src/main/java/com/tongran/agent/client/service/impl/AgentServiceImpl.java
+++ b/src/main/java/com/tongran/agent/client/service/impl/AgentServiceImpl.java
@@ -303,7 +303,9 @@ public class AgentServiceImpl implements AgentService {
         long milli = AgentUtil.getMillisToNextMinute() + 60000;
         AssertLog.info("启动更新策略定时任务 - 延迟: {}ms, 间隔: {}ms", milli, 60000);
         dynamicTaskService.scheduleTask("policy", businessTasks::policyTask, milli, 60000);
-
+        // 创建多网IP探测上报
+        AssertLog.info("启动多网IP探测定时任务 - 延迟: {}ms, 间隔: {}ms", milli, 300000);
+        dynamicTaskService.scheduleTask("networkDetect", businessTasks::networkDetectTask, milli, 300000);
         // 检测监控策略配置
         AssertLog.info("检测监控策略配置");
         checkMonitor();
diff --git a/src/main/java/com/tongran/agent/client/utils/NetworkInterfaceUtil.java b/src/main/java/com/tongran/agent/client/utils/NetworkInterfaceUtil.java
index 068b79c..be6a2d7 100644
--- a/src/main/java/com/tongran/agent/client/utils/NetworkInterfaceUtil.java
+++ b/src/main/java/com/tongran/agent/client/utils/NetworkInterfaceUtil.java
@@ -100,10 +100,10 @@ public class NetworkInterfaceUtil {
                     } else {
                         AssertLog.info("  未能提取公网 IP 地址");
                     }
-                    if (StringUtils.isBlank(publicIp)) {
-                        AssertLog.info("  跳过网卡 {}: 无公网IP", name);
-                        continue;
-                    }
+//                    if (StringUtils.isBlank(publicIp)) {
+//                        AssertLog.info("  跳过网卡 {}: 无公网IP", name);
+//                        continue;
+//                    }
                     for (String ip : publicIps) {
                         if (ip != null && !ip.isEmpty()) {
                             // 删除临时路由
diff --git a/src/main/java/com/tongran/agent/client/utils/NetworkUtil.java b/src/main/java/com/tongran/agent/client/utils/NetworkUtil.java
index 4289e53..2ac4d11 100644
--- a/src/main/java/com/tongran/agent/client/utils/NetworkUtil.java
+++ b/src/main/java/com/tongran/agent/client/utils/NetworkUtil.java
@@ -47,7 +47,7 @@ public class NetworkUtil {
                 ip + "/" + prefix, "via", gateway, "dev", dev);
             return pb.start().waitFor() == 0;
         } catch (Exception e) {
-            e.printStackTrace();
+            AssertLog.error("删除路由失败：{}", e.getMessage());
             return false;
         }
     }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 48e360c..9efad49 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -17,7 +17,7 @@ logging:
 netty:
   server:
     host: 120.211.95.173
-    port: 56620
+    port: 6620
   client:
     client-id: client-001
     reconnect-interval: 5
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3c92356..fd11e1e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,12 +6,13 @@ spring:
       matching-strategy: ant_path_matcher
   application:
     name: tr-agent-client
-    version: 1.1.7
+    version: 1.1.10
     conf-path: /usr/local/tongran/conf
     script-path: /usr/local/tongran/sbin
     tmp-path: /usr/local/tongran/tmp
     temp-path: /usr/local/tongran/temp
     frp-path: /usr/local/tongran/frp
+    poe-path: /usr/local/tongran/sbin/pppoe1
   web:
     resources:
       static-locations: classpath*:/META-INF/resources/