From fca66d553f5fa0323f8c15d7f21a2cb15c400233 Mon Sep 17 00:00:00 2001 From: zhangshuai Date: Mon, 29 Aug 2022 14:43:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20NEZ-2142=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=93=8D=E5=BA=94=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=8E=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/geedge/confagent/controller/OSHIController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/net/geedge/confagent/controller/OSHIController.java b/src/main/java/net/geedge/confagent/controller/OSHIController.java index 3db3a5d..c278d6a 100644 --- a/src/main/java/net/geedge/confagent/controller/OSHIController.java +++ b/src/main/java/net/geedge/confagent/controller/OSHIController.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.net.UnknownHostException; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,6 +26,8 @@ public class OSHIController extends BaseController{ public R getProcessInfo(HttpServletRequest request) throws InterruptedException { List result = OSHIUtils.getProcessInfo(); + HashMap data = Tool.MapUtil.newHashMap(); + data.put("list" ,result); return R.ok(result); } @@ -32,6 +35,8 @@ public class OSHIController extends BaseController{ @GetMapping("/oshi/netstat") public R getNetstatInfo(HttpServletRequest request) throws UnknownHostException { List result = OSHIUtils.getNetInfo(); + HashMap data = Tool.MapUtil.newHashMap(); + data.put("list" ,result); return R.ok(result); }