Merge branch 'main' of http://1.117.67.95:3000/team/tyc-server-v2

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

@@ -1,6 +1,7 @@
 package auth
 
 import (
+	"context"
 	"net/http"
 
 	"tyc-server/app/main/api/internal/logic/auth"
@@ -23,7 +24,8 @@ func SendSmsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			result.ParamValidateErrorResult(r, w, err)
 			return
 		}
-		l := auth.NewSendSmsLogic(r.Context(), svcCtx)
+		ctx := context.WithValue(r.Context(), auth.UserAgentContextKey, r.Header.Get("User-Agent"))
+		l := auth.NewSendSmsLogic(ctx, svcCtx)
 		err := l.SendSms(&req)
 		result.HttpResult(r, w, nil, err)
 	}

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

@@ -35,15 +35,18 @@ func NewSendSmsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendSmsLo
 	}
 }
 
+// UserAgentContextKey 用于从 context 读取 User-Agent（如判断是否微信）
+const UserAgentContextKey = "user_agent"
+
 func (l *SendSmsLogic) SendSms(req *types.SendSmsReq) error {
-	// 图形验证码校验（开发环境可跳过）
+	userAgent, _ := l.ctx.Value(UserAgentContextKey).(string)
 	cfg := l.svcCtx.Config.Captcha
-	if err := captcha.Verify(captcha.Config{
+	if err := captcha.VerifyWithUserAgent(captcha.Config{
 		AccessKeyID:     cfg.AccessKeyID,
 		AccessKeySecret: cfg.AccessKeySecret,
 		EndpointURL:     cfg.EndpointURL,
 		SceneID:         cfg.SceneID,
-	}, req.CaptchaVerifyParam); err != nil {
+	}, req.CaptchaVerifyParam, userAgent); err != nil {
 		return err
 	}