Browse Source

修改DeviceInfo的id生成规则,过滤mac地址中长度不为17的非ipv4地址,忽略所有存储设备标识

Signed-off-by: luoshi <luoshi@qmth.com.cn>
luoshi 3 năm trước cách đây
mục cha
commit
05aa679669

+ 3 - 3
tools-device/src/main/java/com/qmth/boot/tools/device/DeviceInfo.java

@@ -64,8 +64,8 @@ public class DeviceInfo {
                             .toArray(String[]::new));
             //networkinterface
             current.networkInterface.setMacAddress(
-                    hardware.getNetworkIFs().stream().map(NetworkIF::getMacaddr).distinct().sorted()
-                            .toArray(String[]::new));
+                    hardware.getNetworkIFs().stream().map(NetworkIF::getMacaddr).filter(addr -> addr.length() == 17)
+                            .distinct().sorted().toArray(String[]::new));
         }
         return current;
     }
@@ -80,7 +80,7 @@ public class DeviceInfo {
         list.add("computer.serialNumber=" + StringUtils.trimToEmpty(computer.getSerialNumber()));
         list.add("baseboard.serialNumber=" + StringUtils.trimToEmpty(baseboard.getSerialNumber()));
         list.add("processor.id=" + StringUtils.trimToEmpty(processor.getId()));
-        list.add("diskStore.serials=" + StringUtils.trimToEmpty(StringUtils.join(diskStore.getSerials(), ",")));
+        //list.add("diskStore.serials=" + StringUtils.trimToEmpty(StringUtils.join(diskStore.getSerials(), ",")));
         list.add("networkInterface.macAddress=" + StringUtils
                 .trimToEmpty(StringUtils.join(networkInterface.getMacAddress(), ",")));
         return ByteArray.md5(StringUtils.join(list, "\n")).toHexString();