From a84152653a4bfe421d7bd4da3c786129c9267a54 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 5 Sep 2022 11:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/routes/routes.go | 7 +++---- routers/user/auth.go | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 142fde739..af139b7a9 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -375,8 +375,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/login/cloud_brain", user.SignInCloudBrain) m.Post("/login/cloud_brain", bindIgnErr(auth.SignInForm{}), user.SignInCloudBrainPost) m.Post("/login", bindIgnErr(auth.SignInForm{}), user.SignInPost) - - m.Get("/invitaion", user.GetInvitaionCode) + m.Get("/invitation_code", user.GetInvitaionCode) + m.Get("/invitation_tpl", user.InviationTpl) m.Get("/login/phone", user.SignInPhone) m.Post("/login/phone", bindIgnErr(auth.PhoneNumberCodeForm{}), user.SignInPhonePost) m.Group("", func() { @@ -505,8 +505,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/forgot_password", user.ForgotPasswd) 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 ***** diff --git a/routers/user/auth.go b/routers/user/auth.go index a95d0e3c4..3c80af4e1 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -1337,9 +1337,6 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo ctx.RenderWithErr(ctx.Tr("sign_up_agree_tips"), tplSignUp, &form) return } - if form.InvitaionCode != "" { - RegisteUserByInvitaionCode(ctx, form) - } u := &models.User{ Name: form.UserName, @@ -1369,6 +1366,10 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo } log.Trace("Account created: %s", u.Name, ctx.Data["MsgID"]) + if form.InvitaionCode != "" { + RegisteUserByInvitaionCode(form, u.ID) + } + err := models.AddEmailAddress(&models.EmailAddress{ UID: u.ID, Email: form.Email,