Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java

@@ -301,8 +301,8 @@ public class MonitorController {
                 "&start=" + start +
                 "&end=" + end +
                 "&step=" + step;
-
         ResponseEntity<HashMap> entity = restTemplate.getForEntity(url, HashMap.class, query);
+
         HashMap body = entity.getBody();
         HashMap data = (HashMap) body.get("data");
         if (data != null) {