From eef056bd34828e3015048c785ef50e8fbd8f1368 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 二月 2026 10:12:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/entity/license/WindowsServerInfos.java | 8 ++++++--
src/main/java/com/zy/system/entity/license/LinuxServerInfos.java | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/license/LinuxServerInfos.java b/src/main/java/com/zy/system/entity/license/LinuxServerInfos.java
index 0f40daf..088301a 100644
--- a/src/main/java/com/zy/system/entity/license/LinuxServerInfos.java
+++ b/src/main/java/com/zy/system/entity/license/LinuxServerInfos.java
@@ -36,7 +36,11 @@
if (inetAddresses != null && inetAddresses.size() > 0) {
//2. 鑾峰彇鎵�鏈夌綉缁滄帴鍙ｇ殑Mac鍦板潃
- result = inetAddresses.stream().map(this::getMacByInetAddress).distinct().collect(Collectors.toList());
+ result = inetAddresses.stream()
+ .map(this::getMacByInetAddress)
+ .filter(mac -> mac != null && !mac.trim().isEmpty())
+ .distinct()
+ .collect(Collectors.toList());
}
return result;
@@ -88,4 +92,4 @@
reader.close();
return serialNumber;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java b/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
index c575e6d..fc13a11 100644
--- a/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
+++ b/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
@@ -33,7 +33,11 @@
if(inetAddresses != null && inetAddresses.size() > 0){
//2. 鑾峰彇鎵�鏈夌綉缁滄帴鍙ｇ殑Mac鍦板潃
- result = inetAddresses.stream().map(this::getMacByInetAddress).distinct().collect(Collectors.toList());
+ result = inetAddresses.stream()
+ .map(this::getMacByInetAddress)
+ .filter(mac -> mac != null && !mac.trim().isEmpty())
+ .distinct()
+ .collect(Collectors.toList());
}
return result;
@@ -82,4 +86,4 @@
scanner.close();
return serialNumber;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1