From 306ec441c64eaaf30a087f3db16a32b4d5e15672 Mon Sep 17 00:00:00 2001 From: yanglin Date: Mon, 21 Oct 2024 20:00:31 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3046:=20=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E4=B8=8A=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/service/impl/v3/ModelV3ExtPopulator.java | 7 +++---- .../center/message/service/impl/v3/ModelV3Parser.java | 2 +- .../service/pending/response/v3/model/PersonInfo.java | 6 +++++- .../service/pending/response/v3/model/PhoneInfo.java | 5 ++++- .../service/pending/response/v3/model/WorkerInfo.java | 9 +++++++-- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3ExtPopulator.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3ExtPopulator.java index 29ad7bcd..f85a8a50 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3ExtPopulator.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3ExtPopulator.java @@ -13,7 +13,6 @@ import cn.axzo.msg.center.service.pending.response.v3.model.ParsedKV; import cn.axzo.msg.center.service.pending.response.v3.model.ParsedModelV3; import cn.axzo.msg.center.service.pending.response.v3.model.PersonInfo; import cn.axzo.msg.center.service.pending.response.v3.model.WorkerInfo; -import cn.axzo.trade.datasecurity.core.util.DataSecurityHelper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -76,7 +75,7 @@ public class ModelV3ExtPopulator { personInfo.setRealName(profile.getRealName()); personInfo.setAvatar(profile.getAvatarUrl()); personInfo.setMobilePhone(profile.getPhone()); - personInfo.setMobilePhoneCiphertext(DataSecurityHelper.encrypt(profile.getPhone())); + personInfo.setMobilePhoneCiphertext(profile.getPhone()); kv.setPersonInfo(personInfo); } } @@ -105,11 +104,11 @@ public class ModelV3ExtPopulator { workerInfo.setName(person.getRealName()); workerInfo.setIcon(person.getAvatarUrl()); workerInfo.setPhone(person.getPhone()); - workerInfo.setPhoneCiphertext(DataSecurityHelper.encrypt(person.getPhone())); + workerInfo.setPhoneCiphertext(person.getPhone()); workerInfo.setBirthday(person.getBirthday()); workerInfo.setNationality(person.getNationality()); workerInfo.setIdNumber(person.getIdNumber()); - workerInfo.setIdNumberCiphertext(DataSecurityHelper.encrypt(person.getIdNumber())); + workerInfo.setIdNumberCiphertext(person.getIdNumber()); workerInfo.setIdentityValid(isWorkerIdentityValid(worker)); List bankCards = personId2BankCard.get(workerGroup.getWorkerIdentityId()); workerInfo.setCardValid(CollectionUtils.isNotEmpty(bankCards) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java index 87c74800..c7e4289e 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java @@ -114,7 +114,7 @@ public class ModelV3Parser { if (phone.contains("*")) phone = DataSecurityHelper.decrypt(phone); phoneInfo.setMobilePhone(phone); - phoneInfo.setMobilePhoneCiphertext(DataSecurityHelper.encrypt(phone)); + phoneInfo.setMobilePhoneCiphertext(phone); return phoneInfo; } catch (Exception e) { log.warn("error parse phone info. kv={}", kv); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PersonInfo.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PersonInfo.java index 201bf7cc..53a2da38 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PersonInfo.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PersonInfo.java @@ -24,14 +24,18 @@ public class PersonInfo { /** * 手机号, 未加密 */ - @SDCellPhoneField private String mobilePhone; /** * 加密手机号 */ + @SDCellPhoneField private String mobilePhoneCiphertext; + public void resetCiphertextFields() { + this.mobilePhoneCiphertext = mobilePhone; + } + @Override public String toString() { return JSON.toJSONString(this); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PhoneInfo.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PhoneInfo.java index 712e8662..fe821130 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PhoneInfo.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PhoneInfo.java @@ -14,12 +14,15 @@ public class PhoneInfo { /** * 手机号, 未加密 */ - @SDCellPhoneField private String mobilePhone; /** * 加密手机号 */ + @SDCellPhoneField private String mobilePhoneCiphertext; + public void resetCiphertextFields() { + this.mobilePhoneCiphertext = mobilePhone; + } } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/WorkerInfo.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/WorkerInfo.java index 723ace81..fcb98df7 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/WorkerInfo.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/WorkerInfo.java @@ -26,11 +26,11 @@ public class WorkerInfo { /** * 手机号码 */ - @SDCellPhoneField private String phone; /** * 手机号码密文 */ + @SDCellPhoneField private String phoneCiphertext; /** * 生日 @@ -43,11 +43,11 @@ public class WorkerInfo { /** * 身份证号 */ - @SDIdCardField private String idNumber; /** * 身份证号密文 */ + @SDIdCardField private String idNumberCiphertext; /** * 身份信息校验 @@ -62,6 +62,11 @@ public class WorkerInfo { */ private String professionNames; + public void resetCiphertextFields() { + phoneCiphertext = phone; + idNumberCiphertext = idNumber; + } + @Override public String toString() { return JSON.toJSONString(this);