Merge branch 'dev-login0218' of...

Merge branch 'dev-login0218' of 192.168.110.53:com.pica.cloud.account/pica-cloud-account into dev-login0218

# Conflicts:
#	server/src/main/java/com/pica/cloud/account/account/server/entity/LoginResult.java

server/src/main/java/com/pica/cloud/account/account/server/entity/LoginResult.java

@@ -27,18 +27,9 @@ public class LoginResult {
     private String mobile;
     @ApiModelProperty("用户id,已经加密处理")
     private String doctorId;
-
-    private Integer logLoginId;
     @ApiModelProperty("是否新用户 0:不是新用户，1:新用户")
     private int isNewUser;
 
-    public Integer getLogLoginId() {
-        return logLoginId;
-    }
-
-    public void setLogLoginId(Integer logLoginId) {
-        this.logLoginId = logLoginId;
-    }
 
     public String getToken() {
         return token;

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -280,7 +280,6 @@ public class LoginServiceImpl implements LoginService {
             entity.setQueryMobileEntity(queryMobileEntity);
         }
         picaLogUtils.info(entity);
-        result.setLogLoginId(entity.getId());
         return result;
     }
 
@@ -502,7 +501,7 @@ public class LoginServiceImpl implements LoginService {
         LoginResult result;
         if (accountInfoEntity == null) {
             //说明是注册功能
-            result = registerService.register(baseRequest);
+            result = registerService.register(baseRequest,queryMobileEntity);
         } else {
             //登录功能
             result = processLogin(baseRequest, accountInfoEntity.getId(), AccountTypeEnum.LOGIN_CODE.getCode(),queryMobileEntity);

server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java

@@ -163,13 +163,13 @@ public class RegisterServiceImpl implements RegisterService {
                         entity.setQueryMobileEntity(queryMobileEntity);
                     }
                     picaLogUtils.info(entity);
-                    result.setLogLoginId(entity.getId());
                     processAgreement(userId);
                     processRoleMap(userId);
                     redisClient.del(REPEAT_REGISTER_PREFIX + mobile);
                     return result;
                 } catch (Exception e) {
                     //向上抛出异常，让异常处理框架捕获到
+                    logger.error(e.getMessage(),e);
                     throw new AccountException(AccountExceptionEnum.PICA_REGISTER_FAIL);
                 } finally {
                     //如果在注册过程中抛出异常，就删除redis中的注册标记