Merge remote-tracking branch 'origin/master'

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

@@ -5,10 +5,13 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.system.oshi.OshiUtil;
 import com.priusis.lib.R;
 import com.priusis.util.MacAddrUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.PostConstruct;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.UnknownHostException;
@@ -18,14 +21,22 @@ import java.util.Map;
  * @author yangli
  * @since 2021/09/06
  */
+@Slf4j
 @RestController
 @RequestMapping(value = "device_info")
 public class DeviceInfoController {
 
+    private Map<String, Object> info;
 
     @GetMapping(value = "get")
     public R<Map<String, Object>> get() throws UnknownHostException, SocketException {
-        Map<String, Object> info = MapUtil.<String, Object>builder()
+        if(info == null) refresh();
+        return R.success(info);
+    }
+
+    @Scheduled(fixedDelay = 5000)
+    protected void refresh() throws UnknownHostException {
+        info = MapUtil.<String, Object>builder()
                 .put("operatingSystem", OshiUtil.getOs().toString())
                 .put("mac", MacAddrUtil.get())
                 .put("baseboard", OshiUtil.getSystem().getBaseboard().getManufacturer() + " " + OshiUtil.getSystem().getBaseboard().getVersion())
@@ -36,7 +47,15 @@ public class DeviceInfoController {
                 .put("diskModel", OshiUtil.getHardware().getDiskStores()[0].getModel())
                 .put("diskCap", DataSizeUtil.format(OshiUtil.getHardware().getDiskStores()[0].getSize()))
                 .build();
-        return R.success(info);
+    }
+
+    @PostConstruct
+    public void init() {
+        try {
+            refresh();
+        } catch (UnknownHostException e) {
+            log.error("初始化失败", e);
+        }
     }
 
     public static void main(String[] args) throws UnknownHostException {