lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-05-06 21:57:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化权限校验算法

Browse Source
This commit is contained in:
click33 2024-04-11 02:27:33 +08:00
parent 07e36f52c5
commit 801e29632f
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
View File

@ -1756,7 +1756,11 @@ public class StpLogic {
* @return / * @return /
*/ */
public boolean hasRole(String role) { public boolean hasRole(String role) {
return hasElement(getRoleList(), role); try {
return hasRole(getLoginId(), role);
} catch (NotLoginException e) {
return false;
}
} }
/** /**
@ -1780,7 +1784,7 @@ public class StpLogic {
try { try {
checkRoleAnd(roleArray); checkRoleAnd(roleArray);
return true; return true;
} catch (NotRoleException e) { } catch (NotLoginException | NotRoleException e) {
return false; return false;
} }
} }
@ -1795,7 +1799,7 @@ public class StpLogic {
try { try {
checkRoleOr(roleArray); checkRoleOr(roleArray);
return true; return true;
} catch (NotRoleException e) { } catch (NotLoginException | NotRoleException e) {
return false; return false;
} }
} }
@ -1806,7 +1810,7 @@ public class StpLogic {
* @param role 角色标识 * @param role 角色标识
*/ */
public void checkRole(String role) { public void checkRole(String role) {
if( ! hasRole(role)) { if( ! hasRole(getLoginId(), role)) {
throw new NotRoleException(role, this.loginType).setCode(SaErrorCode.CODE_11041); throw new NotRoleException(role, this.loginType).setCode(SaErrorCode.CODE_11041);
} }
} }
@ -1890,7 +1894,11 @@ public class StpLogic {
* @return 是否含有指定权限 * @return 是否含有指定权限
*/ */
public boolean hasPermission(String permission) { public boolean hasPermission(String permission) {
return hasElement(getPermissionList(), permission); try {
return hasPermission(getLoginId(), permission);
} catch (NotLoginException e) {
return false;
}
} }
/** /**
@ -1914,7 +1922,7 @@ public class StpLogic {
try { try {
checkPermissionAnd(permissionArray); checkPermissionAnd(permissionArray);
return true; return true;
} catch (NotPermissionException e) { } catch (NotLoginException | NotPermissionException e) {
return false; return false;
} }
} }
@ -1929,7 +1937,7 @@ public class StpLogic {
try { try {
checkPermissionOr(permissionArray); checkPermissionOr(permissionArray);
return true; return true;
} catch (NotPermissionException e) { } catch (NotLoginException | NotPermissionException e) {
return false; return false;
} }
} }
@ -1940,7 +1948,7 @@ public class StpLogic {
* @param permission 权限码 * @param permission 权限码
*/ */
public void checkPermission(String permission) { public void checkPermission(String permission) {
if( ! hasPermission(permission)) { if( ! hasPermission(getLoginId(), permission)) {
throw new NotPermissionException(permission, this.loginType).setCode(SaErrorCode.CODE_11051); throw new NotPermissionException(permission, this.loginType).setCode(SaErrorCode.CODE_11051);
} }
} }