From 6b3899394f90c68b20241becbfc9793f745c5fb7 Mon Sep 17 00:00:00 2001 From: lengleng Date: Sat, 20 Feb 2021 18:12:33 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=89=B9=E6=80=A7=20|=20closed=20#2400=20=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E6=94=AF=E4=BB=98=E6=A8=A1=E5=9D=97=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E6=95=8F=E6=84=9F=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=84=B1=E6=95=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/core/sensitive/SensitiveTypeEnum.java | 2 +- .../main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java | 7 +++++-- .../java/com/pig4cloud/pigx/pay/entity/PayChannel.java | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/sensitive/SensitiveTypeEnum.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/sensitive/SensitiveTypeEnum.java index 9da0bba13..5a8820489 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/sensitive/SensitiveTypeEnum.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/sensitive/SensitiveTypeEnum.java @@ -62,7 +62,7 @@ public enum SensitiveTypeEnum { */ PASSWORD, /** - * 密钥, 永远是 ******, 与长度无关 + * 密钥, 【密钥】密钥除了最后三位其他都是***, 与长度无关 */ KEY diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java index 6d1f750f7..4463bebd4 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java @@ -16,14 +16,16 @@ */ package com.pig4cloud.pigx.mp.entity; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.pig4cloud.pigx.common.core.sensitive.Sensitive; +import com.pig4cloud.pigx.common.core.sensitive.SensitiveTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.LocalDateTime; - /** * 公众号账户 * @@ -60,6 +62,7 @@ public class WxAccount extends Model { /** * 公众号密钥 */ + @Sensitive(type = SensitiveTypeEnum.KEY) private String appsecret; /** diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java index e01a3820d..90fded5bc 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.pig4cloud.pigx.common.core.sensitive.Sensitive; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -50,6 +51,7 @@ public class PayChannel extends Model { /** * 应用ID */ + @Sensitive(prefixNoMaskLen = 4,suffixNoMaskLen = 4) private String appId; /** @@ -63,8 +65,9 @@ public class PayChannel extends Model { private String channelName; /** - * 渠道商户ID + * 渠道商户ID | 12****123 */ + @Sensitive(prefixNoMaskLen = 2,suffixNoMaskLen = 3) private String channelMchId; /**