lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-08-25 01:14:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

将 getLoginId() 的顺序提前，保留“校验权限前先校验是否登录”的旧共识

Browse Source
This commit is contained in:
click33 2023-04-30 01:28:46 +08:00
parent 2c27611473
commit a4320f3e7e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1382,13 +1382,15 @@ public class StpLogic {
* @param roleArray 角色标识数组 * @param roleArray 角色标识数组
*/ */
public void checkRoleAnd(String... roleArray){ public void checkRoleAnd(String... roleArray){
// 先获取当前是哪个账号id
Object loginId = getLoginId();
// 如果没有指定权限，那么直接跳过 // 如果没有指定权限，那么直接跳过
if(roleArray == null || roleArray.length == 0) { if(roleArray == null || roleArray.length == 0) {
return; return;
} }
// 开始校验 // 开始校验
Object loginId = getLoginId();
List<String> roleList = getRoleList(loginId); List<String> roleList = getRoleList(loginId);
for (String role : roleArray) { for (String role : roleArray) {
if(!hasElement(roleList, role)) { if(!hasElement(roleList, role)) {
@ -1402,13 +1404,15 @@ public class StpLogic {
* @param roleArray 角色标识数组 * @param roleArray 角色标识数组
*/ */
public void checkRoleOr(String... roleArray){ public void checkRoleOr(String... roleArray){
// 先获取当前是哪个账号id
Object loginId = getLoginId();
// 如果没有指定权限，那么直接跳过 // 如果没有指定权限，那么直接跳过
if(roleArray == null || roleArray.length == 0) { if(roleArray == null || roleArray.length == 0) {
return; return;
} }
// 开始校验 // 开始校验
Object loginId = getLoginId();
List<String> roleList = getRoleList(loginId); List<String> roleList = getRoleList(loginId);
for (String role : roleArray) { for (String role : roleArray) {
if(hasElement(roleList, role)) { if(hasElement(roleList, role)) {
@ -1507,13 +1511,15 @@ public class StpLogic {
* @param permissionArray 权限码数组 * @param permissionArray 权限码数组
*/ */
public void checkPermissionAnd(String... permissionArray){ public void checkPermissionAnd(String... permissionArray){
// 先获取当前是哪个账号id
Object loginId = getLoginId();
// 如果没有指定权限，那么直接跳过 // 如果没有指定权限，那么直接跳过
if(permissionArray == null || permissionArray.length == 0) { if(permissionArray == null || permissionArray.length == 0) {
return; return;
} }
// 开始校验 // 开始校验
Object loginId = getLoginId();
List<String> permissionList = getPermissionList(loginId); List<String> permissionList = getPermissionList(loginId);
for (String permission : permissionArray) { for (String permission : permissionArray) {
if(!hasElement(permissionList, permission)) { if(!hasElement(permissionList, permission)) {
@ -1527,13 +1533,15 @@ public class StpLogic {
* @param permissionArray 权限码数组 * @param permissionArray 权限码数组
*/ */
public void checkPermissionOr(String... permissionArray){ public void checkPermissionOr(String... permissionArray){
// 先获取当前是哪个账号id
Object loginId = getLoginId();
// 如果没有指定权限，那么直接跳过 // 如果没有指定权限，那么直接跳过
if(permissionArray == null || permissionArray.length == 0) { if(permissionArray == null || permissionArray.length == 0) {
return; return;
} }
// 开始校验 // 开始校验
Object loginId = getLoginId();
List<String> permissionList = getPermissionList(loginId); List<String> permissionList = getPermissionList(loginId);
for (String permission : permissionArray) { for (String permission : permissionArray) {
if(hasElement(permissionList, permission)) { if(hasElement(permissionList, permission)) {