wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3045' into dev

Browse Source
This commit is contained in:
yanglin 2024-10-21 20:00:36 +08:00
commit 442c06ec48
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3ExtPopulator.java
View File

@ -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<WorkerBankCardRes> bankCards = personId2BankCard.get(workerGroup.getWorkerIdentityId());
workerInfo.setCardValid(CollectionUtils.isNotEmpty(bankCards)

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java
View File

@ -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);

6
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PersonInfo.java
View File

@ -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);

5
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/PhoneInfo.java
View File

@ -14,12 +14,15 @@ public class PhoneInfo {
/**
* 手机号, 未加密
*/
@SDCellPhoneField
private String mobilePhone;
/**
* 加密手机号
*/
@SDCellPhoneField
private String mobilePhoneCiphertext;
public void resetCiphertextFields() {
this.mobilePhoneCiphertext = mobilePhone;
}
}

9
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/WorkerInfo.java
View File

@ -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);