f

pkg/captcha/aliyun.go

@@ -19,15 +19,24 @@ type Config struct {
 	SceneID         string
 }
 
-// Verify 验证阿里云验证码
-func Verify(cfg Config, captchaVerifyParam string) error {
+// VerifyResult 验证结果
+type VerifyResult struct {
+	Verified  bool  // 是否通过滑块验证
+	Skipped   bool  // 是否跳过验证（无滑块参数）
+	VerifyErr error // 验证错误（如果有）
+}
+
+// VerifyOptional 可选验证阿里云验证码
+// 当 captchaVerifyParam 为空时返回 Skipped=true，由调用方决定后续处理
+func VerifyOptional(cfg Config, captchaVerifyParam string) VerifyResult {
 	// 开发环境可跳过验证
 	if os.Getenv("ENV") == "development" {
-		return nil
+		return VerifyResult{Verified: true, Skipped: false}
 	}
 
+	// 没有滑块验证码参数，返回跳过状态
 	if captchaVerifyParam == "" {
-		return errors.Wrapf(xerr.NewErrMsg("图形验证码校验失败"), "empty captchaVerifyParam")
+		return VerifyResult{Skipped: true}
 	}
 
 	clientCfg := &openapi.Config{
@@ -37,7 +46,7 @@ func Verify(cfg Config, captchaVerifyParam string) error {
 	clientCfg.Endpoint = tea.String(cfg.EndpointURL)
 	client, err := captcha20230305.NewClient(clientCfg)
 	if err != nil {
-		return errors.Wrapf(err, "create aliyun captcha client error")
+		return VerifyResult{VerifyErr: errors.Wrapf(err, "create aliyun captcha client error")}
 	}
 
 	req := &captcha20230305.VerifyIntelligentCaptchaRequest{
@@ -47,13 +56,27 @@ func Verify(cfg Config, captchaVerifyParam string) error {
 
 	resp, err := client.VerifyIntelligentCaptcha(req)
 	if err != nil {
-		return errors.Wrapf(err, "verify aliyun captcha error")
+		return VerifyResult{VerifyErr: errors.Wrapf(err, "verify aliyun captcha error")}
 	}
 
 	if tea.BoolValue(resp.Body.Result.VerifyResult) {
-		return nil
+		return VerifyResult{Verified: true}
 	}
 
-	return errors.Wrapf(xerr.NewErrMsg("图形验证码校验失败"), "aliyun captcha verify failed: code=%s, msg=%s",
-		tea.StringValue(resp.Body.Code), tea.StringValue(resp.Body.Message))
+	return VerifyResult{
+		VerifyErr: errors.Wrapf(xerr.NewErrMsg("图形验证码校验失败"), "aliyun captcha verify failed: code=%s, msg=%s",
+			tea.StringValue(resp.Body.Code), tea.StringValue(resp.Body.Message)),
+	}
+}
+
+// Verify 验证阿里云验证码（必须提供验证码参数）
+func Verify(cfg Config, captchaVerifyParam string) error {
+	result := VerifyOptional(cfg, captchaVerifyParam)
+	if result.VerifyErr != nil {
+		return result.VerifyErr
+	}
+	if result.Skipped {
+		return errors.Wrapf(xerr.NewErrMsg("图形验证码校验失败"), "empty captchaVerifyParam")
+	}
+	return nil
 }