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

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

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

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

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

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

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

ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/SensitiveServiceImpl.java

@@ -1,7 +1,7 @@
 package org.dromara.demo.service.impl;
 
 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.sensitive.core.SensitiveService;
 import org.dromara.common.tenant.helper.TenantHelper;
@@ -21,19 +21,19 @@ public class SensitiveServiceImpl implements SensitiveService {
      * 是否脱敏
      */
     @Override
-    public boolean isSensitive(String roleKey, String perms) {
+    public boolean isSensitive(String[] roleKey, String[] perms) {
         if (!LoginHelper.isLogin()) {
             return true;
         }
-        boolean roleExist = StringUtils.isNotBlank(roleKey);
-        boolean permsExist = StringUtils.isNotBlank(perms);
+        boolean roleExist = ArrayUtil.isNotEmpty(roleKey);
+        boolean permsExist = ArrayUtil.isNotEmpty(perms);
         if (roleExist && permsExist) {
-            if (StpUtil.hasRole(roleKey) && StpUtil.hasPermission(perms)) {
+            if (StpUtil.hasRoleOr(roleKey) && StpUtil.hasPermissionOr(perms)) {
                 return false;
             }
-        } else if (roleExist && StpUtil.hasRole(roleKey)) {
+        } else if (roleExist && StpUtil.hasRoleOr(roleKey)) {
             return false;
-        } else if (permsExist && StpUtil.hasPermission(perms)) {
+        } else if (permsExist && StpUtil.hasPermissionOr(perms)) {
             return false;
         }
 

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

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