Browse Source

#245 创建云脑任务后端生成的默认任务名可能违反约束,可能导致云脑任务创建失败

tags/v1.21.12.1
ychao_1983 4 years ago
parent
commit
15f2f408d5
2 changed files with 8 additions and 2 deletions
  1. +7
    -1
      routers/repo/cloudbrain.go
  2. +1
    -1
      routers/repo/modelarts.go

+ 7
- 1
routers/repo/cloudbrain.go View File

@@ -86,11 +86,17 @@ func cutString(str string, lens int) string {
return str[:lens] return str[:lens]
} }


func jobNamePrefixValid(s string) string {
lowStr := strings.ToLower(s)
re := regexp.MustCompile(`[^a-z0-9\\.\\-]+`)
return re.ReplaceAllString(lowStr, "")
}

func CloudBrainNew(ctx *context.Context) { func CloudBrainNew(ctx *context.Context) {
ctx.Data["PageIsCloudBrain"] = true ctx.Data["PageIsCloudBrain"] = true


t := time.Now() t := time.Now()
var jobName = cutString(ctx.User.Name, 5) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
var jobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
ctx.Data["job_name"] = jobName ctx.Data["job_name"] = jobName


result, err := cloudbrain.GetImages() result, err := cloudbrain.GetImages()


+ 1
- 1
routers/repo/modelarts.go View File

@@ -71,7 +71,7 @@ func ModelArtsNew(ctx *context.Context) {
ctx.Data["PageIsCloudBrain"] = true ctx.Data["PageIsCloudBrain"] = true


t := time.Now() t := time.Now()
var jobName = cutString(ctx.User.Name, 5) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
var jobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
ctx.Data["job_name"] = jobName ctx.Data["job_name"] = jobName


attachs, err := models.GetModelArtsUserAttachments(ctx.User.ID) attachs, err := models.GetModelArtsUserAttachments(ctx.User.ID)


Loading…
Cancel
Save