.

apq-pc-info/src/test/java/com/priusis/RestTest.java

@@ -3,6 +3,7 @@ package com.priusis;
 import cn.hutool.core.io.unit.DataSizeUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.system.oshi.OshiUtil;
+import com.priusis.util.MacAddrUtil;
 import com.priusis.vo.MqttRpcDataMessage;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -11,10 +12,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
-import oshi.hardware.NetworkIF;
 
 import java.net.InetAddress;
-import java.net.NetworkInterface;
 import java.util.Map;
 
 @RunWith(SpringRunner.class)
@@ -32,14 +31,11 @@ public class RestTest {
         System.out.println(forEntity.getBody().getParams());
 
         // 上报PC实时信息
-        InetAddress inetAddress = InetAddress.getLocalHost();
-        NetworkIF networkIF = new NetworkIF();
-        networkIF.setNetworkInterface(NetworkInterface.getByInetAddress(inetAddress));
         Map<String, Object> data = MapUtil.<String, Object>builder()
                 .put("operatingSystem", OshiUtil.getOs().toString())
-                .put("mac", networkIF.getMacaddr())
+                .put("mac", MacAddrUtil.get())
                 .put("baseboard", OshiUtil.getSystem().getBaseboard().getManufacturer() + " " + OshiUtil.getSystem().getBaseboard().getVersion())
-                .put("ip", inetAddress.getHostAddress())
+                .put("ip", InetAddress.getLocalHost().getHostAddress())
                 .put("cpuModel", OshiUtil.getCpuInfo(0).getCpuModel())
                 .put("cpuTemp", OshiUtil.getSensors().getCpuTemperature())
                 .put("memoryCap", DataSizeUtil.format(OshiUtil.getMemory().getTotal()))