Merge branch 'master' into docker_package

Merge branch 'dev'
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
2022-12-15 17:03:51 +08:00 · 2022-12-15 17:03:44 +08:00 · 2022-12-15 16:45:47 +08:00 · 2022-12-15 16:43:19 +08:00
1 changed files with 1 additions and 1 deletions
--- 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
@ -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) {
Author	SHA1	Message	Date
wangliwen	e17b1aa43a	Merge branch 'master' into docker_package	2022-12-15 17:03:51 +08:00
wangliwen	321bf20f4b	Merge branch 'dev'	2022-12-15 17:03:44 +08:00
dinggang	81fe70aa42	Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev	2022-12-15 16:45:47 +08:00
dinggang	d403b27c5f	..	2022-12-15 16:43:19 +08:00