From cfcda861640644e3597eff70775bfaf7186a55ad Mon Sep 17 00:00:00 2001
From: Iwan Lebron <105045937+iwanlebron@users.noreply.github.com>
Date: 星期四, 01 八月 2024 10:15:37 +0800
Subject: [PATCH] Merge branch '648540858:master' into master
---
src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java b/src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java
old mode 100644
new mode 100755
index d228787..ec2f3b2
--- a/src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java
@@ -1,5 +1,8 @@
package com.genersoft.iot.vmp.utils;
+import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.util.ObjectUtils;
import oshi.SystemInfo;
import oshi.hardware.*;
@@ -20,6 +23,8 @@
* 鍘熸枃鍑哄閾炬帴锛歨ttps://blog.csdn.net/xiaozhangnomoney/article/details/107769147
*/
public class SystemInfoUtils {
+
+ private final static Logger logger = LoggerFactory.getLogger(SystemInfoUtils.class);
/**
* 鑾峰彇cpu淇℃伅
@@ -73,7 +78,7 @@
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ logger.error("[绾跨▼浼戠湢澶辫触] : {}", e.getMessage());
}
List<NetworkIF> afterNetworkIFs = hal.getNetworkIFs();
NetworkIF afterNet = afterNetworkIFs.get(afterNetworkIFs.size() - 1);
--
Gitblit v1.8.0