admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 支持脱敏传多角色多权限标识

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-11-12 10:37:51 +08:00
parent 63d22b9b33
commit 5c66f3b90c
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java
View File

@ -22,7 +22,13 @@ import java.lang.annotation.Target;
public @interface Sensitive { public @interface Sensitive {
SensitiveStrategy strategy(); SensitiveStrategy strategy();
String roleKey() default ""; /**
* 角色标识符 多个角色满足一个即可
*/
String[] roleKey();
String perms() default ""; /**
* 权限标识符 多个权限满足一个即可
*/
String[] perms();
} }

2
ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java
View File

@ -13,6 +13,6 @@ public interface SensitiveService {
/** /**
* 是否脱敏 * 是否脱敏
*/ */
boolean isSensitive(String roleKey, String perms); boolean isSensitive(String[] roleKey, String[] perms);
} }

4
ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java
View File

@ -26,8 +26,8 @@ import java.util.Objects;
public class SensitiveHandler extends JsonSerializer<String> implements ContextualSerializer { public class SensitiveHandler extends JsonSerializer<String> implements ContextualSerializer {
private SensitiveStrategy strategy; private SensitiveStrategy strategy;
private String roleKey; private String[] roleKey;
private String perms; private String[] perms;
@Override @Override
public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException { public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {

14
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.service.impl; package org.dromara.system.service.impl;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import org.dromara.common.core.utils.StringUtils; import cn.hutool.core.util.ArrayUtil;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.sensitive.core.SensitiveService; import org.dromara.common.sensitive.core.SensitiveService;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
@ -22,19 +22,19 @@ public class SysSensitiveServiceImpl implements SensitiveService {
* 是否脱敏 * 是否脱敏
*/ */
@Override @Override
public boolean isSensitive(String roleKey, String perms) { public boolean isSensitive(String[] roleKey, String[] perms) {
if (!LoginHelper.isLogin()) { if (!LoginHelper.isLogin()) {
return true; return true;
} }
boolean roleExist = StringUtils.isNotBlank(roleKey); boolean roleExist = ArrayUtil.isNotEmpty(roleKey);
boolean permsExist = StringUtils.isNotBlank(perms); boolean permsExist = ArrayUtil.isNotEmpty(perms);
if (roleExist && permsExist) { if (roleExist && permsExist) {
if (StpUtil.hasRole(roleKey) && StpUtil.hasPermission(perms)) { if (StpUtil.hasRoleOr(roleKey) && StpUtil.hasPermissionOr(perms)) {
return false; return false;
} }
} else if (roleExist && StpUtil.hasRole(roleKey)) { } else if (roleExist && StpUtil.hasRoleOr(roleKey)) {
return false; return false;
} else if (permsExist && StpUtil.hasPermission(perms)) { } else if (permsExist && StpUtil.hasPermissionOr(perms)) {
return false; return false;
} }