diff --git a/Linux服务器监听运维功能.md b/Linux服务器监听运维功能.md index d8771ad..4a1be3a 100644 --- a/Linux服务器监听运维功能.md +++ b/Linux服务器监听运维功能.md @@ -731,10 +731,10 @@ ## 3.4 获取module对应的内容 -| 调用方式 | 接口地址 | -| ------------ | :---------------------------------------------- | -| POST | http://ip:port/background/removeWorkingListener | -| Content-Type | application/json;charset=UTF-8 | +| 调用方式 | 接口地址 | +| ------------ | :-------------------------------------- | +| POST | http://ip:port/background/getModuleInfo | +| Content-Type | application/json;charset=UTF-8 | | 请求参数 | | | | | | --------- | -------- | ------ | ---- | ---------- | diff --git a/src/main/java/com/objecteye/service/impl/OccupationOfBasicResourcesServiceImpl.java b/src/main/java/com/objecteye/service/impl/OccupationOfBasicResourcesServiceImpl.java index 56ebb87..31224be 100644 --- a/src/main/java/com/objecteye/service/impl/OccupationOfBasicResourcesServiceImpl.java +++ b/src/main/java/com/objecteye/service/impl/OccupationOfBasicResourcesServiceImpl.java @@ -31,7 +31,26 @@ public class OccupationOfBasicResourcesServiceImpl implements IOccupationOfBasic */ @Override public JSONArray getInfoByModule(Map requestMap) { - return getInfoByModule((String) requestMap.get("module")); + String module = (String) requestMap.get("module"); + if ("uptime".equals(module)) { + String cmd = "uptime"; + List outList = new ArrayList<>(); + LinuxUtils.executeLinuxCmd(cmd, outList); + String outStr = String.join(",", outList); + String[] outArr = outStr.split(","); + String uptimeStr = outArr[0].substring(outArr[0].indexOf("up") + 2).trim() + "," + outArr[1]; + uptimeStr = uptimeStr.replaceAll("days", "天"); + if (!uptimeStr.contains("min")) { + uptimeStr = uptimeStr.replaceAll(":", "h") + "min"; + } + JSONObject resultObj = new JSONObject(); + resultObj.put("result", uptimeStr); + JSONArray resultArr = new JSONArray(); + resultArr.add(resultObj); + return resultArr; + } else { + return getInfoByModule((String) requestMap.get("module")); + } } /**