Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java

@@ -30,6 +30,6 @@ public class AdamThirdPartParam implements Serializable {
     private String mobile;
     @ApiModelProperty(position = 16, required = false, value = "验证码[新账号时必传]")
     private String code;
-    @ApiModelProperty(position = 17, required = false, value = "强制绑定[第三方账号已绑定其他手机号时]", example = "false")
-    private Boolean force;
+//    @ApiModelProperty(position = 17, required = false, value = "强制绑定[第三方账号已绑定其他手机号时]", example = "false")
+//    private Boolean force;
 }

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

@@ -376,12 +376,12 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
 
     private ResponseDto<AdamLoginInfoVo> checkSmsCode(String mobile, String code) {
-        if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
-                || reviewMobile.equals(mobile)) {
+//        if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
+//                || reviewMobile.equals(mobile)) {
             if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
                 return ResponseDto.success();
             }
-        }
+//        }
 
 //        LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
 //        paramsMap.add("mobile", mobile);

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

@@ -256,11 +256,11 @@ public class AdamUserController {
             if (existUid.equals(currentUid)) {
                 return ResponseDto.success(adamRdmService.getThirdPartVoListByUid(currentUid));
             }
-            Boolean force = parameter.getForce();
-            if (null != force && force) {// 强制解绑，并重新绑定当前账号
-                adamUserService.bindTpaForce(currentUid, existUid, parameter);
-                return ResponseDto.success();
-            }
+//            Boolean force = parameter.getForce();
+//            if (null != force && force) {// 强制解绑，并重新绑定当前账号
+//                adamUserService.bindTpaForce(currentUid, existUid, parameter);
+//                return ResponseDto.success();
+//            }
             return ResponseDto.failure(ErrorMapping.get("10007"));
         }