From 5bb35a13d6b5801317a295eacc67d88b2c3e1682 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 25 Oct 2023 23:36:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E8=84=B1=E6=95=8F=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/auth/model/vo/UserInfoVO.java | 4 ++++ .../charles7c/cnadmin/system/model/vo/UserVO.java | 15 ++++++++------- .../components/security-settings/bind-social.vue | 2 -- .../components/security-settings/update-email.vue | 13 ------------- .../src/views/system/user/center/locale/en-US.ts | 2 -- .../src/views/system/user/center/locale/zh-CN.ts | 2 -- 6 files changed, 12 insertions(+), 26 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java index f1a25ec7..948b115d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java @@ -134,6 +134,10 @@ public class UserInfoVO implements Serializable { @Schema(description = "角色编码集合", example = "[\"test\"]") private Set roles; + public String getEmail() { + return DesensitizedUtil.email(email); + } + public String getPhone() { return DesensitizedUtil.mobilePhone(phone); } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java index b8e35762..3a6c4593 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java @@ -96,15 +96,16 @@ public class UserVO extends BaseVO { @Schema(description = "描述", example = "张三描述信息") private String description; + public String getEmail() { + return DesensitizedUtil.email(email); + } + + public String getPhone() { + return DesensitizedUtil.mobilePhone(phone); + } + @Override public Boolean getDisabled() { return this.getIsSystem() || Objects.equals(this.getId(), LoginHelper.getUserId()); } - - public String getPhone() { - if (null == phone) { - return null; - } - return DesensitizedUtil.mobilePhone(phone); - } } diff --git a/continew-admin-ui/src/views/system/user/center/components/security-settings/bind-social.vue b/continew-admin-ui/src/views/system/user/center/components/security-settings/bind-social.vue index b96932d7..4feb1324 100644 --- a/continew-admin-ui/src/views/system/user/center/components/security-settings/bind-social.vue +++ b/continew-admin-ui/src/views/system/user/center/components/security-settings/bind-social.vue @@ -77,7 +77,6 @@