lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-01 18:35:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化命名

Browse Source
This commit is contained in:
zhou-hao
2018-05-15 22:28:00 +08:00
parent 127d7c14b0
commit db82a0eb7f
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/DefaultUserTokenManager.java
View File

@@ -135,7 +135,7 @@ public class DefaultUserTokenManager implements UserTokenManager {
return false;
}
for (UserToken userToken : getByUserId(userId)) {
if (userToken.isEffective()) {
if (userToken.isNormal()) {
return true;
}
}
@@ -247,7 +247,7 @@ public class DefaultUserTokenManager implements UserTokenManager {
.filter(userToken -> type.equals(userToken.getType()))
.map(SimpleUserToken.class::cast)
.peek(this::checkTimeout)
.anyMatch(UserToken::isEffective);
.anyMatch(UserToken::isNormal);
if (hasAnotherToken) {
throw new AccessDenyException("该用户已在其他地方登陆");
}
@@ -261,7 +261,7 @@ public class DefaultUserTokenManager implements UserTokenManager {
}
}
}
detail.setState(TokenState.effective);
detail.setState(TokenState.normal);
tokenStorage.put(token, detail);
getUserToken(userId).add(token);

8
hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/TokenState.java
View File

@@ -13,8 +13,14 @@ public enum TokenState implements EnumDict<String> {
/**
* 正常，有效
*/
@Deprecated
effective("effective", "正常"),
/**
* 正常，有效
*/
normal("normal","正常"),
/**
* 已被禁止访问
*/
@@ -27,6 +33,7 @@ public enum TokenState implements EnumDict<String> {
/**
* 已被踢下线
* @see AllopatricLoginMode#offlineOther
*/
offline("offline", "用户已在其他地方登录"),
@@ -35,7 +42,6 @@ public enum TokenState implements EnumDict<String> {
*/
lock("lock", "登录状态已被锁定");
private String value;
private String text;

23
hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/UserToken.java
View File

@@ -54,8 +54,13 @@ public interface UserToken extends Serializable, Comparable<UserToken> {
/**
* @return 是否正常
*/
@Deprecated
default boolean isEffective() {
return getState() == TokenState.effective;
return isNormal();
}
default boolean isNormal() {
return getState() == TokenState.normal;
}
/**
@@ -72,8 +77,17 @@ public interface UserToken extends Serializable, Comparable<UserToken> {
return getState() == TokenState.offline;
}
default boolean isLock() {
return getState() == TokenState.lock;
}
default boolean isDeny() {
return getState() == TokenState.deny;
}
default boolean validate() {
if (!isEffective()) {
if (!isNormal()) {
throw new UnAuthorizedException(getState());
}
return true;
@@ -81,6 +95,9 @@ public interface UserToken extends Serializable, Comparable<UserToken> {
@Override
default int compareTo(UserToken target) {
return Long.valueOf(getSignInTime()).compareTo(target.getSignInTime());
if (target == null) {
return 0;
}
return Long.compare(getSignInTime(), target.getSignInTime());
}
}