diff --git a/pom.xml b/pom.xml index e50161b..199b61f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 3.0.2 + 3.0.3 @@ -58,7 +58,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter-test - 3.0.2 + 3.0.3 test diff --git a/src/main/java/com/lion/snss/util/IoUtil.java b/src/main/java/com/lion/snss/util/IoUtil.java index 5ebc308..8916d5d 100644 --- a/src/main/java/com/lion/snss/util/IoUtil.java +++ b/src/main/java/com/lion/snss/util/IoUtil.java @@ -61,15 +61,11 @@ public class IoUtil { cpuInfo = OshiUtil.getCpuInfo(); globalMemory = OshiUtil.getMemory(); - for (NetworkIF nif : networkIFs) { - if (SystemUtil.getOsInfo().isLinux()) { - if (nif.getName().equals("eth0") || nif.getName().equals("ens33")) - networkIF = nif; - } else if (nif.getName().equals("eth4") || nif.getName().equals("ethernet_32769")) + for (NetworkIF nif : networkIFs) + if (nif.getName().startsWith("eth") || nif.getName().startsWith("ens")) { networkIF = nif; - } - - + break; + } if(networkIF == null) log.error("网卡 eth0 不存在");