1.修改 DTO字段
This commit is contained in:
@@ -230,7 +230,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
|
||||
return loginInfoDTO;
|
||||
}
|
||||
if (LoginStatusEnum.CONFIRMED.name().equals(loginInfoDTO.getStatus())) {
|
||||
UserModel userModel = userDao.selectById(loginInfoDTO.getUserId());
|
||||
UserModel userModel = userDao.selectById(loginInfoDTO.getId());
|
||||
StpUtil.login(userModel.getId());
|
||||
UserModelVO userModelVO = BeanUtil.copyProperties(userModel, UserModelVO.class);
|
||||
userModelVO.setToken(StpUtil.getTokenValue());
|
||||
@@ -241,16 +241,14 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
|
||||
}
|
||||
|
||||
@Override
|
||||
public void scanQrcode(ScanInfoDTO scanInfoDTO) {
|
||||
public LoginInfoDTO scanQrcode(ScanInfoDTO scanInfoDTO) {
|
||||
LoginInfoDTO loginInfoDTO = qrcodeCache.getIfPresent(scanInfoDTO.getUuid());
|
||||
if (loginInfoDTO != null) {
|
||||
loginInfoDTO.setStatus(LoginStatusEnum.SCANNED.name());
|
||||
}
|
||||
if (loginInfoDTO != null) {
|
||||
qrcodeCache.put(scanInfoDTO.getUuid(),loginInfoDTO);
|
||||
}
|
||||
|
||||
log.info("-------扫码成功uuid:{}-------", scanInfoDTO.getUuid());
|
||||
return loginInfoDTO;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -258,7 +256,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
|
||||
LoginInfoDTO loginInfoDTO = qrcodeCache.getIfPresent(scanInfoDTO.getUuid());
|
||||
if (loginInfoDTO != null) {
|
||||
loginInfoDTO.setStatus(LoginStatusEnum.CONFIRMED.name());
|
||||
loginInfoDTO.setUserId(scanInfoDTO.getUserId());
|
||||
loginInfoDTO.setId(scanInfoDTO.getId());
|
||||
qrcodeCache.put(scanInfoDTO.getUuid(),loginInfoDTO);
|
||||
}
|
||||
log.info("-------确认登录成功uuid:{}-------", scanInfoDTO.getUuid());
|
||||
|
||||
Reference in New Issue
Block a user