From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001 From: KonBAI <1527468660@qq.com> Date: 星期六, 02 四月 2022 13:02:56 +0800 Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。 --- ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java index 5f9bf72..f667173 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java @@ -1,30 +1,47 @@ package com.ruoyi.common.enums; import cn.hutool.core.util.DesensitizedUtil; +import lombok.AllArgsConstructor; + import java.util.function.Function; /** * 鑴辨晱绛栫暐 - * @author Yjoioooo + * + * @author Yjoioooo + * @version 3.6.0 */ +@AllArgsConstructor public enum SensitiveStrategy { - /** 韬唤璇佽劚鏁� */ + /** + * 韬唤璇佽劚鏁� + */ ID_CARD(s -> DesensitizedUtil.idCardNum(s, 3, 4)), - /** 鎵嬫満鍙疯劚鏁� */ + /** + * 鎵嬫満鍙疯劚鏁� + */ PHONE(DesensitizedUtil::mobilePhone), - /** 鍦板潃鑴辨晱 */ - ADDRESS(s -> DesensitizedUtil.address(s, 8)); + /** + * 鍦板潃鑴辨晱 + */ + ADDRESS(s -> DesensitizedUtil.address(s, 8)), + + /** + * 閭鑴辨晱 + */ + EMAIL(DesensitizedUtil::email), + + /** + * 閾惰鍗� + */ + BANK_CARD(DesensitizedUtil::bankCard); //鍙嚜琛屾坊鍔犲叾浠栬劚鏁忕瓥鐣� private final Function<String, String> desensitizer; - - SensitiveStrategy(Function<String, String> desensitizer) { - this.desensitizer = desensitizer; - } public Function<String, String> desensitizer() { return desensitizer; -- Gitblit v1.9.3