From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index 5a9e4c0..de44524 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -176,16 +176,15 @@
String labels = followTraderInfoEntity.getLabels();
if(StrUtil.isNotEmpty(labels)) {
- String labelsName = "";
+ ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>();
String[] split = labels.split(",");
int length = split.length;
for(int i = 0;i < length;i++) {
String string = split[i];
FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string));
- String labelsNames = selectById.getLabels();
- labelsName += (labelsNames + ",");
+ arrayList.add(selectById);
}
- FollowTraderProfitInfoVo.setLabels(labelsName);
+ FollowTraderProfitInfoVo.setLabels(arrayList);
}
}
@@ -727,9 +726,9 @@
String phone = memberEntity.getPhone();
String email = memberEntity.getEmail();
if(StrUtil.isNotEmpty(phone)) {
- followTraderInfoEntity.setNickname(phone);
+ followTraderInfoEntity.setNickname(phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
}else {
- followTraderInfoEntity.setNickname(email);
+ followTraderInfoEntity.setNickname(email.replaceAll("(\\w?)(\\w+)(\\w)(@\\w+\\.[a-z]+(\\.[a-z]+)?)","$1****$3$4"));
}
followTraderInfoEntity.setDeclaration(FollowTraderInfoEntity.DECLARATION_DEFAULT);
followTraderInfoEntity.setIsAll(FollowTraderInfoEntity.IS_ALL_N);
--
Gitblit v1.9.1