fix an issue(geetest)

src/main/java/cn/quantgroup/xyqb/service/v2/GeetestBehaviorStrategy.java

@@ -55,7 +55,7 @@ public class GeetestBehaviorStrategy implements BehaviorStrategy {
         if (SettingType.PASSWD.getAlias().equals(SettingType.valueByCode(validateBehavior.getType()).getAlias())) {
             result = geetestCaptchaService.validGeetestCaptchaPasswd(key, validateBehavior.getData().get(Constants.X_BEHAVIOR_IP), ClientType.valueByCode(geetestLogEntity.getDataSource()), validateBehavior.getData().get(Constants.X_BEHAVIOR_CHALLENGE), validateBehavior.getData().get(Constants.X_BEHAVIOR_VALIDATE), validateBehavior.getData().get(Constants.X_BEHAVIOR_SECCODE));
         } else {
-            result = geetestCaptchaService.validGeetestCaptcha(key, validateBehavior.getData().get(Constants.X_BEHAVIOR_IP), ClientType.valueByCode(geetestLogEntity.getDataSource()) , validateBehavior.getData().get(Constants.X_BEHAVIOR_CHALLENGE), validateBehavior.getData().get(Constants.X_BEHAVIOR_VALIDATE), validateBehavior.getData().get(Constants.X_BEHAVIOR_SECCODE));
+            result = geetestCaptchaService.validGeetestCaptcha(key, validateBehavior.getData().get(Constants.X_BEHAVIOR_IP), ClientType.valueByCode(geetestLogEntity.getDataSource()), validateBehavior.getData().get(Constants.X_BEHAVIOR_CHALLENGE), validateBehavior.getData().get(Constants.X_BEHAVIOR_VALIDATE), validateBehavior.getData().get(Constants.X_BEHAVIOR_SECCODE));
         }
         geetestLogService.updateGeetestLog(validateBehavior.getData().get(Constants.X_BEHAVIOR_ID), null, null, null, result);
 
@@ -69,7 +69,13 @@ public class GeetestBehaviorStrategy implements BehaviorStrategy {
         String key = StringUtils.isNotBlank(behaviorReq.getPhone()) ? behaviorReq.getPhone().trim() : UUID.randomUUID().toString();
         // key指纹
         String registerDt = LocalDateTime.now().toString();
-        Map<String, String> imgMap = geetestCaptchaService.fetchGeetestCaptcha(PasswordUtil.MD5(key), behaviorReq.getIp(), ClientType.valueByCode(behaviorReq.getClientType()));
+        Map<String, String> imgMap;
+        //0:账密，1:短验;
+        if (behaviorReq.getSettingType() == 0) {
+            imgMap = geetestCaptchaService.fetchGeetestCaptchaPasswd(PasswordUtil.MD5(key), behaviorReq.getIp(), ClientType.valueByCode(behaviorReq.getClientType()));
+        } else {
+            imgMap = geetestCaptchaService.fetchGeetestCaptcha(PasswordUtil.MD5(key), behaviorReq.getIp(), ClientType.valueByCode(behaviorReq.getClientType()));
+        }
 
         if (imgMap.containsKey("success") && "1".equals(imgMap.get("success"))) {
             behaviorCodeBean.setType(1);
@@ -79,9 +85,9 @@ public class GeetestBehaviorStrategy implements BehaviorStrategy {
                     ).offline(false).newCaptcha(true).
                     build());
             String registerReDt = LocalDateTime.now().toString();
-            imgMap.put(Constants.QG_CAPTCHA_INITDT,behaviorReq.getInitializeDt() == null ? null : behaviorReq.getInitializeDt().toString());
-            imgMap.put(Constants.QG_CAPTCHA_REGISTERDT,registerDt);
-            imgMap.put(Constants.QG_CAPTCHA_REGISTERREDT,registerReDt);
+            imgMap.put(Constants.QG_CAPTCHA_INITDT, behaviorReq.getInitializeDt() == null ? null : behaviorReq.getInitializeDt().toString());
+            imgMap.put(Constants.QG_CAPTCHA_REGISTERDT, registerDt);
+            imgMap.put(Constants.QG_CAPTCHA_REGISTERREDT, registerReDt);
 
             Long geetestLogId = geetestLogService.saveGeetestLog(behaviorReq.getPhone(), ClientType.valueByCode(behaviorReq.getClientType()).getAlias(), SettingType.valueByCode(behaviorReq.getSettingType()).getAlias(), imgMap);
             behaviorCodeBean.setId(String.valueOf(geetestLogId));