提交liquidnet-bus-qpi

liquidnet-bus-api/liquidnet-service-adam-api/pom.xml

@@ -16,7 +16,6 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
     </dependencies>
 
 

liquidnet-bus-api/pom.xml

@@ -11,4 +11,24 @@
         <module>liquidnet-service-adam-api</module>
         <module>liquidnet-service-kylin-api</module>
     </modules>
+    <dependencies>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-service-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
 </project>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/MybatisPlusCodeGenerator.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.adam;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamAddresses.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 收货地址

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamCollection.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 收藏

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamDeviceToken.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * TOKEN

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamDisposed.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 想去

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamEnters.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 入场人

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberCode.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberPrice.java

@@ -2,10 +2,8 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamRealName.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 实名信息

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamThirdParty.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 用户第三方账号信息

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamUser.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 用户

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamUserInfo.java

 package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 用户信息

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamAddressesMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamAddresses;
 
 /**
  * <p>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamCollectionMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamCollection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamCollection;
 
 /**
  * <p>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamDeviceTokenMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamDeviceToken;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamDeviceToken;
 
 /**
  * <p>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamDisposedMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamDisposed;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamDisposed;
 
 /**
  * <p>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamEntersMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamEnters;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamEnters;
 
 /**
  * <p>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamRealNameMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamRealName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamRealName;
 
 /**
  * <p>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamThirdPartyMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamThirdParty;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamThirdParty;
 
 /**
  * <p>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamUserInfoMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamUserInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamUserInfo;
 
 /**
  * <p>

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamUserMapper.java

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamUser;
 
 /**
  * <p>

liquidnet-bus-do/pom.xml

@@ -32,6 +32,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
             <optional>true</optional>
         </dependency>
         <dependency>