feat:更新

esv1/elasticutil.go

@@ -245,18 +245,15 @@ func GetNew(index, itype, query string) (*[]map[string]interface{}, int64) {
 			count = searchResult.Hits.TotalHits
 			resNum := len(searchResult.Hits.Hits)
 			if resNum < 5000 {
+				log.Println("查询结果太多，查询到：", resNum, "条")
+			} else {
 				res = make([]map[string]interface{}, resNum)
 				for i, hit := range searchResult.Hits.Hits {
-					//d := json.NewDecoder(bytes.NewBuffer(*hit.Source))
-					//d.UseNumber()
-					//d.Decode(&res[i])
 					parseErr := json.Unmarshal(*hit.Source, &res[i])
 					if parseErr == nil && hit.Highlight != nil && res[i] != nil {
 						res[i]["highlight"] = map[string][]string(hit.Highlight)
 					}
 				}
-			} else {
-				log.Println("查询结果太多，查询到：", resNum, "条")
 			}
 
 		}
@@ -1486,19 +1483,16 @@ func GetWithCount(index, itype, query string) (int64, *[]map[string]interface{})
 		if searchResult.Hits != nil {
 			resNum := len(searchResult.Hits.Hits)
 			count = searchResult.Hits.TotalHits
-			if resNum < 5000 {
+			if resNum > 5000 {
+				log.Println("查询结果太多，查询到：", resNum, "条")
+			} else {
 				res = make([]map[string]interface{}, resNum)
 				for i, hit := range searchResult.Hits.Hits {
-					//d := json.NewDecoder(bytes.NewBuffer(*hit.Source))
-					//d.UseNumber()
-					//d.Decode(&res[i])
 					parseErr := json.Unmarshal(*hit.Source, &res[i])
 					if parseErr == nil && hit.Highlight != nil && res[i] != nil {
 						res[i]["highlight"] = map[string][]string(hit.Highlight)
 					}
 				}
-			} else {
-				log.Println("查询结果太多，查询到：", resNum, "条")
 			}
 
 		}