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); }