diff --git a/toolbox/statistics.go b/toolbox/statistics.go index 779fd637..beeafc7b 100644 --- a/toolbox/statistics.go +++ b/toolbox/statistics.go @@ -15,7 +15,6 @@ package toolbox import ( - "encoding/json" "fmt" "sync" "time" @@ -112,11 +111,7 @@ func (m *UrlMap) GetMap() map[string]interface{} { return content } -func (m *UrlMap) GetMapJSON() ([]byte, error) { - return json.Marshal(m) -} - -func (m UrlMap) MarshalJSON() ([]byte, error) { +func (m *UrlMap) GetMapData() []map[string]interface{} { resultLists := make([]map[string]interface{}, 0) @@ -134,7 +129,7 @@ func (m UrlMap) MarshalJSON() ([]byte, error) { resultLists = append(resultLists, result) } } - return json.Marshal(resultLists) + return resultLists } // global statistics data map diff --git a/toolbox/statistics_test.go b/toolbox/statistics_test.go index 97860d32..ac29476c 100644 --- a/toolbox/statistics_test.go +++ b/toolbox/statistics_test.go @@ -15,6 +15,7 @@ package toolbox import ( + "encoding/json" "testing" "time" ) @@ -29,9 +30,11 @@ func TestStatics(t *testing.T) { StatisticsMap.AddStatistics("DELETE", "/api/user", "&admin.user", time.Duration(1400)) t.Log(StatisticsMap.GetMap()) - jsonString, err := StatisticsMap.GetMapJSON() + data := StatisticsMap.GetMapData() + b, err := json.Marshal(data) if err != nil { t.Errorf(err.Error()) } - t.Log(string(jsonString)) + + t.Log(string(b)) }