From 784fff22eb140b559ec64c795e9c1640eda170bc Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 14:56:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/user/auth.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/user/auth.go b/routers/user/auth.go index ae2c26f33..c2376cdc9 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -132,8 +132,9 @@ func checkAutoLogin(ctx *context.Context) bool { if isSucceed { isCourse := ctx.QueryBool("course") - ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) + if redirectTo == "" && isCourse { + ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) redirectToCourse := setting.AppSubURL + "/" + setting.Course.OrgName ctx.RedirectToFirst(redirectToCourse) } else { From 74b81213eb531820a46df6e2bc7f0053444cbd14 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:07:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/user/auth.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/user/auth.go b/routers/user/auth.go index c2376cdc9..3741103c4 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -121,7 +121,7 @@ func checkAutoLogin(ctx *context.Context) bool { ctx.ServerError("AutoSignIn", err) return true } - + log.Info("here1...") redirectTo := ctx.Query("redirect_to") if len(redirectTo) > 0 { ctx.SetCookie("redirect_to", redirectTo, 0, setting.AppSubURL, "", setting.SessionConfig.Secure, true) @@ -130,7 +130,7 @@ func checkAutoLogin(ctx *context.Context) bool { } if isSucceed { - + log.Info("here2...") isCourse := ctx.QueryBool("course") if redirectTo == "" && isCourse { @@ -138,8 +138,8 @@ func checkAutoLogin(ctx *context.Context) bool { redirectToCourse := setting.AppSubURL + "/" + setting.Course.OrgName ctx.RedirectToFirst(redirectToCourse) } else { + log.Info("here3...") ctx.RedirectToFirst(redirectTo, setting.AppSubURL+string(setting.LandingPageURL)) - } return true } From 0647c5e9f9c51406df7d1d757b74be804d14effb Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:26:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 6 +----- routers/user/auth.go | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 693d9861b..b462d7458 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -1030,18 +1030,14 @@ func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItem } cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"]) cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime) - if dateRecordAll.CloudBrainRunTime >= 100 { - runtime = float64(dateRecordAll.CloudBrainRunTime) / float64(100) - } cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5) cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"]) cloudBrainInfo["CloudBrainTwo"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainTwo"]) cloudBrainInfo["C2Net"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_C2Net"]) - cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo) scoreMap["trainscore"] = trainscore scoreMap["debugscore"] = debugscore - scoreMap["runtime"] = runtime + return string(cloudBrainInfoJson) } else { scoreMap["trainscore"] = trainscore diff --git a/routers/user/auth.go b/routers/user/auth.go index 3741103c4..20807d381 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -155,9 +155,10 @@ func getActivityTpl() string { // SignIn render sign in page func SignIn(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("sign_in") - + log.Info("sign 11111111.........") // Check auto-login. if checkAutoLogin(ctx) { + log.Info("sign 22222.........") return } From 8738240554495b1af8f8a6927fdcfe0db55be2bc Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:34:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/context/auth.go | 1 + modules/context/context.go | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/context/auth.go b/modules/context/auth.go index efde3bc2e..2624dabbd 100755 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -81,6 +81,7 @@ func Toggle(options *ToggleOptions) macaron.Handler { // Redirect to dashboard if user tries to visit any non-login page. if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" { + log.Info("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY") ctx.Redirect(setting.AppSubURL + "/") return } diff --git a/modules/context/context.go b/modules/context/context.go index 8c7808466..779b2c531 100755 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -308,6 +308,7 @@ func Contexter() macaron.Handler { if ctx.User != nil { ctx.IsSigned = true + log.Info("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") ctx.Data["IsSigned"] = ctx.IsSigned ctx.Data["SignedUser"] = ctx.User ctx.Data["SignedUserID"] = ctx.User.ID From fcc3824bbdbae7b92ba3ca00becf906a2999e546 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:41:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E9=87=8D=E5=AE=9A?= =?UTF-8?q?=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/context/auth.go | 9 +++++++-- modules/context/context.go | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/context/auth.go b/modules/context/auth.go index 2624dabbd..7a1c405f8 100755 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -81,8 +81,13 @@ func Toggle(options *ToggleOptions) macaron.Handler { // Redirect to dashboard if user tries to visit any non-login page. if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" { - log.Info("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY") - ctx.Redirect(setting.AppSubURL + "/") + redirectTo := ctx.Query("redirect_to") + log.Info("redirect_to=" + redirectTo) + if len(redirectTo) > 0 { + ctx.Redirect(redirectTo) + } else { + ctx.Redirect(setting.AppSubURL + "/") + } return } diff --git a/modules/context/context.go b/modules/context/context.go index 779b2c531..8c7808466 100755 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -308,7 +308,6 @@ func Contexter() macaron.Handler { if ctx.User != nil { ctx.IsSigned = true - log.Info("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") ctx.Data["IsSigned"] = ctx.IsSigned ctx.Data["SignedUser"] = ctx.User ctx.Data["SignedUserID"] = ctx.User.ID From 7ace826c41462b709e689806d486778a77e076d2 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:46:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=8A=A5=E5=91=8A=E9=87=8D=E5=AE=9A=E5=90=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/context/auth.go | 1 - routers/user/auth.go | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/context/auth.go b/modules/context/auth.go index 7a1c405f8..c9af1456d 100755 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -82,7 +82,6 @@ func Toggle(options *ToggleOptions) macaron.Handler { // Redirect to dashboard if user tries to visit any non-login page. if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" { redirectTo := ctx.Query("redirect_to") - log.Info("redirect_to=" + redirectTo) if len(redirectTo) > 0 { ctx.Redirect(redirectTo) } else { diff --git a/routers/user/auth.go b/routers/user/auth.go index 20807d381..9620cb969 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -121,7 +121,6 @@ func checkAutoLogin(ctx *context.Context) bool { ctx.ServerError("AutoSignIn", err) return true } - log.Info("here1...") redirectTo := ctx.Query("redirect_to") if len(redirectTo) > 0 { ctx.SetCookie("redirect_to", redirectTo, 0, setting.AppSubURL, "", setting.SessionConfig.Secure, true) @@ -130,15 +129,12 @@ func checkAutoLogin(ctx *context.Context) bool { } if isSucceed { - log.Info("here2...") isCourse := ctx.QueryBool("course") - + ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) if redirectTo == "" && isCourse { - ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) redirectToCourse := setting.AppSubURL + "/" + setting.Course.OrgName ctx.RedirectToFirst(redirectToCourse) } else { - log.Info("here3...") ctx.RedirectToFirst(redirectTo, setting.AppSubURL+string(setting.LandingPageURL)) } return true @@ -155,10 +151,8 @@ func getActivityTpl() string { // SignIn render sign in page func SignIn(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("sign_in") - log.Info("sign 11111111.........") // Check auto-login. if checkAutoLogin(ctx) { - log.Info("sign 22222.........") return }