gfwleak/nezha-nz-talon
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: NEZ-2142 修改接口响应格式，保持与接口文档一致

Browse Source
This commit is contained in:
zhangshuai
2022-08-29 14:43:30 +08:00
parent 1b998e9100
commit fca66d553f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/geedge/confagent/controller/OSHIController.java
View File

@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -25,6 +26,8 @@ public class OSHIController extends BaseController{
public R getProcessInfo(HttpServletRequest request) throws InterruptedException { public R getProcessInfo(HttpServletRequest request) throws InterruptedException {
List<Map> result = OSHIUtils.getProcessInfo(); List<Map> result = OSHIUtils.getProcessInfo();
HashMap<Object, Object> data = Tool.MapUtil.newHashMap();
data.put("list" ,result);
return R.ok(result); return R.ok(result);
} }
@@ -32,6 +35,8 @@ public class OSHIController extends BaseController{
@GetMapping("/oshi/netstat") @GetMapping("/oshi/netstat")
public R getNetstatInfo(HttpServletRequest request) throws UnknownHostException { public R getNetstatInfo(HttpServletRequest request) throws UnknownHostException {
List<Map> result = OSHIUtils.getNetInfo(); List<Map> result = OSHIUtils.getNetInfo();
HashMap<Object, Object> data = Tool.MapUtil.newHashMap();
data.put("list" ,result);
return R.ok(result); return R.ok(result);
} }