diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java index 4a8d5495..9e2ae3fd 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java @@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j; import com.jero.common.api.vo.Result; import com.jero.modules.monitor.domain.RedisInfo; import com.jero.modules.monitor.service.RedisService; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -33,7 +34,7 @@ public class ActuatorRedisController { * @throws Exception */ @GetMapping("/info") - public Result getRedisInfo() throws Exception { + public Result> getRedisInfo() throws Exception { List infoList = this.redisService.getRedisInfo(); log.info(infoList.toString()); return Result.OK(infoList); @@ -77,7 +78,7 @@ public class ActuatorRedisController { public Map getMemoryInfo() throws Exception { return redisService.getMemoryInfo(); } - + //update-begin--Author:zhangweijian Date:20190425 for:获取磁盘信息 /** * @功能:获取磁盘信息 @@ -95,7 +96,7 @@ public class ActuatorRedisController { File[] fs = File.listRoots(); log.info("查询磁盘信息:"+fs.length+"个"); List> list = new ArrayList<>(); - + for (int i = 0; i < fs.length; i++) { if(fs[i].getTotalSpace()==0) { continue;