fix:ID GEN;

liquidnet-bus-common/liquidnet-common-feign/src/main/java/com/liquidnet/common/feign/config/BizExceptionFeignErrorDecoder.java

 package com.liquidnet.common.feign.config;
 
 import com.alibaba.fastjson.JSON;
-import com.liquidnet.service.constant.GlobalConstant;
+import com.liquidnet.common.exception.LiquidnetFeignException;
 import com.liquidnet.common.exception.constant.ErrorCode;
 import com.liquidnet.common.exception.entity.Error;
-import com.liquidnet.common.exception.LiquidnetFeignException;
 import feign.Response;
 import feign.Util;
 import org.slf4j.Logger;

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

@@ -79,16 +79,10 @@ public class AdamLoginController {
 
     @GetMapping(value = {"gen"})
     public void genID() {
-        log.debug("0gen id:{}", IDGenerator.nextSnowId());
-        log.debug("1gen id:{}", IDGenerator.nextSnowId());
-        log.debug("2gen id:{}", IDGenerator.nextSnowId());
-        log.debug("3gen id:{}", IDGenerator.nextSnowId());
-        log.debug("4gen id:{}", IDGenerator.nextSnowId());
-        log.debug("5gen id:{}", IDGenerator.nextSnowId());
-        log.debug("6gen id:{}", IDGenerator.nextSnowId());
-        log.debug("7gen id:{}", IDGenerator.nextSnowId());
-        log.debug("8gen id:{}", IDGenerator.nextSnowId());
-        log.debug("9gen id:{}\n", IDGenerator.nextSnowId());
+        log.debug("-nextSnowId:{}", IDGenerator.nextSnowId());
+        log.debug("nextMilliId:{}", IDGenerator.nextMilliId());
+        log.debug("nextMilliId:{}", IDGenerator.nextTimeId());
+        log.debug("nextMilliId:{}", IDGenerator.get32UUID());
     }
 
     @ApiOperationSupport(order = 2)
@@ -145,7 +139,7 @@ public class AdamLoginController {
         if (toRegister) {
             userInfoVo = adamUserService.register(mobile);
             if (null == userInfoVo) {
-                return ResponseDto.failure(ErrorMapping.get("10003"));
+                return ResponseDto.failure(ErrorMapping.get("10000"));
             }
         } else {
             userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
@@ -182,7 +176,7 @@ public class AdamLoginController {
         if (toRegister) {
             userInfoVo = adamUserService.register(mobile);
             if (null == userInfoVo) {
-                return ResponseDto.failure(ErrorMapping.get("10003"));
+                return ResponseDto.failure(ErrorMapping.get("10000"));
             }
         } else {
             userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
@@ -227,7 +221,7 @@ public class AdamLoginController {
             }
             AdamUserInfoVo registerUserInfo = adamUserService.register(parameter);
             if (null == registerUserInfo) {
-                return ResponseDto.failure(ErrorMapping.get("10003"));
+                return ResponseDto.failure(ErrorMapping.get("10000"));
             }
             loginInfoVo.setUserInfo(registerUserInfo);
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -3,9 +3,10 @@
 40003=TOKEN失效
 # ------------------------ 4开头错误码作系统保留
 
+10000=系统繁忙，请稍候重试
 10001=验证码发送失败
 10002=验证码无效
-10003=系统繁忙，请稍候重试
+10003=
 10004=
 10005=手机号获取失败，请更换登录方式
 10006=第三方账号未注册