From e215fbb59c97994027ef2b1e6a849e3556c40d93 Mon Sep 17 00:00:00 2001 From: xxx Date: Mon, 22 Jan 2024 10:29:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/BPermissionConstant.java | 1 - .../java/xyz/playedu/common/domain/User.java | 8 ------- .../system/checks/AdminPermissionCheck.java | 9 -------- .../playedu/system/checks/UpgradeCheck.java | 23 +++++++++++++++---- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java b/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java index dd0552b..cfa9b94 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java +++ b/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java @@ -56,6 +56,5 @@ public class BPermissionConstant { public static final String DATA_USER_NAME = "data-user-name"; public static final String DATA_USER_EMAIL = "data-user-email"; - public static final String DATA_USER_ID_CARD = "data-user-id-card"; public static final String DATA_ADMIN_EMAIL = "data-admin-email"; } diff --git a/playedu-common/src/main/java/xyz/playedu/common/domain/User.java b/playedu-common/src/main/java/xyz/playedu/common/domain/User.java index 008e70f..9f075f9 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/domain/User.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/User.java @@ -121,14 +121,6 @@ public class User implements Serializable { getEmail()); } - @JsonGetter("id_card") - public String transformIdCard() { - return BackendBus.valueHidden( - BPermissionConstant.DATA_USER_ID_CARD, - BackendConstant.PRIVACY_FIELD_TYPE_ID_CARD, - getIdCard()); - } - @Override public boolean equals(Object that) { if (this == that) { diff --git a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java index c1ae31f..49673e0 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java +++ b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java @@ -275,15 +275,6 @@ public class AdminPermissionCheck implements CommandLineRunner { setSlug(BPermissionConstant.DATA_USER_NAME); } }, - new AdminPermission() { - { - setSort(20); - setName("身份证号"); - setSlug( - BPermissionConstant - .DATA_USER_ID_CARD); - } - }, }); } }); diff --git a/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java index c4081fb..2d305f8 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java +++ b/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java @@ -36,11 +36,12 @@ public class UpgradeCheck implements CommandLineRunner { @Override public void run(String... args) throws Exception { - upgrade_v1_beta7(); - upgrade_v1_4(); + upgrade_1_beta7(); + upgrade_1_4(); + upgrade_1_6(); } - private void upgrade_v1_4() { + private void upgrade_1_4() { appConfigService.remove( appConfigService .query() @@ -54,7 +55,7 @@ public class UpgradeCheck implements CommandLineRunner { })); } - private void upgrade_v1_beta7() { + private void upgrade_1_beta7() { appConfigService.update( new AppConfig() { { @@ -75,4 +76,18 @@ public class UpgradeCheck implements CommandLineRunner { } })); } + + private void upgrade_1_6() { + permissionService.remove( + permissionService + .query() + .getWrapper() + .in( + "slug", + new ArrayList<>() { + { + add("data-user-id-card"); + } + })); + } }