v3.0.0 init

ruoyi-common/ruoyi-common-sensitive/pom.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -21,4 +21,14 @@ import java.lang.annotation.Target;
 @JsonSerialize(using = SensitiveHandler.class)
 public @interface Sensitive {
     SensitiveStrategy strategy();
+
+    /**
+     * 角色标识符 多个角色满足一个即可
+     */
+    String[] roleKey() default {};
+
+    /**
+     * 权限标识符 多个权限满足一个即可
+     */
+    String[] perms() default {};
 }

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

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

ruoyi-common/ruoyi-common-sensitive/src/main/java/org/ruoyi/common/sensitive/core/SensitiveStrategy.java

@@ -1,5 +1,6 @@
 package org.ruoyi.common.sensitive.core;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.DesensitizedUtil;
 import lombok.AllArgsConstructor;
 
@@ -19,11 +20,6 @@ public enum SensitiveStrategy {
      */
     ID_CARD(s -> DesensitizedUtil.idCardNum(s, 3, 4)),
 
-    /**
-     * 密钥脱敏
-     */
-    SKY(s -> DesensitizedUtil.idCardNum(s, 0, 1)),
-
     /**
      * 手机号脱敏
      */
@@ -42,7 +38,57 @@ public enum SensitiveStrategy {
     /**
      * 银行卡
      */
-    BANK_CARD(DesensitizedUtil::bankCard);
+    BANK_CARD(DesensitizedUtil::bankCard),
+
+    /**
+     * 中文名
+     */
+    CHINESE_NAME(DesensitizedUtil::chineseName),
+
+    /**
+     * 固定电话
+     */
+    FIXED_PHONE(DesensitizedUtil::fixedPhone),
+
+    /**
+     * 用户ID
+     */
+    USER_ID(s -> Convert.toStr(DesensitizedUtil.userId())),
+
+    /**
+     * 密码
+     */
+    PASSWORD(DesensitizedUtil::password),
+
+    /**
+     * ipv4
+     */
+    IPV4(DesensitizedUtil::ipv4),
+
+    /**
+     * ipv6
+     */
+    IPV6(DesensitizedUtil::ipv6),
+
+    /**
+     * 中国大陆车牌，包含普通车辆、新能源车辆
+     */
+    CAR_LICENSE(DesensitizedUtil::carLicense),
+
+    /**
+     * 只显示第一个字符
+     */
+    FIRST_MASK(DesensitizedUtil::firstMask),
+
+    /**
+     * 清空为""
+     */
+    CLEAR(s -> DesensitizedUtil.clear()),
+
+    /**
+     * 清空为null
+     */
+    CLEAR_TO_NULL(s -> DesensitizedUtil.clearToNull());
 
     //可自行添加其他脱敏策略
 

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

@@ -7,11 +7,11 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import lombok.extern.slf4j.Slf4j;
 import org.ruoyi.common.core.utils.SpringUtils;
 import org.ruoyi.common.sensitive.annotation.Sensitive;
 import org.ruoyi.common.sensitive.core.SensitiveService;
 import org.ruoyi.common.sensitive.core.SensitiveStrategy;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 
 import java.io.IOException;
@@ -26,12 +26,14 @@ import java.util.Objects;
 public class SensitiveHandler extends JsonSerializer<String> implements ContextualSerializer {
 
     private SensitiveStrategy strategy;
+    private String[] roleKey;
+    private String[] perms;
 
     @Override
     public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
         try {
             SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
-            if (ObjectUtil.isNotNull(sensitiveService) && sensitiveService.isSensitive()) {
+            if (ObjectUtil.isNotNull(sensitiveService) && sensitiveService.isSensitive(roleKey, perms)) {
                 gen.writeString(strategy.desensitizer().apply(value));
             } else {
                 gen.writeString(value);
@@ -47,6 +49,8 @@ public class SensitiveHandler extends JsonSerializer<String> implements Contextu
         Sensitive annotation = property.getAnnotation(Sensitive.class);
         if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass())) {
             this.strategy = annotation.strategy();
+            this.roleKey = annotation.roleKey();
+            this.perms = annotation.perms();
             return this;
         }
         return prov.findValueSerializer(property.getType(), property);