|
@@ -512,27 +512,12 @@ public class AuthServiceImpl implements AuthService {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * 构建key
|
|
|
|
- *
|
|
|
|
- * @author WANGWEI
|
|
|
|
- * @param user
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- private String buildUserKey(User user) {
|
|
|
|
- Long rootOrgId = user.getRootOrgId();
|
|
|
|
- UserType userType = user.getUserType();
|
|
|
|
- String key = StringUtil.join("U_", userType.getCode(), "_", rootOrgId, "_",
|
|
|
|
- user.getUserId());
|
|
|
|
- return key;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
@Override
|
|
@Override
|
|
public void logout(User user) {
|
|
public void logout(User user) {
|
|
if (StringUtils.isNotBlank(user.getKey())) {
|
|
if (StringUtils.isNotBlank(user.getKey())) {
|
|
redisClient.delete(user.getKey());
|
|
redisClient.delete(user.getKey());
|
|
} else {
|
|
} else {
|
|
- String key = buildUserKey(user);
|
|
|
|
|
|
+ String key = user.buildKey();
|
|
redisClient.delete(key);
|
|
redisClient.delete(key);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -613,7 +598,7 @@ public class AuthServiceImpl implements AuthService {
|
|
private void setSession(User user) {
|
|
private void setSession(User user) {
|
|
user.setCreationTime(new Date());
|
|
user.setCreationTime(new Date());
|
|
user.setToken(UUID.randomUUID());
|
|
user.setToken(UUID.randomUUID());
|
|
- String key = buildUserKey(user);
|
|
|
|
|
|
+ String key = user.buildKey();
|
|
user.setKey(key);
|
|
user.setKey(key);
|
|
|
|
|
|
int sessionTimeout = PropertyHolder.getInt(PropKeys.SESSION_TIMEOUT, 3600);
|
|
int sessionTimeout = PropertyHolder.getInt(PropKeys.SESSION_TIMEOUT, 3600);
|