Merge pull request 'fix-253 fix-254' (#434) from fix-253 into V20210927

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/434
Reviewed-by: lewis <747342561@qq.com>

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
 }
 

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{}))