From f79f18bf3e65ad0eaf8fd1feb788bf792e362520 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期四, 01 八月 2019 15:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 controllers/monitoring.go |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index af8d7a7..b78788d 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -56,7 +56,7 @@
 		"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
 		"\"size\":\"1000\"," +
 		"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
-	fmt.Println(prama)
+	//fmt.Println(prama)
 	tokenRes := esutil.GetEsDataReq(url, prama, true)
 	/*	for _, value := range tokenRes["datalist"].([]interface{}) {
 		if value.(map[string]interface{})["personId"] != nil {

--
Gitblit v1.8.0