diff --git a/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java b/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java index 2df9b4b6..0f0d6d7b 100644 --- a/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java +++ b/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java @@ -287,8 +287,8 @@ public class MonitorController { "&start=" + start + "&end=" + end + "&step=" + step; - ResponseEntity entity = restTemplate.getForEntity(url, HashMap.class, query); + HashMap body = entity.getBody(); HashMap data = (HashMap) body.get("data"); if (data != null) { diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 58b49478..f6139e08 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -2874,7 +2874,7 @@ public class ResourceServiceImpl extends CrudServiceImpl> list = null; + List> list = new ArrayList<>(); try { list = lcJdbcTemplate.queryForList(sb.toString()); } catch (DataAccessException e) {