Merge branch 'feature-jishipop-20240517' into 'master'

Feature jishipop 20240517

See merge request !123

src/main/java/cn/quantgroup/xyqb/controller/api/v2/BehaviorApiV2Controller.java

 package cn.quantgroup.xyqb.controller.api.v2;
 
+import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.controller.req.v2.BehaviorRefreshReq;
 import cn.quantgroup.xyqb.controller.req.v2.BehaviorReq;
 import cn.quantgroup.xyqb.model.BehaviorCodeBean;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.v2.BehaviorContext;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 @RestController
 @RequestMapping("/api/v2/behavior")
+@Slf4j
 public class BehaviorApiV2Controller {
 
     @Autowired
@@ -39,4 +43,18 @@ public class BehaviorApiV2Controller {
         return JsonResult.buildSuccessResultGeneric(behaviorContext.refresh(behaviorRefreshReq));
     }
 
+    /**
+     * 单独校验行为验证码
+     * @return
+     */
+    @PostMapping("/validate")
+    public JsonResult validateBehavior(HttpServletRequest request){
+        String challenge = request.getHeader(Constants.X_BEHAVIOR_CHALLENGE);
+        String validate = request.getHeader(Constants.X_BEHAVIOR_VALIDATE);
+        String secCode = request.getHeader(Constants.X_BEHAVIOR_SECCODE);
+        String id = request.getHeader(Constants.X_BEHAVIOR_ID);
+        log.info("单独校验行为验证码通过 challenge:{},validate:{},secCode:{},id:{}",challenge,validate,secCode,id);
+        return JsonResult.buildSuccessResult();
+    }
+
 }

src/main/java/cn/quantgroup/xyqb/exception/BizExceptionEnum.java

@@ -47,6 +47,7 @@ public enum BizExceptionEnum {
     PHONE_VOICE_MAX_PER_DAY("2011","今天已获取5次语音验证码，请使用短信验证码或明天再试"),
     ERROR_USAGE("2022","参数校验失败,用户登录语音验证码usage不正确"),
     ERROR_SEND_SMS("2023","验证码发送失败"),
+    FAIL_JI_GUANG_VALIDATE("2024","极光验证未通过"),
     //通用记录
     ERROR_PARAM("4000","参数错误"),
     INVALID_SMS_CODE("4001","验证码失效，请重新获取");

src/main/java/cn/quantgroup/xyqb/filter/BehaviorInterceptor.java

@@ -89,7 +89,11 @@ public class BehaviorInterceptor implements HandlerInterceptor {
 
         }
         validateBehavior.setData(data);
-        return behaviorContext.validate(validateBehavior);
+        boolean validate = behaviorContext.validate(validateBehavior);
+        if(!validate){
+            throw new BizException(BizExceptionEnum.FAIL_JI_GUANG_VALIDATE);
+        }
+        return validate;
     }
 
     @Override