|
@@ -119,7 +119,10 @@ public class LoginService {
|
|
|
}
|
|
|
loginVO.setToken(jwtTokenUtil.createToken());
|
|
|
// redisService.set(AppCacheKeyUtil.getUserIdToken(loginVO.getId()), AppCacheKeyUtil.getTokenUserInfo(loginVO.getToken()));
|
|
|
- redisService.set(loginVO.getToken(), loginVO.getId());
|
|
|
+ //将用户信息数据存入Redis
|
|
|
+ PersonnelVO personnelVO = new PersonnelVO();
|
|
|
+ BeanUtil.copy(person,personnelVO);
|
|
|
+ cacheUtil.setLoginUser(personnelVO, loginVO.getToken());
|
|
|
return loginVO;
|
|
|
}
|
|
|
|
|
@@ -184,7 +187,7 @@ public class LoginService {
|
|
|
//将用户信息数据存入Redis
|
|
|
PersonnelVO personnelVO = new PersonnelVO();
|
|
|
BeanUtil.copy(person,personnelVO);
|
|
|
- cacheUtil.setLoginUser(personnelVO,wxVO.getToken());
|
|
|
+ cacheUtil.setLoginUser(personnelVO, wxVO.getToken());
|
|
|
}
|
|
|
return wxVO;
|
|
|
}
|
|
@@ -253,13 +256,11 @@ public class LoginService {
|
|
|
if (ToolUtil.isEmpty(token)) {
|
|
|
throw new BusinessException(ExceptionEnum.THE_LOG_OUT);
|
|
|
}
|
|
|
- String usedToken = token.substring(token.indexOf("=") + 1);
|
|
|
- Object obj = redisService.get(usedToken);
|
|
|
- if (ToolUtil.isEmpty(obj)) {
|
|
|
+ PersonnelVO personnelVO = cacheUtil.getLoginUser(token);
|
|
|
+ if (ToolUtil.isEmpty(personnelVO)) {
|
|
|
throw new BusinessException(ExceptionEnum.THE_LOG_OUT);
|
|
|
}
|
|
|
- Integer id = JSONObject.parseObject(obj.toString(), Integer.class);
|
|
|
- Person person = personMapper.selectById(id);
|
|
|
+ Person person = personMapper.selectById(personnelVO.getId());
|
|
|
PersonVO personVO = new PersonVO();
|
|
|
BeanUtil.copy(person, personVO);
|
|
|
return personVO;
|
|
@@ -295,15 +296,7 @@ public class LoginService {
|
|
|
* @author: gck
|
|
|
*/
|
|
|
public boolean logout(PersonIdDTO dto) {
|
|
|
- String token = LoginUtils.getToken();
|
|
|
- String usedToken = token.substring(token.indexOf("=") + 1);
|
|
|
- Object obj = redisService.get(usedToken);
|
|
|
- if (ToolUtil.isNotEmpty(obj)) {
|
|
|
-// Object object = redisService.get(AppCacheKeyUtil.getTokenUserInfo(token));
|
|
|
-// LoginVO loginVO = JSONObject.parseObject(object.toString(), LoginVO.class);
|
|
|
-// redisService.delete(AppCacheKeyUtil.getUserIdToken(loginVO.getId()));
|
|
|
- redisService.delete(usedToken);
|
|
|
- }
|
|
|
+ redisService.delete(LoginUtils.getToken());
|
|
|
return true;
|
|
|
}
|
|
|
|