From a7d0f42423616548ec3da670ea6b22091963636d Mon Sep 17 00:00:00 2001 From: xiaolong Date: Fri, 28 Dec 2018 13:44:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?https://github.com/uavorg/uavstack/issues/4?= =?UTF-8?q?66=201.=E8=BE=93=E5=87=BA=E6=89=80=E6=9C=89=E7=BD=91=E5=8D=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E5=8A=A0=E5=85=A5=E7=BD=91=E5=8D=A1?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/creditease/agent/SystemStarter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java b/com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java index 1a6e0709..638ba87e 100644 --- a/com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java +++ b/com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java @@ -203,7 +203,9 @@ private void checkNetworkReady() { for (InetAddress addr : NetworkHelper.getAllIP()) { - ipmsg.append("\n").append(index++).append(" ----- ").append(addr.getHostAddress()); + String ip = addr.getHostAddress(); + + ipmsg.append("\n").append(index++).append(" ----- ").append(NetworkHelper.getNetCardName(ip)).append(" ----- ").append(ip); } log.info(this, ipmsg.toString()); From 36edd32cec428724f9e9e3a7c5cc18d6d3d35e8f Mon Sep 17 00:00:00 2001 From: xiaolong Date: Fri, 28 Dec 2018 13:44:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?https://github.com/uavorg/uavstack/issues/4?= =?UTF-8?q?66=201.=E8=BE=93=E5=87=BA=E6=89=80=E6=9C=89=E7=BD=91=E5=8D=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E5=8A=A0=E5=85=A5=E7=BD=91=E5=8D=A1?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/creditease/agent/SystemStarter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java b/com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java index 1a6e0709..4decb3b3 100644 --- a/com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java +++ b/com.creditease.uav.base/src/main/java/com/creditease/agent/SystemStarter.java @@ -197,13 +197,15 @@ private void checkNetworkReady() { isReady = true; - StringBuffer ipmsg = new StringBuffer("List NetCardIndex and IP Address:"); + StringBuffer ipmsg = new StringBuffer("List NetCardIndex NetCardName and IP Address:"); int index = 0; for (InetAddress addr : NetworkHelper.getAllIP()) { - ipmsg.append("\n").append(index++).append(" ----- ").append(addr.getHostAddress()); + String ip = addr.getHostAddress(); + + ipmsg.append("\n").append(index++).append(" ----- ").append(NetworkHelper.getNetCardName(ip)).append(" ----- ").append(ip); } log.info(this, ipmsg.toString());