fix:实名认证服务商CODE处理;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IdentityUtils.java

@@ -4,6 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.UnknownHttpStatusCodeException;
 
 public class IdentityUtils {
     private static final Logger log = LoggerFactory.getLogger(IdentityUtils.class);
@@ -20,6 +21,11 @@ public class IdentityUtils {
             return HttpUtil.post(aliThirdUrl, params, header);
         } catch (Exception e) {
             log.error("###实名认证异常:{}", e.getLocalizedMessage(), e);
+
+            if (e instanceof UnknownHttpStatusCodeException) {
+                UnknownHttpStatusCodeException unknownHttpStatusCodeException = (UnknownHttpStatusCodeException) e;
+                return unknownHttpStatusCodeException.getMessage();
+            }
             return null;
         }
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -343,7 +343,7 @@ public class AdamLoginController {
             reql = Long.parseLong(otpDecrypt.substring(11));
         } catch (Exception e) {
         }
-        if (l - reql > 3 || (null != otpDecrypt && !otpDecrypt.substring(0, 10).equals(mobile))) {
+        if (l - reql > 10 || (null != otpDecrypt && !otpDecrypt.substring(0, 10).equals(mobile))) {
             log.error("login by silent for mobile:{},{}/{},{}-{}", mobile, otp, otpDecrypt, l, reql);
             return ResponseDto.failure(ErrorMapping.get("10005"));
         }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -246,11 +246,17 @@ public class AdamRdmService {
                     throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
                 }
 
-                String respStr = IdentityUtils.aliThird(name, idCard);
+                String respStr = IdentityUtils.aliThird(name, idCard), respErrorCode = null;
                 JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
-                if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
+                if (null == respJNode || !"0".equals(respErrorCode = String.valueOf(respJNode.get("error_code")))) {
                     log.info("###实名认证失败[{}]", respStr);
-                    this.setCertificationJunk(1, idCard, name);
+
+//                    this.setCertificationJunk(1, idCard, name);
+                    if (!StringUtils.isEmpty(respErrorCode) && org.apache.commons.lang3.StringUtils.indexOf("3000290033", respErrorCode) < 0) {
+                        // 认证服务商'30002'、'90033'为运营商导致的失败，这里不做缓存标记
+                        this.setCertificationJunk(1, idCard, name);
+                    }
+
                     ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
                     throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
                 }