From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java
index d107b63..8d3e996 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java
@@ -105,7 +105,7 @@
transformId(shamUser);
- shamUser.setMsg(listTime.get(listTime.size() - i) + "绉掑墠棰嗗埜璐拱浜嗚繖涓晢鍝�");
+ shamUser.setMsg(listTime.get(listTime.size() - i) + "绉掑墠璐拱浜嗘鍟嗗搧");
}
return listRand;
@@ -157,12 +157,52 @@
public void transformId(ShamUser shamUser) {
String id = shamUser.getId() + "";
-
if (id.length() == 1) {
shamUser.setShowId("2****" + id);
} else {
shamUser.setShowId(id.substring(0, 1) + "****" + id.substring(id.length() - 2, id.length() - 1));
}
+
+ String name = shamUser.getName();
+ if(StringUtil.isNullOrEmpty(name)) {
+ // 鍚嶅瓧涓虹┖鏃�
+ String start = randomName();
+ String end = randomName();
+ shamUser.setName(start + "**" +end);
+ } else if (name.length() == 1) {
+ // 涓�涓瓧
+ String start = name;
+ if (start.trim().length() == 0 || start.equals("*")) {
+ start = randomName();
+ }
+ String end = randomName();
+ shamUser.setName(start + "**" +end);
+ } else {
+ // 涓や釜瀛楀強鍏朵互涓�
+ String start = name.substring(0, 1);
+ String end = name.substring(name.length() - 2, name.length() - 1);
+ if (start.trim().length() == 0 || start.equals("*")) {
+ start = randomName();
+ }
+ if (end.trim().length() == 0 || end.equals("*")) {
+ end = randomName();
+ }
+ shamUser.setName(start + "**" +end);
+ }
+ }
+
+ /**
+ * 闅忔満鍚嶇О
+ * @return
+ */
+ public String randomName() {
+ String[] array = {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z",
+ "鎴�","鍗�","澹�","鎬�","涓�","鎴�","鍩�","缃�","钀�","鑺�","鍖�","澶�","绂�","鎵�","娴�","鐢�","鑻�","姊�","浣�","绻�","鍗�","涓�","璧�","涓�","鏄�","宸�","鎰�","琛�",
+ "涓�","鍚�","椋�","宄�","鏋�","闊�","鍚�","缁�","鍊�","绌�","绂�","涓�","鍘�","鐣�","鍏�","娴�","鐦�","闄�","閺�","闄�","绱�","瑾�","鐐�","缇�","闄�","濉�","杌�","鏅�",
+ "鍏�","闆�","楸�","钘�","闆�","鍙�","浜�","閰�","鑸�","鍌�","璩�","娈�","姗�","宸�","鍠�","鎰�","鍟�","鍡�","璀�","璜�","璨�","閵�","姹�","鑸�","瀛�","鍚�","鏄�","鏄�","闂�"
+ ,"閾�","楦�","鍐�","椋�","璐�","闈�","搴�","杈�","鍘�","鏇�","娓�","灏�","绗�","鏅�","娑�","鏍�","瑗�","濡�","濞�","鐮�","鐪�","鍑�","寰�","鍏�","銇�","瓒�","榛�","鑸�","绱�",
+ "鎲�","鏃�","銇�","銇�","鐑�","鏉�","鐑�","寮�","缁�","闆�","鏈�","鑸�"};
+ return array[(int) (Math.random() * array.length-1)];
}
@Override
--
Gitblit v1.8.0