fix: 用户邮箱信息增加脱敏处理

continew-org · Oct 25, 2023 · 5bb35a1 · 5bb35a1
1 parent f5e8b09
commit 5bb35a1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 25 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
@@ -134,6 +134,10 @@ public class UserInfoVO implements Serializable {
  @Schema(description = "角色编码集合", example = "[\"test\"]")
  private Set<String> 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
@@ -96,15 +96,16 @@ public class UserVO extends BaseVO {
  @Schema(description = "描述", example = "张三描述信息")
  private String description;
 
- @Override
- public Boolean getDisabled() {
- return this.getIsSystem() || Objects.equals(this.getId(), LoginHelper.getUserId());
+ public String getEmail() {
+ return DesensitizedUtil.email(email);
  }
 
  public String getPhone() {
- if (null == phone) {
- return null;
- }
  return DesensitizedUtil.mobilePhone(phone);
  }
+
+ @Override
+ public Boolean getDisabled() {
+ return this.getIsSystem() || Objects.equals(this.getId(), LoginHelper.getUserId());
+ }
 }
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
@@ -77,7 +77,6 @@
 
 <script lang="ts" setup>
  import { getCurrentInstance, ref } from 'vue';
- import { useI18n } from 'vue-i18n';
  import {
  UserSocialBindRecord,
  listSocial,
@@ -86,7 +85,6 @@
  import { socialAuth } from '@/api/auth';
 
  const { proxy } = getCurrentInstance() as any;
- const { t } = useI18n();
  const socialBinds = ref<UserSocialBindRecord[]>([]);
  const giteeSocial = ref<UserSocialBindRecord>();
  const githubSocial = ref<UserSocialBindRecord>();

diff --git a/continew-admin-ui/src/views/system/user/center/components/security-settings/update-email.vue b/continew-admin-ui/src/views/system/user/center/components/security-settings/update-email.vue
@@ -148,19 +148,6 @@
  'userCenter.securitySettings.updateEmail.form.error.match.newEmail'
  ),
  },
- {
- validator: (value, callback) => {
- if (value === userStore.email) {
- callback(
- t(
- 'userCenter.securitySettings.updateEmail.form.error.validator.newEmail'
- )
- );
- } else {
- callback();
- }
- },
- },
  ],
  captcha: [
  {

diff --git a/continew-admin-ui/src/views/system/user/center/locale/en-US.ts b/continew-admin-ui/src/views/system/user/center/locale/en-US.ts
@@ -102,8 +102,6 @@ export default {
  'Please enter new email',
  'userCenter.securitySettings.updateEmail.form.error.match.newEmail':
  'Please enter the correct email',
- 'userCenter.securitySettings.updateEmail.form.error.validator.newEmail':
- 'New email cannot be the same as the old email',
  'userCenter.securitySettings.updateEmail.form.error.required.captcha':
  'Please enter email captcha',
  'userCenter.securitySettings.updateEmail.form.error.required.currentPassword':

diff --git a/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts b/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts
@@ -97,8 +97,6 @@ export default {
  '请输入新邮箱',
  'userCenter.securitySettings.updateEmail.form.error.match.newEmail':
  '请输入正确的邮箱',
- 'userCenter.securitySettings.updateEmail.form.error.validator.newEmail':
- '新邮箱不能与当前邮箱相同',
  'userCenter.securitySettings.updateEmail.form.error.required.captcha':
  '请输入邮箱验证码',
  'userCenter.securitySettings.updateEmail.form.error.required.currentPassword':