|
@@ -64,8 +64,8 @@ public class DeviceInfo {
|
|
.toArray(String[]::new));
|
|
.toArray(String[]::new));
|
|
//networkinterface
|
|
//networkinterface
|
|
current.networkInterface.setMacAddress(
|
|
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;
|
|
return current;
|
|
}
|
|
}
|
|
@@ -80,7 +80,7 @@ public class DeviceInfo {
|
|
list.add("computer.serialNumber=" + StringUtils.trimToEmpty(computer.getSerialNumber()));
|
|
list.add("computer.serialNumber=" + StringUtils.trimToEmpty(computer.getSerialNumber()));
|
|
list.add("baseboard.serialNumber=" + StringUtils.trimToEmpty(baseboard.getSerialNumber()));
|
|
list.add("baseboard.serialNumber=" + StringUtils.trimToEmpty(baseboard.getSerialNumber()));
|
|
list.add("processor.id=" + StringUtils.trimToEmpty(processor.getId()));
|
|
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
|
|
list.add("networkInterface.macAddress=" + StringUtils
|
|
.trimToEmpty(StringUtils.join(networkInterface.getMacAddress(), ",")));
|
|
.trimToEmpty(StringUtils.join(networkInterface.getMacAddress(), ",")));
|
|
return ByteArray.md5(StringUtils.join(list, "\n")).toHexString();
|
|
return ByteArray.md5(StringUtils.join(list, "\n")).toHexString();
|