From fa87516be1d3a4dd1736e403f336cbd34fce6fe5 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 7 Dec 2021 17:51:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=8A=E7=BB=84=E7=BB=87=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/setting/setting.go | 6 ++++++ routers/home.go | 34 ++++++++++++++++++++++++++++++++++ routers/repo/http.go | 2 +- routers/routes/routes.go | 2 ++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 0ab1bbc88..ce9738f08 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -433,6 +433,9 @@ var ( AuthUser string AuthPassword string + //home page + RecommentRepoAddr string + //labelsystem config LabelTaskName string LabelDatasetDeleteQueue string @@ -1225,6 +1228,9 @@ func NewContext() { LabelDatasetDeleteQueue = sec.Key("LabelDatasetDeleteQueue").MustString("LabelDatasetDeleteQueue") DecompressOBSTaskName = sec.Key("DecompressOBSTaskName").MustString("LabelDecompressOBSQueue") + sec = Cfg.Section("homepage") + RecommentRepoAddr = sec.Key("Address").MustString("https://git.openi.org.cn/OpenIOSSG/promote/raw/branch/master/") + sec = Cfg.Section("cloudbrain") CBAuthUser = sec.Key("USER").MustString("") CBAuthPassword = sec.Key("PWD").MustString("") diff --git a/routers/home.go b/routers/home.go index d2c93c771..eb76088c0 100755 --- a/routers/home.go +++ b/routers/home.go @@ -7,6 +7,8 @@ package routers import ( "bytes" + "fmt" + "io/ioutil" "net/http" "strings" @@ -511,3 +513,35 @@ func NotFound(ctx *context.Context) { ctx.Data["Title"] = "Page Not Found" ctx.NotFound("home.NotFound", nil) } +func RecommendOrgFromPromote(ctx *context.Context) { + url := setting.RecommentRepoAddr + "organizations" + recommendFromPromote(ctx, url) +} + +func recommendFromPromote(ctx *context.Context, url string) { + resp, err := http.Get(url) + if err != nil { + log.Info("Get organizations url error=" + err.Error()) + ctx.ServerError("QueryTrainJobList:", err) + return + } + bytes, err := ioutil.ReadAll(resp.Body) + resp.Body.Close() + if err != nil { + log.Info("Get organizations url error=" + err.Error()) + ctx.ServerError("QueryTrainJobList:", err) + return + } + + allLineStr := string(bytes) + lines := strings.Split(allLineStr, "\n") + for i, line := range lines { + log.Info("i=" + fmt.Sprint(i) + " line=" + line) + } + ctx.JSON(http.StatusOK, lines) +} + +func RecommendRepoFromPromote(ctx *context.Context) { + url := setting.RecommentRepoAddr + "projects" + recommendFromPromote(ctx, url) +} diff --git a/routers/repo/http.go b/routers/repo/http.go index ad2abf567..87406a2c3 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -257,7 +257,6 @@ func HTTP(ctx *context.Context) { models.EnvPusherID + fmt.Sprintf("=%d", authUser.ID), models.EnvIsDeployKey + "=false", } - if !authUser.KeepEmailPrivate { environ = append(environ, models.EnvPusherEmail+"="+authUser.Email) } @@ -559,6 +558,7 @@ func serviceRPC(h serviceHandler, service string) { if service == "receive-pack" { cmd.Env = append(os.Environ(), h.environ...) } + cmd.Stdout = h.w cmd.Stdin = reqBody cmd.Stderr = &stderr diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 680b0601c..6ea751531 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -315,6 +315,8 @@ func RegisterRoutes(m *macaron.Macaron) { }) m.Get("/", routers.Home) m.Get("/dashboard", routers.Dashboard) + m.Get("/recommend/org", routers.RecommendOrgFromPromote) + m.Get("/recommend/repo", routers.RecommendRepoFromPromote) m.Group("/explore", func() { m.Get("", func(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/explore/repos") From 6333e3a4e1a03da16b88ec0bc9c51d16a9c4c5d5 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 8 Dec 2021 11:35:15 +0800 Subject: [PATCH 2/5] fix issue --- options/locale/locale_en-US.ini | 2 ++ options/locale/locale_zh-CN.ini | 2 +- templates/repo/header.tmpl | 9 +++++++-- templates/repo/settings/options.tmpl | 17 ++++++++--------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3ab3a00c9..48a010b73 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -778,6 +778,8 @@ datasets = Datasets datasets.desc = Enable Dataset cloudbrain_helper=Use GPU/NPU resources to open notebooks, model training tasks, etc. +model_manager = Model + debug=Debug stop=Stop delete=Delete diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 98d581fb7..b1c339080 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -782,7 +782,7 @@ datasets=数据集 datasets.desc=数据集功能 cloudbrain_helper=使用GPU/NPU资源，开启Notebook、模型训练任务等 -model_manager = 模型管理 +model_manager = 模型 model_noright=无权限操作 debug=调试 diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index b84f4771f..f5376b07c 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -134,7 +134,8 @@ {{if .Permission.CanRead $.UnitTypeDatasets}} - {{svg "octicon-inbox" 16}} {{.i18n.Tr "datasets"}} + + {{.i18n.Tr "datasets"}} {{end}} {{if .Permission.CanRead $.UnitTypeModelManage}} @@ -145,7 +146,11 @@ {{end}} {{if .Permission.CanRead $.UnitTypeCloudBrain}} - {{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}} + + + {{.i18n.Tr "repo.cloudbrain"}} + + {{end}}