From d584b89677e0ff0d52d217420c911e4773727ce8 Mon Sep 17 00:00:00 2001 From: yuyuanshifu <747342561@qq.com> Date: Mon, 30 Nov 2020 17:09:52 +0800 Subject: [PATCH 1/6] image list --- routers/repo/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 6742864c6..69b7b65af 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -90,7 +90,7 @@ func CloudBrainNew(ctx *context.Context) { for i,payload := range result.Payload { if strings.HasPrefix(result.Payload[i].Place,"192.168") { - result.Payload[i].PlaceView = payload.Place[strings.Index(payload.Place, "/"): len(payload.Place)-1] + result.Payload[i].PlaceView = payload.Place[strings.Index(payload.Place, "/"): len(payload.Place)] } else { result.Payload[i].PlaceView = payload.Place } From 2cde245bcd0aff7e62f8a0e80f34b02a7ca5d435 Mon Sep 17 00:00:00 2001 From: yuyuanshifu <747342561@qq.com> Date: Mon, 7 Dec 2020 10:15:44 +0800 Subject: [PATCH 2/6] view --- routers/repo/cloudbrain.go | 1 - templates/repo/cloudbrain/new.tmpl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 69b7b65af..7b665f05a 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -94,7 +94,6 @@ func CloudBrainNew(ctx *context.Context) { } else { result.Payload[i].PlaceView = payload.Place } - } ctx.Data["images"] = result.Payload diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index f2b5ed6f8..c3fa6112e 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -44,7 +44,7 @@ -
+ From 1e179b1541afb0373305f24fbb13bff25f46bb3e Mon Sep 17 00:00:00 2001 From: yuyuanshifu <747342561@qq.com> Date: Mon, 7 Dec 2020 16:16:17 +0800 Subject: [PATCH 3/6] fix bug:can not download code --- modules/setting/setting.go | 4 ++++ routers/repo/cloudbrain.go | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 3fa6403a1..cbeeeaf5f 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -438,6 +438,8 @@ var ( JobPath string JobType string DebugServerHost string + GitUser string + GitPassword string ) // DateLang transforms standard language locale name to corresponding value in datetime plugin. @@ -1113,6 +1115,8 @@ func NewContext() { JobPath = sec.Key("JOB_PATH").MustString("/datasets/minio/data/opendata/jobs/") DebugServerHost = sec.Key("DEBUG_SERVER_HOST").MustString("http://192.168.202.73") JobType = sec.Key("JOB_TYPE").MustString("debug_openi") + GitUser = sec.Key("GIT_USER").MustString("opendata") + GitPassword = sec.Key("GIT_PASSWORD").MustString("pa%40123456") } func loadInternalToken(sec *ini.Section) string { diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 7b665f05a..881202197 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -260,7 +260,8 @@ func downloadCode(repo *models.Repository, codePath string) error { return err } - command := "git clone " + repo.CloneLink().HTTPS + " " + codePath + repoAddr := repo.CloneLink().HTTPS + command := "git clone " + repoAddr[: strings.Index(repoAddr, ":") + 3] + setting.GitUser + ":" + setting.GitPassword + "@" + repoAddr[strings.Index(repoAddr, ":") + 3 :] + " " + codePath cmd := exec.Command("/bin/bash", "-c", command) output, err := cmd.Output() log.Info(string(output)) From aee620539fd56bd0832f1d72446a5c708e2064f8 Mon Sep 17 00:00:00 2001 From: yuyuanshifu <747342561@qq.com> Date: Tue, 8 Dec 2020 11:22:44 +0800 Subject: [PATCH 4/6] mod repo description --- models/repo.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 models/repo.go diff --git a/models/repo.go b/models/repo.go old mode 100644 new mode 100755 index 1add1dd58..52a194ab0 --- a/models/repo.go +++ b/models/repo.go @@ -1386,9 +1386,11 @@ func GetRepositoriesByForkID(forkID int64) ([]*Repository, error) { func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err error) { repo.LowerName = strings.ToLower(repo.Name) - if len(repo.Description) > 255 { + /*if len(repo.Description) > 255 { repo.Description = repo.Description[:255] } + + */ if len(repo.Website) > 255 { repo.Website = repo.Website[:255] } From c7f5321cee0628a29f71cdb99fd7ff1bc181ac82 Mon Sep 17 00:00:00 2001 From: yuyuanshifu <747342561@qq.com> Date: Tue, 8 Dec 2020 11:28:46 +0800 Subject: [PATCH 5/6] add setting --- custom/conf/app.ini.sample | 2 ++ 1 file changed, 2 insertions(+) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index c469fee7b..1a7ada50d 100755 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -1055,6 +1055,8 @@ DEBUG_SERVER_HOST = http://192.168.202.73/ USER = cW4cMtH24eoWPE7X PWD = 4BPmgvK2hb2Eywwyp4YZRY4B7yQf4DA.C JOB_TYPE = debug_openi +GIT_USER = opendata +GIT_PASSWORD = pa%40123456 [decompress] HOST = http://192.168.207.34:39987 From aa97d52d64f733672c7942ccfb902821379b0659 Mon Sep 17 00:00:00 2001 From: yuyuanshifu <747342561@qq.com> Date: Wed, 9 Dec 2020 11:25:34 +0800 Subject: [PATCH 6/6] fix bug: SBOX_FATAL_MEMORY_EXCEEDED --- web_src/js/components/MinioUploader.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 2e7bb9b25..71b44a39c 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -399,6 +399,7 @@ export default { loadNext(); fileReader.onload = async (e) => { await uploadChunk(e); + fileReader.abort(); currentChunk++; if (currentChunk < chunks) { console.log(