Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamAddressesVo.java

@@ -57,7 +57,7 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
         this.setAddressesId(source.getAddressesId());
         this.setUid(source.getUid());
         this.setName(source.getName());
-        this.setPhone(SensitizeUtil.custom(source.getPhone(), 3, 4));
+        this.setPhone(source.getPhone());
         this.setProvince(source.getProvince());
         this.setCity(source.getCity());
         this.setCounty(source.getCounty());
@@ -69,8 +69,4 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
         this.setDeletedAt(source.getDeletedAt());
         return this;
     }
-
-    public String getPhone() {
-        return SensitizeUtil.custom(phone, 3, 4);
-    }
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamEntersVo.java

@@ -53,9 +53,9 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
         this.setEntersId(source.getEntersId());
         this.setUid(source.getUid());
         this.setType(source.getType());
-        this.setName(SensitizeUtil.chineseName(source.getName()));
-        this.setMobile(SensitizeUtil.custom(source.getMobile(), 3, 4));
-        this.setIdCard(SensitizeUtil.custom(source.getIdCard(), 3, 2));
+        this.setName(source.getName());
+        this.setMobile(source.getMobile());
+        this.setIdCard(source.getIdCard());
         this.setIsDefault(source.getIsDefault());
         this.setState(source.getState());
         this.setCreatedAt(source.getCreatedAt());
@@ -63,12 +63,4 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
         this.setDeletedAt(source.getDeletedAt());
         return this;
     }
-
-    public String getMobile() {
-        return SensitizeUtil.custom(mobile, 3, 4);
-    }
-
-    public String getIdCard() {
-        return SensitizeUtil.custom(idCard, 3, 2);
-    }
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamRealInfoVo.java

@@ -28,12 +28,4 @@ public class AdamRealInfoVo implements Serializable, Cloneable {
         }
         return new AdamRealInfoVo();
     }
-
-    public String getName() {
-        return SensitizeUtil.chineseName(name);
-    }
-
-    public String getIdCard() {
-        return SensitizeUtil.custom(idCard, 3, 2);
-    }
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserInfoVo.java

@@ -62,8 +62,4 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
         }
         return new AdamUserInfoVo();
     }
-
-    public String getMobile() {
-        return SensitizeUtil.custom(mobile, 3, 4);
-    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinStationCheckOrderVo.java

@@ -51,16 +51,4 @@ public class KylinStationCheckOrderVo implements Serializable {
             return new KylinStationCheckOrderVo();
         }
     }
-
-    public String getUserName() {
-        return SensitizeUtil.chineseName(userName);
-    }
-
-    public String getEnterName() {
-        return SensitizeUtil.chineseName(enterName);
-    }
-
-    public String getEnterMobile() {
-        return SensitizeUtil.custom(enterMobile, 3, 4);
-    }
 }

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-test.yml

+liquidnet:
+  info:
+    context: /
+    name: liquidnet-client-job
+    port: 8090
+  logfile:
+    name: client-job
+    path: ./logs
+  mysql:
+    database-name: test_ln_clijob
\ No newline at end of file