提交代码，老拉新需求

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/user_invitation.go

@@ -49,7 +49,7 @@ func InsertInvitaion(invitationUser *Invitation) error {
 	return err
 }
 
-func QueryInvitaionBySrcUserId(srcUserId int64) ([]*Invitation, int) {
+func QueryInvitaionBySrcUserId(srcUserId int64) []*Invitation {
 	statictisSess := xStatistic.NewSession()
 	defer statictisSess.Close()
 	cond := "src_user_id =" + fmt.Sprint(srcUserId)
@@ -58,7 +58,7 @@ func QueryInvitaionBySrcUserId(srcUserId int64) ([]*Invitation, int) {
 
 	if err := statictisSess.Table(new(Invitation)).Where(cond).OrderBy("created_unix desc").
 		Find(&invitationList); err != nil {
-		return nil, 0
+		return nil
 	}
-	return invitationList, len(invitationList)
+	return invitationList
 }

modules/grampus/resty.go

@@ -1,14 +1,15 @@
 package grampus
 
 import (
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"github.com/go-resty/resty/v2"
 	"net/http"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+	"github.com/go-resty/resty/v2"
 )
 
 var (
@@ -235,7 +236,7 @@ func GetTrainJobLog(jobID string) (string, error) {
 			return logContent, fmt.Errorf("json.Unmarshal failed(%s): %v", res.String(), err.Error())
 		}
 		log.Error("GetTrainJobLog failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
-		return logContent, fmt.Errorf("GetTrainJobLog failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
+		return logContent, fmt.Errorf("GetTrainJobLog failed(%d):%d(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
 	}
 
 	logContent = res.String()

routers/api/v1/api.go

@@ -969,6 +969,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 							m.Get("", repo.GetModelArtsTrainJobVersion)
 							m.Post("/stop_version", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo_ext.GrampusStopJob)
 							m.Get("/log", repo_ext.GrampusGetLog)
+							m.Get("/download_log", repo_ext.GrampusDownloadLog)
 						})
 					})
 				}, reqRepoReader(models.UnitTypeCloudBrain))

routers/repo/cloudbrain.go

@@ -2718,7 +2718,7 @@ func getTrainJobCommand(form auth.CreateCloudBrainForm) (string, error) {
 		}
 	}
 
-	command += "python /code/" + bootFile + param + " | tee " + cloudbrain.ModelMountPath + "/" + form.DisplayJobName + "-" + cloudbrain.LogFile
+	command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + form.DisplayJobName + "-" + cloudbrain.LogFile
 
 	return command, nil
 }

routers/repo/grampus.go

@@ -725,6 +725,36 @@ func GrampusTrainJobShow(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplGrampusTrainJobShow)
 }
 
+func GrampusDownloadLog(ctx *context.Context) {
+	jobID := ctx.Params(":jobid")
+	job, err := models.GetCloudbrainByJobID(jobID)
+	if err != nil {
+		log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"])
+		ctx.ServerError(err.Error(), err)
+		return
+	}
+
+	content, err := grampus.GetTrainJobLog(job.JobID)
+	if err != nil {
+		log.Error("GetTrainJobLog failed: %v", err, ctx.Data["MsgID"])
+		ctx.ServerError(err.Error(), err)
+		return
+	}
+	fileName := job.JobName + "-log.txt"
+	ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+fileName)
+	ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+	var b []byte = []byte(content)
+
+	ctx.Resp.Write(b)
+
+	// ctx.JSON(http.StatusOK, map[string]interface{}{
+	// 	"JobName": job.JobName,
+	// 	"Content": content,
+	// })
+
+	//return
+}
+
 func GrampusGetLog(ctx *context.Context) {
 	jobID := ctx.Params(":jobid")
 	job, err := models.GetCloudbrainByJobID(jobID)

routers/routes/routes.go

@@ -506,6 +506,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Post("/forgot_password", user.ForgotPasswdPost)
 		m.Post("/logout", user.SignOut)
 		m.Get("/invitation_code", user.GetInvitaionCode)
+		m.Get("/invitation_tpl", user.InviationTpl)
 	})
 	// ***** END: User *****
 

routers/user/Invitation.go

@@ -6,12 +6,17 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
+	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/services/repository"
 )
 
+const (
+	tplInvitation base.TplName = "user/settings/invite"
+)
+
 func GetInvitaionCode(ctx *context.Context) {
 
 	url := setting.RecommentRepoAddr + "invitaion_page"
@@ -29,11 +34,17 @@ func GetInvitaionCode(ctx *context.Context) {
 	}
 
 	if ctx.IsSigned {
-		resultJsonMap["invitaion_code"] = getInvitaionCode(ctx)
+		resultJsonMap["invitation_code"] = getInvitaionCode(ctx)
+		resultJsonMap["invitation_users"] = models.QueryInvitaionBySrcUserId(ctx.User.ID)
 	}
+
 	ctx.JSON(200, resultJsonMap)
 }
 
+func InviationTpl(ctx *context.Context) {
+	ctx.HTML(200, tplInvitation)
+}
+
 func RegisteUserByInvitaionCode(form auth.RegisterForm, newUserId int64) error {
 	invitationcode := form.InvitaionCode