Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-common/liquidnet-common-base/pom.xml

@@ -39,6 +39,10 @@
             <groupId>org.mongodb</groupId>
             <artifactId>bson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
     </dependencies>
 
 

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/JwtUtil.java

+package com.liquidnet.commons.lang.util;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.JwtBuilder;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import java.util.Date;
+import java.util.Map;
+
+//@Component
+public class JwtUtil {
+    /**
+     * 过期时间15分钟
+     */
+    private static final long EXPIRE_TIME = 15 * 60 * 1000;
+    /**
+     * token私钥
+     */
+    private static final String TOKEN_SECRET = "DD5654D654DSD5S1D65S4D65S1D12354";
+
+    /**
+     * 用户登录成功后生成Jwt token
+     * 使用Hs256算法
+     *
+     * @param claims 保存在Payload（有效载荷）中的内容
+     * @return token字符串
+     */
+    public static String create(Map<String, Object> claims) {
+        long nowMillis = System.currentTimeMillis();
+        long expMillis = System.currentTimeMillis() + EXPIRE_TIME;
+
+        // 创建一个JwtBuilder，设置jwt的body
+        JwtBuilder builder = Jwts.builder()
+                // 保存在Payload（有效载荷）中的内容, 自定义一些数据保存在这里
+                .setClaims(claims)
+                // iat: jwt的签发时间
+                .setIssuedAt(new Date(nowMillis))
+                // 设置过期时间
+                .setExpiration(new Date(expMillis))
+                // 使用HS256算法和签名使用的秘钥生成密文
+                .signWith(SignatureAlgorithm.HS256, TOKEN_SECRET);
+        return builder.compact();
+    }
+
+    /**
+     * 解析token，获取到Payload（有效载荷）中的内容，包括验证签名，判断是否过期
+     *
+     * @param token 令牌
+     * @return
+     */
+    public static Claims parse(String token) {
+        // 得到DefaultJwtParser
+        return Jwts.parser()
+                // 设置签名的秘钥
+                .setSigningKey(TOKEN_SECRET)
+                // 设置需要解析的token
+                .parseClaimsJws(token).getBody();
+    }
+}

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul.yml

@@ -62,8 +62,8 @@ eureka:
 zuul:
   prefix: /
   host:
-    max-per-route-connections: 1000
-    max-total-connections: 2000
+    max-per-route-connections: 15000
+    max-total-connections: 60000
   routes:
     liquidnet-service-adam: /adam/**
     liquidnet-service-kylin: /kylin/**
@@ -75,7 +75,14 @@ zuul:
 #  XXXFilter:  # 类的名字
 #    pre:        # 类型
 #      disable: true
-
+# -----------------------------------------------------------
+common:
+  login:
+    url: /adam/login
+exclude:
+  auth:
+    url: /adam/login,/adam/v2/api-docs,/kylin/v2/api-docs
+# -----------------------------------------------------------
 #解决错误 com.netflix.client.ClientException: Load balancer does not have available server for client:panfeng-item-service
 #这样就可以即指定path与URL，又不破坏Zuul的Hystrix与Ribbon特性了。
 #开启eureka负载均衡策略
@@ -86,3 +93,11 @@ ribbon:
 #  ribbon:
 #    listOfServers: 192.168.137.1:9001
 # -----------------------------------------------------------
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+# -----------------------------------------------------------

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

+package com.liquidnet.service.adam.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "AdamAddressesParam", description = "添加/编辑收获地址入参")
+@Data
+public class AdamAddressesParam implements java.io.Serializable {
+    private static final long serialVersionUID = -2626425843975309892L;
+    @ApiModelProperty(position = 10, required = false, value = "收获地址ID，编辑时必传[64]")
+    private String addrId;
+    @ApiModelProperty(position = 11, required = true, value = "入场人名称[50]", example = "Swagger")
+    private String name;
+    @ApiModelProperty(position = 12, required = true, value = "手机号[11]", example = "13111111111")
+    private String phone;
+    @ApiModelProperty(position = 13, required = true, value = "省份[30]", example = "北京")
+    private String province;
+    @ApiModelProperty(position = 14, required = true, value = "城市[30]", example = "北京城区")
+    private String city;
+    @ApiModelProperty(position = 15, required = true, value = "区县[30]", example = "朝阳区")
+    private String county;
+    @ApiModelProperty(position = 16, required = true, value = "详细地址[100]", example = "广渠路1号创1958园区")
+    private String address;
+}

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

+package com.liquidnet.service.adam.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "AdamCollectParam", description = "添加收藏入参")
+@Data
+public class AdamCollectParam implements java.io.Serializable {
+    private static final long serialVersionUID = 7397579764049783649L;
+    @ApiModelProperty(position = 11, required = true, value = "内容ID[64]", example = "Swagger")
+    private String contentId;
+    @ApiModelProperty(position = 12, required = true, value = "内容类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG")
+    private String type;
+    @ApiModelProperty(position = 13, required = true, value = "内容标题[255]", example = "13111111111")
+    private String contentTitle;
+    @ApiModelProperty(position = 14, required = true, value = "内容快照[30]", example = "北京")
+    private String contentImg;
+    @ApiModelProperty(position = 15, required = false, value = "持续时间,单位S,VIDEO类型时必传[30]", example = "100")
+    private Long duration;
+}

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

@@ -4,20 +4,18 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-@ApiModel(value = "AdamEntersParam", description = "添加入场人参数")
+@ApiModel(value = "AdamEntersParam", description = "添加/编辑入场人入参")
 @Data
 public class AdamEntersParam implements java.io.Serializable {
     private static final long serialVersionUID = 5940725094369061032L;
-    @ApiModelProperty(position = 10, required = false, value = "入场人ID[50]")
+    @ApiModelProperty(position = 10, required = false, value = "入场人ID，编辑时必传[50]")
     private String entersId;
     @ApiModelProperty(position = 11, required = true, value = "入场人名称[50]", example = "Swagger")
     private String name;
     @ApiModelProperty(position = 12, required = true, value = "入场人手机号[11]", example = "13100000000")
     private String mobile;
-    @ApiModelProperty(position = 13, required = true, value = "证件类型：1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证", allowableValues = "1,2,3,4,5")
+    @ApiModelProperty(position = 13, required = true, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证", allowableValues = "1,2,3,4,5")
     private Integer type;
     @ApiModelProperty(position = 14, required = true, value = "入场人证件号[11]", example = "110101110001010111")
     private String idCard;
-    @ApiModelProperty(position = 15, required = true, value = "是否是默认入场人：0-否,1-是", allowableValues = "0,1")
-    private Boolean isDefault;
 }

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

@@ -4,18 +4,18 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-@ApiModel(value = "AdamEntersParam", description = "添加入场人参数")
+@ApiModel(value = "AdamEntersResult", description = "入场人响应")
 @Data
 public class AdamEntersResult implements java.io.Serializable {
-    private static final long serialVersionUID = 5940725094369061032L;
+    private static final long serialVersionUID = 3219448286221952517L;
     @ApiModelProperty(position = 10, required = true, value = "入场人名称[50]", example = "Swagger")
     private String name;
     @ApiModelProperty(position = 11, required = true, value = "入场人手机号[11]", example = "13100000000")
     private String mobile;
-    @ApiModelProperty(position = 12, required = true, value = "证件类型：1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证", allowableValues = "1,2,3,4,5")
+    @ApiModelProperty(position = 12, required = true, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证", allowableValues = "1,2,3,4,5")
     private Integer type;
     @ApiModelProperty(position = 13, required = true, value = "入场人证件号[11]", example = "110101110001010111")
     private String idCard;
-    @ApiModelProperty(position = 14, required = true, value = "是否是默认入场人：0-否,1-是", allowableValues = "0,1")
+    @ApiModelProperty(position = 14, required = true, value = "是否为默认:0-否,1-是", allowableValues = "0,1")
     private Boolean isDefault;
 }

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

+package com.liquidnet.service.adam.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "AdamUserInfoParam", description = "个人资料编辑参数")
+@Data
+public class AdamUserInfoParam implements java.io.Serializable {
+    private static final long serialVersionUID = -1084524066864012398L;
+    @ApiModelProperty(position = 11, required = true, value = "头像[255]")
+    private String avatar;
+    @ApiModelProperty(position = 12, required = true, value = "背景[255]")
+    private String background;
+    @ApiModelProperty(position = 13, required = true, value = "昵称[32]")
+    private String nickName;
+    @ApiModelProperty(position = 14, required = true, value = "性别[32]")
+    private String sex;
+    @ApiModelProperty(position = 15, required = true, value = "生日[YYYY-MM-DD]")
+    private String birthday;
+    @ApiModelProperty(position = 16, required = true, value = "常住地/区域[100]")
+    private String area;
+    @ApiModelProperty(position = 17, required = true, value = "签名[255]")
+    private String signature;
+    @ApiModelProperty(position = 18, required = true, value = "标签[500]")
+    private String tagMe;
+}

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

+package com.liquidnet.service.adam.dto.vo;
+
+import com.liquidnet.service.adam.entity.AdamAddresses;
+import com.liquidnet.service.adam.entity.AdamEnters;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "AdamAddressesVo", description = "收获地址")
+@Data
+public class AdamAddressesVo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = 5258094625450569125L;
+    @ApiModelProperty(position = 10, value = "收获地址ID[64]")
+    private String addrId;
+    @ApiModelProperty(position = 11, value = "姓名[30]")
+    private String name;
+    @ApiModelProperty(position = 12, value = "手机号[11]")
+    private String phone;
+    @ApiModelProperty(position = 13, value = "省份[30]")
+    private String province;
+    @ApiModelProperty(position = 14, value = "城市[30]")
+    private String city;
+    @ApiModelProperty(position = 15, value = "区县[30]")
+    private String county;
+    @ApiModelProperty(position = 16, value = "详细地址[100]")
+    private String address;
+    @ApiModelProperty(position = 18, value = "是否为默认:0-否,1-是")
+    private Boolean isDefault;
+
+    private static final AdamAddressesVo obj = new AdamAddressesVo();
+
+    public static AdamAddressesVo getNew() {
+        try {
+            return (AdamAddressesVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamAddressesVo();
+    }
+
+    public AdamAddressesVo copy(AdamAddresses source) {
+        this.setAddrId(source.getAddressesId());
+        this.setName(source.getName());
+        this.setPhone(source.getPhone());
+        this.setProvince(source.getProvince());
+        this.setCity(source.getCity());
+        this.setCounty(source.getCounty());
+        this.setAddress(source.getAddress());
+        this.setIsDefault(source.getIsDefault());
+        return this;
+    }
+}

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

@@ -15,11 +15,11 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
     private String name;
     @ApiModelProperty(position = 12, value = "入场人手机号[11]")
     private String mobile;
-    @ApiModelProperty(position = 13, value = "证件类型：1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证")
+    @ApiModelProperty(position = 13, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证")
     private Integer type;
     @ApiModelProperty(position = 14, value = "入场人证件号[11]")
     private String idCard;
-    @ApiModelProperty(position = 15, value = "是否是默认入场人：0-否,1-是")
+    @ApiModelProperty(position = 15, value = "是否为默认:0-否,1-是")
     private Boolean isDefault;
 
     private static final AdamEntersVo obj = new AdamEntersVo();

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "ThirdPartInfoVo", description = "用户第三方信息")
+@Data
+public class AdamThirdPartInfoVo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = -3239086191919676121L;
+    @ApiModelProperty(position = 10, value = "Third Party ID[64]")
+    private String thirdPartyId;
+    @ApiModelProperty(position = 11, value = "用户ID[64]")
+    private String uid;
+    @ApiModelProperty(position = 12, value = "第三方ID[64]")
+    private String openId;
+    @ApiModelProperty(position = 13, value = "昵称[64]")
+    private String nickname;
+    @ApiModelProperty(position = 14, value = "头像[255]")
+    private String avatar;
+    @ApiModelProperty(position = 14, value = "平台类型[20]")
+    private String platform;
+    @ApiModelProperty(position = 14, value = "状态[1-绑定,2-解绑]")
+    private int state;
+
+    private static final AdamThirdPartInfoVo obj = new AdamThirdPartInfoVo();
+
+    public static AdamThirdPartInfoVo getNew() {
+        try {
+            return (AdamThirdPartInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamThirdPartInfoVo();
+    }
+}

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "AdamUserInfoVo", description = "用户详情")
+@Data
+public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = 8479869354894030303L;
+    @ApiModelProperty(position = 10, value = "用户ID[64]")
+    private String uid;
+    @ApiModelProperty(position = 11, value = "昵称[32]")
+    private String username;
+    @ApiModelProperty(position = 12, value = "性别[32]")
+    private String sex;
+    @ApiModelProperty(position = 13, value = "生日[YYYY-MM-DD]")
+    private String birthday;
+    @ApiModelProperty(position = 14, value = "常住地/区域")
+    private String area;
+    @ApiModelProperty(position = 15, value = "个性签名")
+    private String signature;
+    @ApiModelProperty(position = 16, value = "头像")
+    private String avatar;
+    @ApiModelProperty(position = 17, value = "背景图")
+    private String background;
+    @ApiModelProperty(position = 18, value = "标签")
+    private String tagMe;
+    @ApiModelProperty(position = 19, value = "")
+    private String rongCloudToken;
+//    @ApiModelProperty(position = 20, value = "隐私配置")
+//    private
+
+    private static final AdamUserInfoVo obj = new AdamUserInfoVo();
+
+    public static AdamUserInfoVo getNew() {
+        try {
+            return (AdamUserInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamUserInfoVo();
+    }
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamAddressesService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamAddresses;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 收货地址 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+public interface IAdamAddressesService extends IService<AdamAddresses> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamCollection;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 收藏 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface IAdamCollectionService extends IService<AdamCollection> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamDeviceTokenService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamDeviceToken;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * TOKEN 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+public interface IAdamDeviceTokenService extends IService<AdamDeviceToken> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRealNameService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamRealName;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 实名信息 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface IAdamRealNameService extends IService<AdamRealName> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamThirdPartyService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamThirdParty;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户第三方账号信息 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface IAdamThirdPartyService extends IService<AdamThirdParty> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserInfoService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamUserInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 正在现场用户信息 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface IAdamUserInfoService extends IService<AdamUserInfo> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserService.java

+package com.liquidnet.service.adam.service;
+
+import com.liquidnet.service.adam.entity.AdamUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface IAdamUserService extends IService<AdamUser> {
+
+}

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

+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;
+
+/**
+ * <p>
+ * 收货地址
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamAddresses implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    private String addressesId;
+
+    private String uid;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String county;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 是否为默认:0-否,1-是,第一个默认1
+     */
+    private Boolean isDefault;
+
+    /**
+     * 状态:0-INIT,1-NORMAL,2-INVALID
+     */
+    private Integer state;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+    private LocalDateTime deletedAt;
+
+    private String comment;
+
+
+}

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

+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;
+
+/**
+ * <p>
+ * 收藏
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamCollection implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    private String uid;
+
+    private String contentId;
+
+    private String contentTitle;
+
+    private String contentImg;
+
+    private Long duration;
+
+    /**
+     * 收藏类型
+     */
+    private String type;
+
+    /**
+     * 1-正常,2-删除
+     */
+    private Integer state;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+    private String comment;
+
+
+}

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

+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;
+
+/**
+ * <p>
+ * TOKEN
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamDeviceToken implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    private String uid;
+
+    private String android;
+
+    private String ios;
+
+    private String ipad;
+
+    private Integer isLast;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+
+}

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

@@ -52,12 +52,12 @@ public class AdamEnters implements Serializable {
     private String idCard;
 
     /**
-     * 是否是默认入场人：0-否,1-是，客户第一个入场人默认1
+     * 是否为默认:0-否,1-是,第一个默认1
      */
     private Boolean isDefault;
 
     /**
-     * 状态：0-INIT,1-NORMAL,2-INVALID
+     * 状态:0-INIT,1-NORMAL,2-INVALID
      */
     private Integer state;
 

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

+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;
+
+/**
+ * <p>
+ * 实名信息
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamRealName implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    private String realNameId;
+
+    private String uid;
+
+    /**
+     * 1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证
+     */
+    private String type;
+
+    /**
+     * 真实姓名
+     */
+    private String name;
+
+    /**
+     * 证件号码
+     */
+    private String idCard;
+
+    /**
+     * 0-INIT,1-NORMAL,2-INVALID
+     */
+    private Integer state;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+    private String comment;
+
+
+}

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

+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;
+
+/**
+ * <p>
+ * 用户第三方账号信息
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamThirdParty implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    private String uid;
+
+    /**
+     * 第三方ID
+     */
+    private String openId;
+
+    /**
+     * 第三方头像
+     */
+    private String avatar;
+
+    /**
+     * 第三方昵称
+     */
+    private String nickName;
+
+    /**
+     * 平台名称
+     */
+    private String platform;
+
+    /**
+     * 0-INIT,1-NORMAL,2-INVALID
+     */
+    private Integer state;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+    private String comment;
+
+
+}

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

+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;
+
+/**
+ * <p>
+ * 用户
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    private String uid;
+
+    private String mobile;
+
+    private String passwd;
+
+    private String payCode;
+
+    /**
+     * 1-NORMAL,2-INVALID
+     */
+    private Integer state;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+    private LocalDateTime closedAt;
+
+    private String comment;
+
+
+}

liquidnet-bus-service/liquidnet-service-adam/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;
+
+/**
+ * <p>
+ * 用户信息
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamUserInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    private String uid;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 生日YYYY-MM-DD
+     */
+    private LocalDate birthday;
+
+    /**
+     * 常住地/区域
+     */
+    private String area;
+
+    /**
+     * 个性签名
+     */
+    private String signature;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 背景图
+     */
+    private String background;
+
+    /**
+     * 身份二维码
+     */
+    private String qrCode;
+
+    /**
+     * 身份二维码
+     */
+    private String qrPic;
+
+    /**
+     * 音乐标签
+     */
+    private String tagMe;
+
+    private String comment;
+
+
+}

liquidnet-bus-service/liquidnet-service-adam/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;
+
+/**
+ * <p>
+ * 收货地址 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+public interface AdamAddressesMapper extends BaseMapper<AdamAddresses> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/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;
+
+/**
+ * <p>
+ * 收藏 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface AdamCollectionMapper extends BaseMapper<AdamCollection> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/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;
+
+/**
+ * <p>
+ * TOKEN Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+public interface AdamDeviceTokenMapper extends BaseMapper<AdamDeviceToken> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/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;
+
+/**
+ * <p>
+ * 实名信息 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface AdamRealNameMapper extends BaseMapper<AdamRealName> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/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;
+
+/**
+ * <p>
+ * 用户第三方账号信息 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface AdamThirdPartyMapper extends BaseMapper<AdamThirdParty> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/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;
+
+/**
+ * <p>
+ * 正在现场用户信息 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface AdamUserInfoMapper extends BaseMapper<AdamUserInfo> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/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;
+
+/**
+ * <p>
+ * 用户 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+public interface AdamUserMapper extends BaseMapper<AdamUser> {
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamAddressesMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamCollectionMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamDeviceTokenMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamRealNameMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamThirdPartyMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamUserInfoMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamUserMapper">
+
+</mapper>

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

@@ -31,13 +31,6 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-api-feign-sequence</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java

+package com.liquidnet.service.adam.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.adam.dto.AdamAddressesParam;
+import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 收货地址 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+@Api(tags = "收获地址")
+@Slf4j
+@RestController
+@RequestMapping("addr")
+public class AdamAddressesController {
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "添加收获地址")
+    @PostMapping("add")
+    public ResponseDto<Object> add(@RequestBody AdamAddressesParam parameter) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "收获地址列表")
+    @GetMapping("list")
+    public ResponseDto<List<AdamAddressesVo>> list() {
+        // TODO: 2021/4/29 获取登录UID
+        String uid = "1";
+
+
+        List<AdamAddressesVo> voList = new ArrayList<>();
+        voList.add(AdamAddressesVo.getNew());
+        voList.add(AdamAddressesVo.getNew());
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success(voList);
+    }
+
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "设置默认收货地址")
+    @PostMapping("def/{addrId}")
+    public ResponseDto<Object> def(@PathVariable String addrId) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "编辑收获地址")
+    @PostMapping("edit")
+    public ResponseDto<Object> edit(@RequestBody AdamAddressesParam parameter) {
+        // TODO: 2021/4/28 校验、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/11
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "删除收获地址")
+    @PostMapping("del/{addrId}")
+    public ResponseDto<Object> del(@PathVariable String addrId) {
+        // TODO: 2021/4/28 校验、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/11
+
+
+        return ResponseDto.success();
+    }
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java

+package com.liquidnet.service.adam.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.adam.dto.AdamCollectParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 收藏 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+@Api(tags = "收藏")
+@Slf4j
+@RestController
+@RequestMapping("collect")
+public class AdamCollectionController {
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "添加收藏")
+    @PostMapping("add")
+    public ResponseDto<Object> add(@RequestBody AdamCollectParam parameter) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "删除收藏")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
+    })
+    @PostMapping("del")
+    public ResponseDto<Object> del(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "收藏列表 -> 返回结构待定:遵循原PHP.API查询Collection内容")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageNum", value = "页展示条数"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageSize", value = "页码"),
+    })
+    @PostMapping("list")
+    public ResponseDto<PageInfo> list(@RequestParam String type, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "10") int pageSize) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "获取特定内容的收藏用户列表 -> 返回结构待定")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
+    })
+    @PostMapping("list/user")
+    public ResponseDto<Object> listUser(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "获取收藏状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
+    })
+    @GetMapping("state")
+    public ResponseDto<Object> state(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java

@@ -29,28 +29,12 @@ import java.util.List;
 @Api(tags = "入场人")
 @Slf4j
 @RestController
-@RequestMapping("/enters")
+@RequestMapping("enters")
 public class AdamEntersController  {
     @Autowired
     IAdamEntersService adamEntersService;
 
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "入场人列表")
-    @GetMapping("list")
-    public ResponseDto<List<AdamEntersVo>> list() {
-        // TODO: 2021/4/29 获取登录UID
-        String uid = "1";
-
-
-        List<AdamEntersVo> voList = new ArrayList<>();
-        adamEntersService.list(uid).forEach(i -> {
-            voList.add(AdamEntersVo.getNew().copy(i));
-        });
-
-        return ResponseDto.success(voList);
-    }
-
-    @ApiOperationSupport(order = 2)
     @ApiOperation(value = "添加入场人")
     @PostMapping("add")
     public ResponseDto<Object> add(@RequestBody AdamEntersParam parameter) {
@@ -70,20 +54,37 @@ public class AdamEntersController  {
         return ResponseDto.success();
     }
 
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "入场人列表")
+    @GetMapping("list")
+    public ResponseDto<List<AdamEntersVo>> list() {
+        // TODO: 2021/4/29 获取登录UID
+        String uid = "1";
+
+
+        List<AdamEntersVo> voList = new ArrayList<>();
+        adamEntersService.list(uid).forEach(i -> {
+            voList.add(AdamEntersVo.getNew().copy(i));
+        });
+
+        return ResponseDto.success(voList);
+    }
+
     @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "入场人详情")
-    @PostMapping("query/{id}")
-    public ResponseDto<AdamEntersVo> query(@PathVariable(name = "id") String entersId) {
-        // TODO: 2021/4/28 校验、获取登录UID
+    @ApiOperation(value = "设置默认入场人")
+    @PostMapping("def/{entersId}")
+    public ResponseDto<Object> def(@PathVariable String entersId) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
         String uid = "1";
 
-        AdamEnters info = adamEntersService.query(uid, entersId);
+        // TODO: 2021/5/10
+
 
-        return ResponseDto.success(AdamEntersVo.getNew().copy(info));
+        return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "入场人编辑")
+    @ApiOperation(value = "编辑入场人")
     @PostMapping("edit")
     public ResponseDto<Object> edit(@RequestBody AdamEntersParam parameter) {
         // TODO: 2021/4/28 校验、获取登录UID
@@ -101,9 +102,9 @@ public class AdamEntersController  {
     }
 
     @ApiOperationSupport(order = 5)
-    @ApiOperation(value = "入场人删除")
-    @PostMapping("del/{id}")
-    public ResponseDto<Object> del(@PathVariable(name = "id") String entersId) {
+    @ApiOperation(value = "删除入场人")
+    @PostMapping("del/{entersId}")
+    public ResponseDto<Object> del(@PathVariable String entersId) {
         // TODO: 2021/4/28 校验、获取登录UID
         String uid = "1";
 
@@ -111,4 +112,16 @@ public class AdamEntersController  {
 
         return ResponseDto.success();
     }
+
+//    @ApiOperationSupport(order = 5)
+//    @ApiOperation(value = "入场人详情")
+//    @PostMapping("query/{id}")
+//    public ResponseDto<AdamEntersVo> query(@PathVariable(name = "id") String entersId) {
+//        // TODO: 2021/4/28 校验、获取登录UID
+//        String uid = "1";
+//
+//        AdamEnters info = adamEntersService.query(uid, entersId);
+//
+//        return null == info ? ResponseDto.success() : ResponseDto.success(AdamEntersVo.getNew().copy(info));
+//    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserAuthController.java

+package com.liquidnet.service.adam.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.liquidnet.commons.lang.util.JwtUtil;
+import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Api(tags = "用户登录")
+@Slf4j
+@RestController
+@RequestMapping("login")
+public class AdamUserAuthController {
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "手机号密码登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", dataType = "String", name = "mobile", value = "手机号"),
+            @ApiImplicitParam(type = "form", dataType = "String", name = "password", value = "密码"),
+    })
+    @PostMapping(value = {""})
+    public ResponseDto<Object> loginByPwd(@RequestParam String mobile, @RequestParam String password) {
+        log.info("mobile:{},pwd:{}", mobile, password);
+
+        Map<String, Object> claimsMap = new HashMap<>(), rstMap = new HashMap<>();
+        claimsMap.put("username", "zhanggb");
+        claimsMap.put("uid", "2021");
+        String token = JwtUtil.create(claimsMap);
+        log.info("token:{}", token);
+
+        rstMap.put("token", token);
+        rstMap.put("userInfo", AdamUserInfoVo.getNew());
+        rstMap.put("thiredPartInfo", AdamThirdPartInfoVo.getNew());
+        // TODO: 2021/5/10 会员信息
+        rstMap.put("cardsInfo", null);
+
+        return ResponseDto.success(rstMap);
+    }
+
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "发送验证码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
+    })
+    @GetMapping(value = {"send/{mobile}"})
+    public ResponseDto<Object> sendSms(@PathVariable String mobile) {
+        log.info("send to mobile:{}", mobile);
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "手机号验证码登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "验证码"),
+    })
+    @PostMapping(value = {"sms"})
+    public ResponseDto<Object> loginBySms(@RequestParam String mobile, @RequestParam String code) {
+        log.info("mobile:{},pwd:{}", mobile, code);
+
+        Map<String, Object> claimsMap = new HashMap<>(), rstMap = new HashMap<>();
+        claimsMap.put("username", "zhanggb");
+        claimsMap.put("uid", "2021");
+        String token = JwtUtil.create(claimsMap);
+        log.info("token:{}", token);
+
+        rstMap.put("token", token);
+        rstMap.put("userInfo", AdamUserInfoVo.getNew());
+        rstMap.put("thiredPartInfo", AdamThirdPartInfoVo.getNew());
+        // TODO: 2021/5/10 会员信息
+        rstMap.put("cardsInfo", null);
+
+        return ResponseDto.success(token);
+    }
+
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "手机号一键登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "accessToken", value = "访问令牌"),
+    })
+    @PostMapping(value = {"tpa/mobile"})
+    public ResponseDto<Object> loginByTpaMobile(@RequestParam String accessToken) {
+
+        log.info("login by mobile access token:{}", accessToken);
+
+        // TODO: 2021/5/10
+
+
+        Map<String, Object> claimsMap = new HashMap<>(), rstMap = new HashMap<>();
+        claimsMap.put("username", "zhanggb");
+        claimsMap.put("uid", "2021");
+        String token = JwtUtil.create(claimsMap);
+        log.info("token:{}", token);
+
+        rstMap.put("token", token);
+        rstMap.put("userInfo", AdamUserInfoVo.getNew());
+        rstMap.put("thiredPartInfo", AdamThirdPartInfoVo.getNew());
+        // TODO: 2021/5/10 会员信息
+        rstMap.put("cardsInfo", null);
+
+        return ResponseDto.success(rstMap);
+    }
+
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "第三方账号登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "openId", value = "第三方OPENID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "nickName", value = "昵称"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "avatar", value = "头像"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "platform", value = "平台类型", allowableValues = "WEIBO,WECHAT,QQ"),
+    })
+    @PostMapping(value = {"tpa"})
+    public ResponseDto<Object> loginByTpa(@RequestParam String openId, @RequestParam String nickname,
+                                          @RequestParam String avatar, @RequestParam String platform) {
+        log.info("login by tpa openId:{}, nickname:{}, avatar: {}, platform:{}", openId, nickname, avatar, platform);
+
+        // TODO: 2021/5/10
+        Map<String, Object> claimsMap = new HashMap<>(), rstMap = new HashMap<>();
+        claimsMap.put("username", "zhanggb");
+        claimsMap.put("uid", "2021");
+        String token = JwtUtil.create(claimsMap);
+        log.info("token:{}", token);
+
+        rstMap.put("token", token);
+        rstMap.put("userInfo", AdamUserInfoVo.getNew());
+        rstMap.put("thiredPartInfo", AdamThirdPartInfoVo.getNew());
+        // TODO: 2021/5/10 会员信息
+        rstMap.put("cardsInfo", null);
+
+        return ResponseDto.success(rstMap);
+    }
+
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "第三方账号注册")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "openId", value = "第三方OPENID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "nickname", value = "昵称"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "avatar", value = "头像"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "platform", value = "平台类型", allowableValues = "WEIBO,WECHAT,QQ"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "platform", value = "验证码"),
+    })
+    @PostMapping(value = {"tpa/reg"})
+    public ResponseDto<Object> loginByTpaRegister(@RequestParam String openId, @RequestParam String nickname,
+                                                  @RequestParam String avatar, @RequestParam String platform,
+                                                  @RequestParam String mobile, @RequestParam String code) {
+        log.info("login by tpa openId:{},nickname:{},avatar:{},platform:{},mobile:{},code:{}",
+                openId, nickname, avatar, platform, mobile, code);
+
+        // TODO: 2021/5/10
+        Map<String, Object> claimsMap = new HashMap<>(), rstMap = new HashMap<>();
+        claimsMap.put("username", "zhanggb");
+        claimsMap.put("uid", "2021");
+        String token = JwtUtil.create(claimsMap);
+        log.info("token:{}", token);
+
+        rstMap.put("token", token);
+        rstMap.put("userInfo", AdamUserInfoVo.getNew());
+        rstMap.put("thiredPartInfo", AdamThirdPartInfoVo.getNew());
+        // TODO: 2021/5/10 会员信息
+        rstMap.put("cardsInfo", null);
+
+        return ResponseDto.success(rstMap);
+    }
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

+package com.liquidnet.service.adam.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.adam.dto.AdamUserInfoParam;
+import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Api(tags = "用户中心")
+@Slf4j
+@RestController
+@RequestMapping("user")
+public class AdamUserController {
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "个人资料编辑")
+    @PostMapping(value = {"edit"})
+    public ResponseDto<AdamUserInfoVo> edit(@RequestBody AdamUserInfoParam adamUserInfoParam) {
+        log.info("adamUserInfoParam:{}", JsonUtils.toJson(adamUserInfoParam));
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success(AdamUserInfoVo.getNew());
+    }
+
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "手机号修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "新手机号"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "验证码"),
+    })
+    @PostMapping(value = {"edit/mobile"})
+    public ResponseDto<Object> editMobile(@RequestParam String mobile, @RequestParam String code) {
+        log.info("mobile:{},code:{}", mobile, code);
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "密码修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "password", value = "密码"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "验证码"),
+    })
+    @PostMapping(value = {"edit/pwd"})
+    public ResponseDto<Object> editPwd(@RequestParam String mobile, @RequestParam String password, @RequestParam String code) {
+        log.info("mobile:{},password:{},code:{}", mobile, password, code);
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "绑定第三方账号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "openId", value = "第三方OPENID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "nickName", value = "昵称"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "avatar", value = "头像"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "platform", value = "平台类型", allowableValues = "WEIBO,WECHAT,QQ"),
+    })
+    @PostMapping(value = {"tpa/bind"})
+    public ResponseDto<List<AdamThirdPartInfoVo>> bindTpa(@RequestParam String openId, @RequestParam String nickname,
+                                       @RequestParam String avatar, @RequestParam String platform) {
+        log.info("bind tpa openId:{}, nickname:{}, avatar: {}, platform:{}", openId, nickname, avatar, platform);
+
+        // TODO: 2021/5/10
+        List<AdamThirdPartInfoVo> voList = new ArrayList<>();
+        voList.add(AdamThirdPartInfoVo.getNew());
+
+
+        return ResponseDto.success(voList);
+    }
+
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "解绑第三方账号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "platform", value = "平台类型", allowableValues = "WEIBO,WECHAT,QQ"),
+    })
+    @PostMapping(value = {"tpa/unbind/{platform}"})
+    public ResponseDto<List<AdamThirdPartInfoVo>> unbindTpa(@PathVariable String platform) {
+        log.info("unbind tpa.platform:{}", platform);
+
+        // TODO: 2021/5/10
+        List<AdamThirdPartInfoVo> voList = new ArrayList<>();
+        voList.add(AdamThirdPartInfoVo.getNew());
+
+
+        return ResponseDto.success(voList);
+    }
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamAddresses;
+import com.liquidnet.service.adam.mapper.AdamAddressesMapper;
+import com.liquidnet.service.adam.service.IAdamAddressesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 收货地址 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Service
+public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, AdamAddresses> implements IAdamAddressesService {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamCollection;
+import com.liquidnet.service.adam.mapper.AdamCollectionMapper;
+import com.liquidnet.service.adam.service.IAdamCollectionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 收藏 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+@Service
+public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper, AdamCollection> implements IAdamCollectionService {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDeviceTokenServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamDeviceToken;
+import com.liquidnet.service.adam.mapper.AdamDeviceTokenMapper;
+import com.liquidnet.service.adam.service.IAdamDeviceTokenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * TOKEN 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Service
+public class AdamDeviceTokenServiceImpl extends ServiceImpl<AdamDeviceTokenMapper, AdamDeviceToken> implements IAdamDeviceTokenService {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRealNameServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamRealName;
+import com.liquidnet.service.adam.mapper.AdamRealNameMapper;
+import com.liquidnet.service.adam.service.IAdamRealNameService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实名信息 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+@Service
+public class AdamRealNameServiceImpl extends ServiceImpl<AdamRealNameMapper, AdamRealName> implements IAdamRealNameService {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamThirdPartyServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamThirdParty;
+import com.liquidnet.service.adam.mapper.AdamThirdPartyMapper;
+import com.liquidnet.service.adam.service.IAdamThirdPartyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户第三方账号信息 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+@Service
+public class AdamThirdPartyServiceImpl extends ServiceImpl<AdamThirdPartyMapper, AdamThirdParty> implements IAdamThirdPartyService {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamUserInfo;
+import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
+import com.liquidnet.service.adam.service.IAdamUserInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 正在现场用户信息 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+@Service
+public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, AdamUserInfo> implements IAdamUserInfoService {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

+package com.liquidnet.service.adam.service.impl;
+
+import com.liquidnet.service.adam.entity.AdamUser;
+import com.liquidnet.service.adam.mapper.AdamUserMapper;
+import com.liquidnet.service.adam.service.IAdamUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+@Service
+public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> implements IAdamUserService {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceListParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class PerformanceListParam {
+    @ApiModelProperty(value = "演出名称", example = "")
+    private String title;
+    @ApiModelProperty(value = "-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;", example = "0")
+    private int status;
+    @ApiModelProperty(value = "-2全部,-1未提交审核，0审核中，1审核通过，2审核拒绝", example = "0")
+    private int auditStatus;
+    @ApiModelProperty(value = "演出开始时间", example = "2000-01-01 12:00:00")
+    private String timeStart;
+    @ApiModelProperty(value = "演出结束时间", example = "2000-01-01 12:00:00")
+    private String timeEnd;
+    @ApiModelProperty(value = "排序类型 1创建时间倒序 2创建时间正序 3演出时间倒序 4演出时间正序", example = "0")
+    private int orderType;
+    @ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00")
+    private String stopSellTime;
+    @ApiModelProperty(value = "页数", example = "0")
+    private int page;
+    @ApiModelProperty(value = "数量", example = "20")
+    private int size;
+    @ApiModelProperty(value = "排序字段", hidden = true)
+    private String orderItem;
+    @ApiModelProperty(value = "排序方式", hidden = true)
+    private String orderSc;
+
+    public void setOrderType(int orderType) {
+        this.orderType = orderType;
+        switch (orderType) {
+            case 1: {
+                orderItem = "created_at";
+                orderSc = "desc";
+            }
+            case 2: {
+                orderItem = "created_at";
+                orderSc = "asc";
+            }
+            case 3: {
+                orderItem = "time_start";
+                orderSc = "desc";
+            }
+            case 4: {
+                orderItem = "time_start";
+                orderSc = "asc";
+            }
+
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep1Param.java

@@ -16,6 +16,9 @@ public class PerformanceStep1Param implements Serializable {
     @ApiModelProperty(value = "封面图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
     private String imgPoster;
 
+    @ApiModelProperty(value = "第三方id", example = "0")
+    private String merchantId;
+
     @ApiModelProperty(value = "演出名称", example = "测试演出")
     private String title;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep2Param.java

@@ -23,9 +23,6 @@ public class PerformanceStep2Param implements Serializable {
     @ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
     private int isSubmit;
 
-    @ApiModelProperty(value = "第三方id", example = "0")
-    private String merchantId;
-
     @ApiModelProperty(value = "场次数据",hidden = true)
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
 }

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

 package com.liquidnet.service.kylin.dto.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -17,6 +18,7 @@ import java.util.List;
  */
 
 @Data
+@ApiModel
 public class BannersVo implements Serializable {
     @ApiModelProperty(value = "Banner主键ID")
     private String bannersId;

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

 package com.liquidnet.service.kylin.dto.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
+@ApiModel
 public class PagerVo<T> {
 
     @ApiModelProperty(value = "返回记录集合")

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

@@ -3,15 +3,16 @@ package com.liquidnet.service.kylin.dto.vo;
 import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
 import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 
+@ApiModel
 @Data
 public class PerformanceVo {
 
@@ -29,7 +30,6 @@ public class PerformanceVo {
     private String price;
     @ApiModelProperty(value = "开售时间")
     private String sellTime;
-
     @ApiModelProperty(value = "城市id")
     private String cityId;
     @ApiModelProperty(value = "场地id")

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

 package com.liquidnet.service.kylin.dto.vo;
 
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +9,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Data
+@ApiModel
 public class TicketTimesVo {
 
     @ApiModelProperty(value = "主键")

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.vo;
 import com.liquidnet.service.kylin.entity.KylinTicketRelations;
 import com.liquidnet.service.kylin.entity.KylinTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinTickets;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
 
 @Data
+@ApiModel
 public class TicketVo {
 
     @ApiModelProperty(value = "主键")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformancePartnerListVo.java

+package com.liquidnet.service.kylin.dto.vo.partner;
+
+import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PerformancePartnerListVo {
+
+    //演出数据
+    @ApiModelProperty(value = "主键id")
+    private String performancesId;
+    @ApiModelProperty(value = "标题")
+    private String title;
+    @ApiModelProperty(value = "开演时间")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "总库存")
+    private int totalGeneral;
+    @ApiModelProperty(value = "销售库存")
+    private int saleGeneral;
+    @ApiModelProperty(value = "总销售金额")
+    private int totalSalePrice;
+    @ApiModelProperty(value = "剩余库存")
+    private int surplusGeneral;
+    @ApiModelProperty(value = "演出状态")
+    private int status;
+    @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
+    private int auditStatus;
+    @ApiModelProperty(value = "拒绝理由")
+    private String rejectTxt;
+    @ApiModelProperty(value = "创建时间")
+    private String createdAt;
+
+    @ApiModelProperty(value = "返回数据赋值",hidden = true)
+    public void setStatus0Data(PerformanceCreateParam item){
+        this.performancesId=item.getPerformancesId();
+        this.title=item.getTitle();
+        this.timeStart=item.getTimeStart();
+        this.timeEnd=item.getTimeEnd();
+        this.totalGeneral=0;
+        this.saleGeneral=0;
+        this.totalSalePrice=0;
+        this.status=0;
+        this.auditStatus=-1;
+        this.rejectTxt="";
+        this.createdAt=item.getCreatedAt();
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinPerformancesPartnerService.java

 package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
+import com.liquidnet.service.kylin.dto.param.PerformanceListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerListVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 演出 服务类
@@ -20,11 +28,13 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
 
     boolean createStep2(PerformanceStep2Param step1Param);
 
-    PerformanceStep1Param getStep1(String performancesId);
+    PerformanceCreateParam getStep1(String performancesId);
 
     PerformanceStep2Param getStep2(String performancesId);
 
     boolean onLinePerformance(String performancesId);
 
     boolean outLinePerformance(String performancesId);
+
+    PageInfo<PerformancePartnerListDao> getList(PerformanceListParam performanceListParam);
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformancePartnerListDao.java

+package com.liquidnet.service.kylin.dao;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PerformancePartnerListDao {
+
+    //演出数据
+    @ApiModelProperty(value = "主键id")
+    private String performancesId;
+    @ApiModelProperty(value = "标题")
+    private String title;
+    @ApiModelProperty(value = "开演时间")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "总库存")
+    private int totalGeneral;
+    @ApiModelProperty(value = "销售库存")
+    private int saleGeneral;
+    @ApiModelProperty(value = "总销售金额")
+    private int totalSalePrice;
+    @ApiModelProperty(value = "总销售金额")
+    private int surplusGeneral;
+    @ApiModelProperty(value = "演出状态")
+    private int status;
+    @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
+    private int auditStatus;
+    @ApiModelProperty(value = "拒绝理由")
+    private String rejectTxt;
+    @ApiModelProperty(value = "创建时间")
+    private String createdAt;
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java

 package com.liquidnet.service.kylin.mapper;
 
+import com.liquidnet.service.kylin.dao.FieldMisListDao;
+import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 演出 Mapper 接口
@@ -13,4 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
 
+    //列表
+    List<PerformancePartnerListDao> partnerPerformanceList(Map<String,Object> map);
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -2,4 +2,90 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinPerformancesMapper">
 
+    <resultMap id="partnerPerformanceListResult" type="com.liquidnet.service.kylin.dao.PerformancePartnerListDao">
+        <result column="performances_id" property="performancesId"/>
+        <result column="title" property="title"/>
+        <result column="time_start" property="timeStart"/>
+        <result column="time_end" property="timeEnd"/>
+        <result column="total_general" property="totalGeneral"/>
+        <result column="sale_general" property="saleGeneral"/>
+        <result column="total_sale_price" property="totalSalePrice"/>
+        <result column="surplus_general" property="surplusGeneral"/>
+        <result column="status" property="status"/>
+        <result column="audit_status" property="auditStatus"/>
+        <result column="reject_txt" property="rejectTxt"/>
+        <result column="created_at" property="createdAt"/>
+    </resultMap>
+
+    <!-- 列表封装 -->
+    <sql id="partner_performance_list_Column">
+
+    </sql>
+
+    <!-- 第三方演出列表 (不包含退票信息) -->
+    <select id="partnerPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
+        SELECT
+        p.performances_id ,
+        p.title ,
+        p.time_start ,
+        p.time_end ,
+        t.total_general ,
+        IFNULL(ot.sale_general , 0) AS 'sale_general' ,
+        IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
+        IFNULL(
+        (
+        t.total_general - ot.sale_general
+        ) ,
+        0
+        ) AS 'surplus_general' ,
+        ps.`status` ,
+        ps.audit_status ,
+        p.reject_txt ,
+        p.created_at
+        FROM
+        kylin_performances AS p
+        LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
+        LEFT JOIN kylin_performance_relations AS pr ON p.performances_id = pr.performance_id
+        LEFT JOIN(
+        SELECT
+        ttr.performance_id ,
+        ts.ticket_id ,
+        sum(ts.total_general) AS 'total_general'
+        FROM
+        kylin_ticket_status AS ts
+        LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+        LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
+        ) AS t ON p.performances_id = t.performance_id
+        LEFT JOIN(
+        SELECT
+        sum(ot.number) AS 'sale_general' ,
+        sum(ot.price_actual) AS 'total_sale_price' ,
+        ote.performance_id AS 'performance_id'
+        FROM
+        kylin_order_tickets AS ot
+        LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
+        LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
+        WHERE
+        ots.`status` = 0
+        OR ots.`status` = 1
+        ) AS ot ON ot.performance_id = p.performances_id
+        <where>
+            <if test="title!=''">
+                AND title LIKE LIKE concat('%', #{title}, '%')
+            </if>
+            <if test="status!='-2'">
+                AND ps.STATUS = #{status}
+            </if>
+            <if test="auditStatus!='-2'">
+                AND ps.audit_status = #{auditStatus}
+            </if>
+            <if test="timeStart!=''">
+                AND p.time_start BETWEEN #{timeStart} AND #{timeEnd}
+            </if>
+            <if test="stopSellTime!=''">
+                AND p.time_end LIKE concat('%', #{stopSellTime}, '%')
+            </if>
+        </where>
+        ORDER BY #{orderItem} #{orderSc}
+    </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -18,14 +18,6 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <!-- api -->
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-api-feign-sequence</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
         <!-- common -->
         <dependency>
             <groupId>com.liquidnet</groupId>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java

 package com.liquidnet.service.kylin.controller.partner;
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
+import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
+import com.liquidnet.service.kylin.dto.param.PerformanceListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerListVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,6 +15,8 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
 @Api(tags = "第三方-演出")
 @RestController
 @RequestMapping("partner/performance")
@@ -18,6 +25,19 @@ public class PerformancePartnerController {
     @Autowired
     private KylinPerformancesPartnerServiceImpl performancesPartnerService;
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "演出列表")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PageInfo<PerformancePartnerListDao>> getList(@RequestBody PerformanceListParam performanceListParam) {
+        PageInfo<PerformancePartnerListDao> result = null;
+        result = performancesPartnerService.getList(performanceListParam);
+        if (null == result) {
+            return ResponseDto.failure("列表获取失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
     @PostMapping(value = "step1")
     @ApiOperation(value = "创建演出第一步")
     @ApiResponse(code = 200, message = "接口返回对象参数")
@@ -45,8 +65,8 @@ public class PerformancePartnerController {
     @GetMapping(value = "step1")
     @ApiOperation(value = "获取演出第一步数据")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformanceStep1Param> createStep1(@RequestParam("performancesId") String performancesId) {
-        PerformanceStep1Param result = performancesPartnerService.getStep1(performancesId);
+    public ResponseDto<PerformanceCreateParam> createStep1(@RequestParam("performancesId") String performancesId) {
+        PerformanceCreateParam result = performancesPartnerService.getStep1(performancesId);
         if (result==null) {
             return ResponseDto.failure("获取数据失败");
         } else {

liquidnet-bus-support/liquidnet-support-zuul/pom.xml

@@ -37,5 +37,18 @@
 			<artifactId>liquidnet-common-service-base</artifactId>
 			<version>1.0-SNAPSHOT</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.liquidnet</groupId>
+			<artifactId>liquidnet-api-feign-adam</artifactId>
+			<version>1.0-SNAPSHOT</version>
+			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 </project>

liquidnet-bus-support/liquidnet-support-zuul/src/main/java/com/liquidnet/support/zuul/SupportZuulApplication.java

@@ -5,7 +5,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.core.env.Environment;
@@ -15,8 +14,8 @@ import java.net.UnknownHostException;
 import java.util.Arrays;
 
 @Slf4j
-@EnableFeignClients
 @EnableZuulProxy
+@EnableFeignClients(basePackages = {"com.liquidnet"})
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class SupportZuulApplication implements CommandLineRunner {
   @Autowired

liquidnet-bus-support/liquidnet-support-zuul/src/main/java/com/liquidnet/support/zuul/util/PathMatchUtil.java

+package com.liquidnet.support.zuul.util;
+
+import org.springframework.util.AntPathMatcher;
+
+public class PathMatchUtil {
+    private static AntPathMatcher matcher = new AntPathMatcher();
+
+    public static boolean isPathMatch(String pattern, String path) {
+        return matcher.match(pattern, path);
+    }
+}