From 472dce3d182db0e11da8fc2f6c72237fc277e6f5 Mon Sep 17 00:00:00 2001
From: luotianqi777 <luotianqi777@gmail.com>
Date: Mon, 30 May 2022 15:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djson=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 util/report/format.go | 13 +++++++------
 util/report/json.go   |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/util/report/format.go b/util/report/format.go
index 3469731..641e296 100644
--- a/util/report/format.go
+++ b/util/report/format.go
@@ -10,12 +10,13 @@ import (
 
 // 任务检查信息
 type TaskInfo struct {
-	AppName   string  `json:"app_name"`
-	Size      int64   `json:"size"`
-	StartTime string  `json:"start_time"`
-	EndTime   string  `json:"end_time"`
-	CostTime  float64 `json:"cost_time"`
-	Error     error   `json:"error,omitempty"`
+	AppName     string  `json:"app_name"`
+	Size        int64   `json:"size"`
+	StartTime   string  `json:"start_time"`
+	EndTime     string  `json:"end_time"`
+	CostTime    float64 `json:"cost_time"`
+	Error       error   `json:"-"`
+	ErrorString string  `json:"error,omitempty"`
 }
 
 // format 按照输出内容格式化(不可逆)
diff --git a/util/report/json.go b/util/report/json.go
index 7d092bf..e92a317 100644
--- a/util/report/json.go
+++ b/util/report/json.go
@@ -9,6 +9,9 @@ import (
 // Json 获取json格式报告数据
 func Json(dep *model.DepTree, taskInfo TaskInfo) []byte {
 	format(dep)
+	if taskInfo.Error != nil {
+		taskInfo.ErrorString = taskInfo.Error.Error()
+	}
 	if data, err := json.Marshal(struct {
 		*model.DepTree
 		TaskInfo TaskInfo `json:"task_info"`
-- 
Gitee