|
@ -249,7 +249,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
return this.getTokenByUserDto(userInfoResult.getData()); |
|
|
return this.getTokenByUserDto(userInfoResult.getData()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(CachingUserInfoDTO userDto){ |
|
|
private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(CachingUserInfoDTO userDto) { |
|
|
EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO(); |
|
|
EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO(); |
|
|
// 用户未注册
|
|
|
// 用户未注册
|
|
|
if (null == userDto) { |
|
|
if (null == userDto) { |
|
@ -278,7 +278,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
formDTO.setPassword(loginDto.getPassword()); |
|
|
formDTO.setPassword(loginDto.getPassword()); |
|
|
Result<CachingUserInfoDTO> userInfoResult = userFeignClient.npmNeedCachingUserInfo(formDTO); |
|
|
Result<CachingUserInfoDTO> userInfoResult = userFeignClient.npmNeedCachingUserInfo(formDTO); |
|
|
if (!userInfoResult.success()) { |
|
|
if (!userInfoResult.success()) { |
|
|
return new Result().error(userInfoResult.getMsg()); |
|
|
return new Result().error(-1, "请确认账号和密码是否正确或联系管理员!"); |
|
|
} |
|
|
} |
|
|
return this.getTokenByNpmUserDto(userInfoResult.getData(), loginDto); |
|
|
return this.getTokenByNpmUserDto(userInfoResult.getData(), loginDto); |
|
|
} |
|
|
} |
|
|