调用风控接口修改完成

server/pom.xml

@@ -167,7 +167,7 @@
         <dependency>
             <groupId>com.pica.cloud.riskcontrol</groupId>
             <artifactId>pica-cloud-riskcontrol-client</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3.1</version>
         </dependency>
 
         <!-- apple identifyToken校验 -->

server/src/main/java/com/pica/cloud/account/account/server/constants/Constants.java

@@ -66,4 +66,10 @@ public class Constants {
     /** 注册逻辑幂等处理缓存key */
     public static final String REPEAT_REGISTER_PREFIX = "repeat-register—";
 
+    /** h5拼图缓存key */
+    public static final String JIGSAW_CODE_KEY = "jigsaw-code-{mobile}";
+
+    /** h5拼图缓存时长*/
+    public static final int JIGSAW_CODE_EXPIRE_SECONDS = 60 * 10;
+
 }

server/src/main/java/com/pica/cloud/account/account/server/controller/AutoCodeController.java

@@ -107,12 +107,13 @@ public class AutoCodeController extends AccountBaseController {
         //  验证码类型 0默认 1注册 2微信登录绑定手机 3修改手机
         //  4重置密码 5忘记密码 7患者招募提交问卷(效验) 8Appe登录绑定手机
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        request.setSourceType(super.getSourceType());
         AccountUtils.checkMobilePhone(request.getMobile());
 
         if (request.getBizType() != null && request.getBizType().equals(1)) {
             logger.info("app-rcValidate-start");
             //  调用风控接口
-            authCodeService.rcValidate(req, request, super.getDeviceInfo());
+            authCodeService.rcValidate(req, request, super.getDeviceInfo(), super.getSourceType());
             //  发送短信验证码
             processSysCode(request.getMobile(), request.getFlag());
             return PicaResponse.toResponse();
@@ -138,16 +139,19 @@ public class AutoCodeController extends AccountBaseController {
         //  验证码类型 0默认 1注册 2微信登录绑定手机 3修改手机
         //  4重置密码 5忘记密码 7患者招募提交问卷(效验) 8Appe登录绑定手机
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        request.setSourceType(super.getSourceType());
         AccountUtils.checkMobilePhone(request.getMobile());
 
         //  拼图验证
-        authCodeService.validateJigsawCode(request.getMobile(), request.getCapCode(), request.getxPos());
+        Boolean recordData = authCodeService.validateJigsawCode(req, request);
 
         //  发送短信验证码
         processSysCode(request.getMobile(), request.getFlag());
 
-        //  TODO 记录风控数据（记录是h5端）
-        authCodeService.recordRcData(req, request, super.getDeviceInfo("device_ip"));
+        if (recordData) {
+            //  记录风控数据（记录是h5端）
+            authCodeService.recordRcData(req, request, super.getDeviceInfo("device_ip"));
+        }
 
         return PicaResponse.toResponse();
     }
@@ -165,6 +169,7 @@ public class AutoCodeController extends AccountBaseController {
     public PicaResponse<String> getAuthCodeWithCaptcha(@RequestBody EncryptEntity entity,
                                                        HttpServletRequest req) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        request.setSourceType(super.getSourceType());
         String mobilePhone = request.getMobile();
         String flag = request.getFlag() + "";
         String captchaToken = request.getCaptchaToken();
@@ -198,7 +203,7 @@ public class AutoCodeController extends AccountBaseController {
     public PicaResponse getJigsawCode(@RequestBody EncryptEntity entity,
                                       HttpServletRequest req) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        return PicaResponse.toResponse(authCodeService.validateJigsawCode(request.getMobile()));
+        return PicaResponse.toResponse(authCodeService.getJigsawCode(req, super.getSourceType(), request.getMobile()));
     }
 
     @ApiOperation("微信获取验证码")

server/src/main/java/com/pica/cloud/account/account/server/service/AuthCodeService.java

@@ -16,13 +16,13 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface AuthCodeService {
 
-    void rcValidate(HttpServletRequest request, BaseRequest baseRequest, String deviceInfoStr);
+    Boolean rcValidate(HttpServletRequest request, BaseRequest baseRequest, String deviceInfoStr, Integer sourceType);
 
     void recordRcData(HttpServletRequest req, BaseRequest baseRequest, String deviceIp);
 
-    void validateJigsawCode(String mobile, String capCode, int xPos);
+    Boolean validateJigsawCode(HttpServletRequest request, BaseRequest req);
 
-    JigsawCodeModel validateJigsawCode(String mobile);
+    JigsawCodeModel getJigsawCode(HttpServletRequest request, Integer sourceType, String mobile);
 
 
 }