refactor: simplify login captcha validation flow for cleaner code

server/api/v1/system/sys_user.go

@@ -47,30 +47,30 @@ func (b *BaseApi) Login(c *gin.Context) {
 	}
 
 	var oc bool = openCaptcha == 0 || openCaptcha < interfaceToInt(v)
-
+	if oc && !store.Verify(l.CaptchaId, l.Captcha, true) {
-	if !oc || store.Verify(l.CaptchaId, l.Captcha, true) {
+		// 验证码次数+1
-		u := &system.SysUser{Username: l.Username, Password: l.Password}
+		global.BlackCache.Increment(key, 1)
-		user, err := userService.Login(u)
+		response.FailWithMessage("验证码错误", c)
-		if err != nil {
-			global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Error(err))
-			// 验证码次数+1
-			global.BlackCache.Increment(key, 1)
-			response.FailWithMessage("用户名不存在或者密码错误", c)
-			return
-		}
-		if user.Enable != 1 {
-			global.GVA_LOG.Error("登陆失败! 用户被禁止登录!")
-			// 验证码次数+1
-			global.BlackCache.Increment(key, 1)
-			response.FailWithMessage("用户被禁止登录", c)
-			return
-		}
-		b.TokenNext(c, *user)
 		return
 	}
-	// 验证码次数+1
+
-	global.BlackCache.Increment(key, 1)
+	u := &system.SysUser{Username: l.Username, Password: l.Password}
-	response.FailWithMessage("验证码错误", c)
+	user, err := userService.Login(u)
+	if err != nil {
+		global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Error(err))
+		// 验证码次数+1
+		global.BlackCache.Increment(key, 1)
+		response.FailWithMessage("用户名不存在或者密码错误", c)
+		return
+	}
+	if user.Enable != 1 {
+		global.GVA_LOG.Error("登陆失败! 用户被禁止登录!")
+		// 验证码次数+1
+		global.BlackCache.Increment(key, 1)
+		response.FailWithMessage("用户被禁止登录", c)
+		return
+	}
+	b.TokenNext(c, *user)
 }
 
 // TokenNext 登录以后签发jwt