From 94077bafec3990bebad4d5c6e8415cb41bd511dc Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Thu, 30 Dec 2021 16:45:28 +0800
Subject: [PATCH 1/2] fix 1233

---
 modules/util/util.go             | 10 ++++++++++
 routers/api/v1/repo/modelarts.go | 12 ++----------
 routers/repo/cloudbrain.go       |  8 ++++++++
 3 files changed, 20 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 modules/util/util.go

diff --git a/modules/util/util.go b/modules/util/util.go
old mode 100644
new mode 100755
index 6d02b5f52f..0172772813
--- a/modules/util/util.go
+++ b/modules/util/util.go
@@ -6,6 +6,7 @@ package util
 
 import (
 	"bytes"
+	"strconv"
 	"strings"
 )
 
@@ -100,3 +101,12 @@ func NormalizeEOL(input []byte) []byte {
 	}
 	return tmp[:pos]
 }
+
+func AddZero(t int64) (m string) {
+	if t < 10 {
+		m = "0" + strconv.FormatInt(t, 10)
+		return m
+	} else {
+		return strconv.FormatInt(t, 10)
+	}
+}
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index 2836960071..05c31b5f5a 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -6,6 +6,7 @@
 package repo
 
 import (
+	"code.gitea.io/gitea/modules/util"
 	"net/http"
 	"strconv"
 	"strings"
@@ -106,7 +107,7 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {
 	job.TrainJobDuration = result.TrainJobDuration
 
 	if result.Duration != 0 {
-		job.TrainJobDuration = addZero(result.Duration/3600000) + ":" + addZero(result.Duration%3600000/60000) + ":" + addZero(result.Duration%60000/1000)
+		job.TrainJobDuration = util.AddZero(result.Duration/3600000) + ":" + util.AddZero(result.Duration%3600000/60000) + ":" + util.AddZero(result.Duration%60000/1000)
 
 	} else {
 		job.TrainJobDuration = "00:00:00"
@@ -125,15 +126,6 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {
 
 }
 
-func addZero(t int64) (m string) {
-	if t < 10 {
-		m = "0" + strconv.FormatInt(t, 10)
-		return m
-	} else {
-		return strconv.FormatInt(t, 10)
-	}
-}
-
 func TrainJobGetLog(ctx *context.APIContext) {
 	var (
 		err error
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index ab33034086..5bf72ede63 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -2,6 +2,7 @@ package repo
 
 import (
 	"bufio"
+	"code.gitea.io/gitea/modules/util"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -949,6 +950,13 @@ func SyncCloudbrainStatus() {
 					task.Duration = result.Duration
 					task.TrainJobDuration = result.TrainJobDuration
 
+					if result.Duration != 0 {
+						task.TrainJobDuration = util.AddZero(result.Duration/3600000) + ":" + util.AddZero(result.Duration%3600000/60000) + ":" + util.AddZero(result.Duration%60000/1000)
+
+					} else {
+						task.TrainJobDuration = "00:00:00"
+					}
+
 					err = models.UpdateJob(task)
 					if err != nil {
 						log.Error("UpdateJob(%s) failed:%v", task.JobName, err)
-- 
2.34.1


From b606b2fbf8e3d4a6c23f35b53f4b0b9daa5dfda4 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Thu, 30 Dec 2021 16:50:50 +0800
Subject: [PATCH 2/2] format

---
 routers/repo/cloudbrain.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 5bf72ede63..b24b4e90e1 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -2,7 +2,6 @@ package repo
 
 import (
 	"bufio"
-	"code.gitea.io/gitea/modules/util"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -15,18 +14,17 @@ import (
 	"strings"
 	"time"
 
-	"code.gitea.io/gitea/modules/modelarts"
-
-	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/storage"
-
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/cloudbrain"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/modelarts"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/storage"
+	"code.gitea.io/gitea/modules/util"
 )
 
 const (
@@ -278,7 +276,7 @@ func CloudBrainRestart(ctx *context.Context) {
 			break
 		}
 
-		if !ctx.IsSigned || (ctx.User.ID != task.UserID && !ctx.IsUserSiteAdmin()){
+		if !ctx.IsSigned || (ctx.User.ID != task.UserID && !ctx.IsUserSiteAdmin()) {
 			log.Error("the user has no right ro restart the job", task.JobName, ctx.Data["MsgID"])
 			resultCode = "-1"
 			errorMsg = "you have no right to restart the job"
-- 
2.34.1