From 54e5569e03e51ff535a2fffba6ea12b7f8fc97fa Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Wed, 24 Nov 2021 11:06:39 +0800
Subject: [PATCH 1/2] fix-934

---
 modules/repository/elk_pagedata.go | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/repository/elk_pagedata.go b/modules/repository/elk_pagedata.go
index 03a61be1f..8e7054e7f 100644
--- a/modules/repository/elk_pagedata.go
+++ b/modules/repository/elk_pagedata.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/base64"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
@@ -113,13 +114,23 @@ func GetResultFromElk(resultInfo ResultInfo, jsonStr []byte) (loaded int, totalV
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
-		panic(err)
+		// panic(err)
+		return 0, 0, err
 	}
 	defer resp.Body.Close()
-	body, _ := ioutil.ReadAll(resp.Body)
-
-	errs := json.Unmarshal([]byte(string(body)), &resultInfo)
-	log.Info("Get resultJson failed", errs)
+	if resp.StatusCode != 200 {
+		log.Error("ConnectToElk failed:%s", resp.Status)
+		return 0, 0, fmt.Errorf("ConnectToElk failed:%s", resp.Status)
+	}
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return 0, 0, err
+	}
+	err = json.Unmarshal([]byte(string(body)), &resultInfo)
+	if err != nil {
+		log.Info("Get resultJson failed", err)
+		return 0, 0, err
+	}
 
 	return resultInfo.Result.Loaded, resultInfo.Result.RawResponse.Hits.Total, err
 }
@@ -138,6 +149,7 @@ func ProjectViewInit(User string, Project string, Gte string, Lte string) (proje
 	var timeRange Range
 	timeRange.Timestamptest.Gte = Gte
 	timeRange.Timestamptest.Lte = Lte
+	timeRange.Timestamptest.Format = "strict_date_optional_time"
 	inputStruct.Batch[0].Request.Params.Body.Query.BoolIn.Filter[0].Range = &timeRange
 	//限定用户
 	var userName FilterMatchPhrase
@@ -211,6 +223,7 @@ func ViewInfo(viewInfo InputInfo) (totalView int, err error) {
 	jsons, errs := json.Marshal(viewInfo)
 	if errs != nil {
 		log.Info("errs:", errs)
+		return 0, err
 	}
 	var jsonStr = []byte(jsons)
 	var resultInfo ResultInfo
@@ -221,7 +234,6 @@ func ViewInfo(viewInfo InputInfo) (totalView int, err error) {
 		if loaded == 0 {
 			loaded_next, totalView, err := GetResultFromElk(resultInfo, jsonStr)
 			time++
-			log.Info("time:", time)
 			if loaded_next != 0 && time < 100 {
 				return totalView, err
 			}

From 91dd1369b9c717d8709333a60ddd545aea53ae3a Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Wed, 24 Nov 2021 11:22:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8error=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/repository/elk_pagedata.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/repository/elk_pagedata.go b/modules/repository/elk_pagedata.go
index 8e7054e7f..1454f0364 100644
--- a/modules/repository/elk_pagedata.go
+++ b/modules/repository/elk_pagedata.go
@@ -128,7 +128,7 @@ func GetResultFromElk(resultInfo ResultInfo, jsonStr []byte) (loaded int, totalV
 	}
 	err = json.Unmarshal([]byte(string(body)), &resultInfo)
 	if err != nil {
-		log.Info("Get resultJson failed", err)
+		log.Error("Get resultJson failed", err)
 		return 0, 0, err
 	}
 
@@ -220,9 +220,9 @@ func TagNameInit(MessageInfo string, Tagname string, Gte string, Lte string) (pr
 
 //向elk发送请求，将获取的结果只保留访问量，输入是初始化后的数据结构，返回访问量
 func ViewInfo(viewInfo InputInfo) (totalView int, err error) {
-	jsons, errs := json.Marshal(viewInfo)
-	if errs != nil {
-		log.Info("errs:", errs)
+	jsons, err := json.Marshal(viewInfo)
+	if err != nil {
+		log.Error("jsons failed", err)
 		return 0, err
 	}
 	var jsonStr = []byte(jsons)