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

internal/domains/api/services/processors/jrzq/jrzqo6l7_processor.go

@@ -46,8 +46,6 @@ func ProcessJRZQO6L7Request(ctx context.Context, params []byte, deps *processors
 		"city":       null,
 	}
 
-	// 使用 WithSkipCode201Check 不跳过 201 错误检查，当 Code == "201" 时返回错误
-	// ctx = zhicha.WithSkipCode201Check(ctx)
 	respData, err := deps.ZhichaService.CallAPI(ctx, "ZCI081", reqData)
 	if err != nil {
 		if errors.Is(err, zhicha.ErrDatasource) {

internal/domains/user/services/sms_code_service.go

@@ -10,18 +10,20 @@ import (
 	"tyapi-server/internal/config"
 	"tyapi-server/internal/domains/user/entities"
 	"tyapi-server/internal/domains/user/repositories"
+	"tyapi-server/internal/infrastructure/external/captcha"
 	"tyapi-server/internal/infrastructure/external/sms"
 	"tyapi-server/internal/shared/interfaces"
 )
 
 // SMSCodeService 短信验证码服务
 type SMSCodeService struct {
-	repo      repositories.SMSCodeRepository
-	smsClient *sms.AliSMSService
-	cache     interfaces.CacheService
-	config    config.SMSConfig
-	appConfig config.AppConfig
-	logger    *zap.Logger
+	repo       repositories.SMSCodeRepository
+	smsClient  *sms.AliSMSService
+	cache      interfaces.CacheService
+	captchaSvc *captcha.CaptchaService
+	config     config.SMSConfig
+	appConfig  config.AppConfig
+	logger     *zap.Logger
 }
 
 // NewSMSCodeService 创建短信验证码服务
@@ -29,23 +31,36 @@ func NewSMSCodeService(
 	repo repositories.SMSCodeRepository,
 	smsClient *sms.AliSMSService,
 	cache interfaces.CacheService,
+	captchaSvc *captcha.CaptchaService,
 	config config.SMSConfig,
 	appConfig config.AppConfig,
 	logger *zap.Logger,
 ) *SMSCodeService {
 	return &SMSCodeService{
-		repo:      repo,
-		smsClient: smsClient,
-		cache:     cache,
-		config:    config,
-		appConfig: appConfig,
-		logger:    logger,
+		repo:       repo,
+		smsClient:  smsClient,
+		cache:      cache,
+		captchaSvc: captchaSvc,
+		config:     config,
+		appConfig:  appConfig,
+		logger:     logger,
 	}
 }
 
 // SendCode 发送验证码
-func (s *SMSCodeService) SendCode(ctx context.Context, phone string, scene entities.SMSScene, clientIP, userAgent string) error {
-	// 0. 发送前安全限流检查
+func (s *SMSCodeService) SendCode(ctx context.Context, phone string, scene entities.SMSScene, clientIP, userAgent, captchaVerifyParam string) error {
+	// 0. 验证滑块验证码（如果启用）
+	if s.config.CaptchaEnabled && s.captchaSvc != nil {
+		if err := s.captchaSvc.Verify(captchaVerifyParam); err != nil {
+			s.logger.Warn("滑块验证码校验失败",
+				zap.String("phone", phone),
+				zap.String("scene", string(scene)),
+				zap.Error(err))
+			return captcha.ErrCaptchaVerifyFailed
+		}
+	}
+
+	// 0.1. 发送前安全限流检查
 	if err := s.CheckRateLimit(ctx, phone, scene, clientIP, userAgent); err != nil {
 		return err
 	}