Merge pull request #2067 from huiyifyj/fix-captcha-validate-disable-option

pixelmaxQm · web-flow · commit f6c48818ad7d · 2025-08-13T14:18:31.000+08:00
Fix captcha validation issue when `OpenCaptcha` option is disabled
diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
@@ -47,7 +47,7 @@ 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 && (l.Captcha == "" || l.CaptchaId == "" || !store.Verify(l.CaptchaId, l.Captcha, true)) {
 		// 验证码次数+1
 		global.BlackCache.Increment(key, 1)
 		response.FailWithMessage("验证码错误", c)

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (b BaseApi) Login(c gin.Context) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`var oc bool = openCaptcha == 0 \|\| openCaptcha < interfaceToInt(v)`
`50`		`- if oc && !store.Verify(l.CaptchaId, l.Captcha, true) {`
	`50`	`+ if oc && (l.Captcha == "" \|\| l.CaptchaId == "" \|\| !store.Verify(l.CaptchaId, l.Captcha, true)) {`
`51`	`51`	`// 验证码次数+1`
`52`	`52`	`global.BlackCache.Increment(key, 1)`
`53`	`53`	`response.FailWithMessage("验证码错误", c)`