Browse Source

代码提交。

Signed-off-by: zouap <zouap@pcl.ac.cn>
tags/v1.22.9.2^2
zouap 3 years ago
parent
commit
a84152653a
2 changed files with 7 additions and 7 deletions
  1. +3
    -4
      routers/routes/routes.go
  2. +4
    -3
      routers/user/auth.go

+ 3
- 4
routers/routes/routes.go View File

@@ -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 *****



+ 4
- 3
routers/user/auth.go View File

@@ -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,


Loading…
Cancel
Save