From f380399f11959926950eef920813eae3ff63f084 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 22 Sep 2021 10:45:32 +0800 Subject: [PATCH] fix-253 fix-254 --- models/cloudbrain.go | 5 +++++ routers/repo/cloudbrain.go | 1 + 2 files changed, 6 insertions(+) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 0a6936851..edd5f102a 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -3,6 +3,7 @@ package models import ( "encoding/json" "fmt" + "strings" "time" "xorm.io/xorm" @@ -176,6 +177,10 @@ func ConvertToTaskPod(input map[string]interface{}) (TaskPod, error) { err := json.Unmarshal(data, &taskPod) taskPod.TaskStatuses[0].StartTime = time.Unix(taskPod.TaskStatuses[0].StartAt.Unix()+8*3600, 0).UTC().Format("2006-01-02 15:04:05") taskPod.TaskStatuses[0].FinishedTime = time.Unix(taskPod.TaskStatuses[0].FinishedAt.Unix()+8*3600, 0).UTC().Format("2006-01-02 15:04:05") + //if the task is not finished or stopped,the cloudbrain renturns 0001-01-01 08:00:00, the finishedTime shows with - + if strings.HasPrefix(taskPod.TaskStatuses[0].FinishedTime, "0001") { + taskPod.TaskStatuses[0].FinishedTime = "-" + } return taskPod, err } diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 2e5e3d2e3..b2e987871 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -267,6 +267,7 @@ func CloudBrainShow(ctx *context.Context) { if result != nil { jobRes, _ := models.ConvertToJobResultPayload(result.Payload) + jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") ctx.Data["result"] = jobRes taskRoles := jobRes.TaskRoles taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))