From f993d1206315fb3e9eb59dbd001aa373008e2d2b Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 17 六月 2020 14:45:52 +0800
Subject: [PATCH] fix

---
 esutil/EsClient.go |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index bcf3c83..c625f86 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -27,7 +27,7 @@
 	resp, err := client.Do(req)
 
 	if err != nil {
-		return err, nil
+        return err, nil
 	}
 
 	defer resp.Body.Close()
@@ -47,7 +47,7 @@
 	}
 	// 鏄惁闇�瑕� 瑙f瀽 es 杩斿洖鐨� source
 	if isSource {
-		dat, ok := dat["hits"].(map[string]interface{})
+        dat, ok := dat["hits"].(map[string]interface{})
 		if !ok {
 			return errors.New("data is not type of  map[string]interface{}"), nil
 		}
@@ -75,12 +75,14 @@
 
 			tB, err := json.Marshal(source["targetInfo"])
 			if err != nil {
-				continue
+			    log.Log.Infoln("err:", err)
+                continue
 			}
 
 			tiArr := []TargetInfo{}
 			err = json.Unmarshal(tB, &tiArr)
 			if err !=nil {
+			    log.Log.Infoln("err:", err)
 				continue
 			}
 			if len(tiArr) > 0 {
@@ -220,7 +222,7 @@
 	var filterArr []string
 	//鏄惁鏌ユ姤璀︽暟鎹�
 	if ishub == "hub" {
-		filterArr = append(filterArr,"{\"term\":{\"alarmRules.alarmLevel.raw\":\"涓�绾"}}")
+		filterArr = append(filterArr,"{\"term\":{\"alarmRules.alarmLevel.raw\":\"浜岀骇\"}}")
 	}
 
 	filterArr = append(filterArr, "{\"range\":{\"picDate\":{\"gte\":\"now+8h-"+preSec+"s\",\"lt\":\"now+8h\"}}}")
@@ -238,7 +240,9 @@
 		log.Log.Errorln("GetEsDataReq err:", err)
 		return nil
 	}
+    log.Log.Infoln("tokenRes:", tokenRes)
 	jsonstring, _ := json.Marshal(tokenRes)
+    log.Log.Infoln("len(result):", len(jsonstring))
 	if len(jsonstring) <= 26 {
 		return nil
 	}

--
Gitblit v1.8.0