Skip to content

Commit a033ab9

Browse files
committed
refactor: simplify login captcha validation flow for cleaner code
1 parent 311e1dd commit a033ab9

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

server/api/v1/system/sys_user.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,30 +47,30 @@ func (b *BaseApi) Login(c *gin.Context) {
4747
}
4848

4949
var oc bool = openCaptcha == 0 || openCaptcha < interfaceToInt(v)
50+
if oc && !store.Verify(l.CaptchaId, l.Captcha, true) {
51+
// 验证码次数+1
52+
global.BlackCache.Increment(key, 1)
53+
response.FailWithMessage("验证码错误", c)
54+
return
55+
}
5056

51-
if !oc || store.Verify(l.CaptchaId, l.Captcha, true) {
52-
u := &system.SysUser{Username: l.Username, Password: l.Password}
53-
user, err := userService.Login(u)
54-
if err != nil {
55-
global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Error(err))
56-
// 验证码次数+1
57-
global.BlackCache.Increment(key, 1)
58-
response.FailWithMessage("用户名不存在或者密码错误", c)
59-
return
60-
}
61-
if user.Enable != 1 {
62-
global.GVA_LOG.Error("登陆失败! 用户被禁止登录!")
63-
// 验证码次数+1
64-
global.BlackCache.Increment(key, 1)
65-
response.FailWithMessage("用户被禁止登录", c)
66-
return
67-
}
68-
b.TokenNext(c, *user)
57+
u := &system.SysUser{Username: l.Username, Password: l.Password}
58+
user, err := userService.Login(u)
59+
if err != nil {
60+
global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Error(err))
61+
// 验证码次数+1
62+
global.BlackCache.Increment(key, 1)
63+
response.FailWithMessage("用户名不存在或者密码错误", c)
64+
return
65+
}
66+
if user.Enable != 1 {
67+
global.GVA_LOG.Error("登陆失败! 用户被禁止登录!")
68+
// 验证码次数+1
69+
global.BlackCache.Increment(key, 1)
70+
response.FailWithMessage("用户被禁止登录", c)
6971
return
7072
}
71-
// 验证码次数+1
72-
global.BlackCache.Increment(key, 1)
73-
response.FailWithMessage("验证码错误", c)
73+
b.TokenNext(c, *user)
7474
}
7575

7676
// TokenNext 登录以后签发jwt

0 commit comments

Comments
 (0)