fadd

app/main/api/internal/handler/auth/sendsmshandler.go

@@ -1,12 +1,14 @@
 package auth
 
 import (
+	"context"
 	"net/http"
 
 	"tydata-server/app/main/api/internal/logic/auth"
 	"tydata-server/app/main/api/internal/svc"
 	"tydata-server/app/main/api/internal/types"
 	"tydata-server/common/result"
+	"tydata-server/pkg/captcha"
 	"tydata-server/pkg/lzkit/validator"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
@@ -23,7 +25,9 @@ func SendSmsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			result.ParamValidateErrorResult(r, w, err)
 			return
 		}
-		l := auth.NewSendSmsLogic(r.Context(), svcCtx)
+		// 将 request 注入 context，供 captcha 包判断微信等环境时跳过图形验证
+		ctx := context.WithValue(r.Context(), captcha.HTTPRequestContextKey, r)
+		l := auth.NewSendSmsLogic(ctx, svcCtx)
 		err := l.SendSms(&req)
 		result.HttpResult(r, w, nil, err)
 	}

app/main/api/internal/logic/auth/sendsmslogic.go

@@ -37,12 +37,12 @@ func NewSendSmsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendSmsLo
 
 func (l *SendSmsLogic) SendSms(req *types.SendSmsReq) error {
 	cfg := l.svcCtx.Config.Captcha
-	if err := captcha.Verify(captcha.Config{
+	if err := captcha.VerifyWithRequest(captcha.Config{
 		AccessKeyID:     cfg.AccessKeyID,
 		AccessKeySecret: cfg.AccessKeySecret,
 		EndpointURL:     cfg.EndpointURL,
 		SceneID:         cfg.SceneID,
-	}, req.CaptchaVerifyParam); err != nil {
+	}, req.CaptchaVerifyParam, l.ctx); err != nil {
 		return err
 	}
 	// 默认action类型：当未传入时，默认为login，便于小程序环境兼容