| @@ -433,6 +433,9 @@ var ( | |||||
| AuthUser string | AuthUser string | ||||
| AuthPassword string | AuthPassword string | ||||
| //home page | |||||
| RecommentRepoAddr string | |||||
| //labelsystem config | //labelsystem config | ||||
| LabelTaskName string | LabelTaskName string | ||||
| LabelDatasetDeleteQueue string | LabelDatasetDeleteQueue string | ||||
| @@ -1225,6 +1228,9 @@ func NewContext() { | |||||
| LabelDatasetDeleteQueue = sec.Key("LabelDatasetDeleteQueue").MustString("LabelDatasetDeleteQueue") | LabelDatasetDeleteQueue = sec.Key("LabelDatasetDeleteQueue").MustString("LabelDatasetDeleteQueue") | ||||
| DecompressOBSTaskName = sec.Key("DecompressOBSTaskName").MustString("LabelDecompressOBSQueue") | 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") | sec = Cfg.Section("cloudbrain") | ||||
| CBAuthUser = sec.Key("USER").MustString("") | CBAuthUser = sec.Key("USER").MustString("") | ||||
| CBAuthPassword = sec.Key("PWD").MustString("") | CBAuthPassword = sec.Key("PWD").MustString("") | ||||
| @@ -7,6 +7,8 @@ package routers | |||||
| import ( | import ( | ||||
| "bytes" | "bytes" | ||||
| "fmt" | |||||
| "io/ioutil" | |||||
| "net/http" | "net/http" | ||||
| "strings" | "strings" | ||||
| @@ -511,3 +513,35 @@ func NotFound(ctx *context.Context) { | |||||
| ctx.Data["Title"] = "Page Not Found" | ctx.Data["Title"] = "Page Not Found" | ||||
| ctx.NotFound("home.NotFound", nil) | 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) | |||||
| } | |||||
| @@ -257,7 +257,6 @@ func HTTP(ctx *context.Context) { | |||||
| models.EnvPusherID + fmt.Sprintf("=%d", authUser.ID), | models.EnvPusherID + fmt.Sprintf("=%d", authUser.ID), | ||||
| models.EnvIsDeployKey + "=false", | models.EnvIsDeployKey + "=false", | ||||
| } | } | ||||
| if !authUser.KeepEmailPrivate { | if !authUser.KeepEmailPrivate { | ||||
| environ = append(environ, models.EnvPusherEmail+"="+authUser.Email) | environ = append(environ, models.EnvPusherEmail+"="+authUser.Email) | ||||
| } | } | ||||
| @@ -559,6 +558,7 @@ func serviceRPC(h serviceHandler, service string) { | |||||
| if service == "receive-pack" { | if service == "receive-pack" { | ||||
| cmd.Env = append(os.Environ(), h.environ...) | cmd.Env = append(os.Environ(), h.environ...) | ||||
| } | } | ||||
| cmd.Stdout = h.w | cmd.Stdout = h.w | ||||
| cmd.Stdin = reqBody | cmd.Stdin = reqBody | ||||
| cmd.Stderr = &stderr | cmd.Stderr = &stderr | ||||
| @@ -315,6 +315,8 @@ func RegisterRoutes(m *macaron.Macaron) { | |||||
| }) | }) | ||||
| m.Get("/", routers.Home) | m.Get("/", routers.Home) | ||||
| m.Get("/dashboard", routers.Dashboard) | m.Get("/dashboard", routers.Dashboard) | ||||
| m.Get("/recommend/org", routers.RecommendOrgFromPromote) | |||||
| m.Get("/recommend/repo", routers.RecommendRepoFromPromote) | |||||
| m.Group("/explore", func() { | m.Group("/explore", func() { | ||||
| m.Get("", func(ctx *context.Context) { | m.Get("", func(ctx *context.Context) { | ||||
| ctx.Redirect(setting.AppSubURL + "/explore/repos") | ctx.Redirect(setting.AppSubURL + "/explore/repos") | ||||