From c67cc725d48418c548be5cff6ccf10e435988a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 31 Jan 2023 21:02:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E6=9E=84=20=E6=8A=BD?= =?UTF-8?q?=E5=8F=96=E8=84=B1=E6=95=8F=E5=8A=9F=E8=83=BD=20ruoyi-common-se?= =?UTF-8?q?nsitive=20=E6=88=90=E4=B8=BA=E7=8B=AC=E7=AB=8B=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/pom.xml | 1 + ruoyi-common/ruoyi-common-bom/pom.xml | 6 +++++ ruoyi-common/ruoyi-common-sensitive/pom.xml | 26 +++++++++++++++++++ .../sensitive}/annotation/Sensitive.java | 8 +++--- .../sensitive/core}/SensitiveService.java | 2 +- .../sensitive/core}/SensitiveStrategy.java | 2 +- .../sensitive/handler/SensitiveHandler.java} | 10 +++---- ruoyi-modules/ruoyi-demo/pom.xml | 5 ++++ .../controller/TestSensitiveController.java | 6 ++--- ruoyi-modules/ruoyi-system/pom.xml | 5 ++++ .../java/com/ruoyi/system/domain/SysUser.java | 4 +-- .../service/impl/SysSensitiveServiceImpl.java | 2 +- 12 files changed, 60 insertions(+), 17 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-sensitive/pom.xml rename ruoyi-common/{ruoyi-common-core/src/main/java/com/ruoyi/common/core => ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive}/annotation/Sensitive.java (70%) rename ruoyi-common/{ruoyi-common-core/src/main/java/com/ruoyi/common/core/service => ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/core}/SensitiveService.java (85%) rename ruoyi-common/{ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums => ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/core}/SensitiveStrategy.java (95%) rename ruoyi-common/{ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/SensitiveJsonSerializer.java => ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/handler/SensitiveHandler.java} (85%) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 8cfd11a01..225bedc5b 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -28,6 +28,7 @@ ruoyi-common-sms ruoyi-common-web ruoyi-common-translation + ruoyi-common-sensitive ruoyi-common diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 4e518c6dd..f345eef94 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -131,6 +131,12 @@ ${revision} + + + com.ruoyi + ruoyi-common-sensitive + ${revision} + diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml new file mode 100644 index 000000000..f8504a03f --- /dev/null +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -0,0 +1,26 @@ + + + + com.ruoyi + ruoyi-common + ${revision} + ../pom.xml + + 4.0.0 + + ruoyi-common-sensitive + + + ruoyi-common-sensitive 脱敏模块 + + + + + com.ruoyi + ruoyi-common-core + + + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Sensitive.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java similarity index 70% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Sensitive.java rename to ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java index 0b2fbc193..1e448e179 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Sensitive.java +++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.annotation; +package com.ruoyi.common.sensitive.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.core.enums.SensitiveStrategy; -import com.ruoyi.common.core.jackson.SensitiveJsonSerializer; +import com.ruoyi.common.sensitive.core.SensitiveStrategy; +import com.ruoyi.common.sensitive.handler.SensitiveHandler; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -18,7 +18,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) @JacksonAnnotationsInside -@JsonSerialize(using = SensitiveJsonSerializer.class) +@JsonSerialize(using = SensitiveHandler.class) public @interface Sensitive { SensitiveStrategy strategy(); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/SensitiveService.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/core/SensitiveService.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/SensitiveService.java rename to ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/core/SensitiveService.java index 7b27bb45c..49c6ae84b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/SensitiveService.java +++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/core/SensitiveService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.ruoyi.common.sensitive.core; /** * 脱敏服务 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/SensitiveStrategy.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/core/SensitiveStrategy.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/SensitiveStrategy.java rename to ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/core/SensitiveStrategy.java index c58ea499e..57791db11 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/SensitiveStrategy.java +++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/core/SensitiveStrategy.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.enums; +package com.ruoyi.common.sensitive.core; import cn.hutool.core.util.DesensitizedUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/SensitiveJsonSerializer.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/handler/SensitiveHandler.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/SensitiveJsonSerializer.java rename to ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/handler/SensitiveHandler.java index 946c5c32c..4141d3cf8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/SensitiveJsonSerializer.java +++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/handler/SensitiveHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.jackson; +package com.ruoyi.common.sensitive.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ 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 com.ruoyi.common.core.annotation.Sensitive; -import com.ruoyi.common.core.enums.SensitiveStrategy; -import com.ruoyi.common.core.service.SensitiveService; import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.sensitive.annotation.Sensitive; +import com.ruoyi.common.sensitive.core.SensitiveService; +import com.ruoyi.common.sensitive.core.SensitiveStrategy; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; @@ -23,7 +23,7 @@ import java.util.Objects; * @author Yjoioooo */ @Slf4j -public class SensitiveJsonSerializer extends JsonSerializer implements ContextualSerializer { +public class SensitiveHandler extends JsonSerializer implements ContextualSerializer { private SensitiveStrategy strategy; diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml index 6ab4db65b..7f8eac032 100644 --- a/ruoyi-modules/ruoyi-demo/pom.xml +++ b/ruoyi-modules/ruoyi-demo/pom.xml @@ -78,6 +78,11 @@ ruoyi-common-translation + + com.ruoyi + ruoyi-common-sensitive + + diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java index 259c12bb8..f06200387 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java @@ -1,9 +1,9 @@ package com.ruoyi.demo.controller; -import com.ruoyi.common.core.annotation.Sensitive; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.enums.SensitiveStrategy; import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.sensitive.annotation.Sensitive; +import com.ruoyi.common.sensitive.core.SensitiveStrategy; import lombok.Data; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * * @author Lion Li * @version 3.6.0 - * @see com.ruoyi.common.core.service.SensitiveService + * @see com.ruoyi.common.sensitive.core.SensitiveService */ @RestController @RequestMapping("/demo/sensitive") diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index caecf782b..7f3572b61 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -80,6 +80,11 @@ com.ruoyi ruoyi-common-idempotent + + + com.ruoyi + ruoyi-common-sensitive + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java index 77c1770d6..87cd1506e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java @@ -1,11 +1,11 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.*; -import com.ruoyi.common.core.annotation.Sensitive; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.enums.SensitiveStrategy; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.xss.Xss; +import com.ruoyi.common.sensitive.annotation.Sensitive; +import com.ruoyi.common.sensitive.core.SensitiveStrategy; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java index 2f83e51e9..40123c73e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service.impl; -import com.ruoyi.common.core.service.SensitiveService; import com.ruoyi.common.satoken.utils.LoginHelper; +import com.ruoyi.common.sensitive.core.SensitiveService; import org.springframework.stereotype.Service; /**