Browse Source

Merge pull request 'fix-2957' (#3072) from fix-2982 into V20221102

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/3072
Reviewed-by: lewis <747342561@qq.com>
tags/v1.22.11.1^2
lewis 2 years ago
parent
commit
4e30175d5c
3 changed files with 40 additions and 4 deletions
  1. +5
    -0
      modules/setting/setting.go
  2. +2
    -4
      routers/repo/grampus.go
  3. +33
    -0
      services/cloudbrain/util.go

+ 5
- 0
modules/setting/setting.go View File

@@ -597,6 +597,7 @@ var (
}{} }{}


C2NetInfos *C2NetSqInfos C2NetInfos *C2NetSqInfos
C2NetMapInfo map[string]*C2NetSequenceInfo


//elk config //elk config
ElkUrl string ElkUrl string
@@ -1632,6 +1633,10 @@ func getGrampusConfig() {
if err := json.Unmarshal([]byte(Grampus.C2NetSequence), &C2NetInfos); err != nil { if err := json.Unmarshal([]byte(Grampus.C2NetSequence), &C2NetInfos); err != nil {
log.Error("Unmarshal(C2NetSequence) failed:%v", err) log.Error("Unmarshal(C2NetSequence) failed:%v", err)
} }
C2NetMapInfo=make(map[string]*C2NetSequenceInfo)
for _,value :=range C2NetInfos.C2NetSqInfo{
C2NetMapInfo[value.Name]=value
}
} }
Grampus.SyncScriptProject = sec.Key("SYNC_SCRIPT_PROJECT").MustString("script_for_grampus") Grampus.SyncScriptProject = sec.Key("SYNC_SCRIPT_PROJECT").MustString("script_for_grampus")




+ 2
- 4
routers/repo/grampus.go View File

@@ -37,6 +37,7 @@ import (
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
cloudbrainService "code.gitea.io/gitea/services/cloudbrain"
) )


const ( const (
@@ -915,10 +916,7 @@ func GrampusTrainJobShow(ctx *context.Context) {
ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task)
ctx.Data["displayJobName"] = task.DisplayJobName ctx.Data["displayJobName"] = task.DisplayJobName


aiCenterInfo := strings.Split(task.AiCenter, "+")
if len(aiCenterInfo) == 2 {
ctx.Data["ai_center"] = aiCenterInfo[1]
}
ctx.Data["ai_center"] = cloudbrainService.GetAiCenterShow(task.AiCenter,ctx)


ctx.HTML(http.StatusOK, tplGrampusTrainJobShow) ctx.HTML(http.StatusOK, tplGrampusTrainJobShow)
} }


+ 33
- 0
services/cloudbrain/util.go View File

@@ -0,0 +1,33 @@
package cloudbrain

import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/setting"
"strings"
)

func GetAiCenterShow(aiCenter string,ctx *context.Context) string{
aiCenterInfo := strings.Split(aiCenter, "+")

if len(aiCenterInfo) == 2{
if setting.C2NetMapInfo!=nil {
if info,ok:=setting.C2NetMapInfo[aiCenterInfo[0]];ok {
if ctx.Language() == "zh-CN" {
return info.Content
} else {
return info.ContentEN
}
}else{
return aiCenterInfo[1]
}

}else{
return aiCenterInfo[1]
}

}

return ""


}

Loading…
Cancel
Save