.

apq-pc-client/src/main/java/com/priusis/controller/ProgramController.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import oshi.hardware.NetworkIF;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
@@ -27,6 +28,8 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -182,13 +185,15 @@ public class ProgramController {
     @Scheduled(fixedDelay = 60000)
     protected void addProgram2Platform() throws IOException {
         if (programList == null) loadProgramListJob();
+        NetworkIF networkIF = new NetworkIF();
+        networkIF.setNetworkInterface(NetworkInterface.getByInetAddress(InetAddress.getLocalHost()));
+        String mac = networkIF.getMacaddr();
         List<String> programNames = programList.stream().map(p -> p.get("name")).collect(Collectors.toList());
-        String sn = SysConfigUtil.getProperty("device.sn");
-        if (StrUtil.isBlank(sn)) {
-            log.warn("未配置设备SN号");
+        if (StrUtil.isBlank(mac)) {
+            log.warn("未获取到MAC地址");
             return;
         }
         HttpUtil.post(gateway + addProgramUrl,
-                JSONUtil.createObj().set("snNo", sn).set("programList", programNames).toString());
+                JSONUtil.createObj().set("macAddress", mac).set("programList", programNames).toString());
     }
 }