添加标签API；

修改编辑用户资料API；
nickName纠正；
收藏、想要API陈列；

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

@@ -14,7 +14,7 @@ public class AdamCollectParam implements java.io.Serializable {
     private String type;
     @ApiModelProperty(position = 13, required = true, value = "内容标题[255]", example = "13111111111")
     private String contentTitle;
-    @ApiModelProperty(position = 14, required = true, value = "内容快照[30]", example = "北京")
+    @ApiModelProperty(position = 14, required = true, value = "内容快照[255]", 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/AdamDisposedParam.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 AdamDisposedParam 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 = "内容快照[255]", 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/AdamThirdPartParam.java

@@ -13,7 +13,7 @@ public class AdamThirdPartParam implements Serializable {
     @ApiModelProperty(position = 11, required = true, value = "第三方OPENID[64]")
     private String openId;
     @ApiModelProperty(position = 12, required = true, value = "昵称[64]", example = "Swagger")
-    private String nickName;
+    private String nickname;
     @ApiModelProperty(position = 13, required = true, value = "头像[255]", example = "http://pic.zhengzai.tv/default/avatar.png")
     private String avatar;
     @ApiModelProperty(position = 14, required = true, value = "平台类型[255]", allowableValues = "WEIBO,WECHAT,QQ")

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 com.liquidnet.service.adam.dto.vo.AdamTagParentVo;
+import com.liquidnet.service.adam.dto.vo.AdamTagVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel(value = "AdamUserInfoParam", description = "个人资料编辑参数")
 @Data
 public class AdamUserInfoParam implements java.io.Serializable {
@@ -13,15 +17,15 @@ public class AdamUserInfoParam implements java.io.Serializable {
     @ApiModelProperty(position = 12, required = true, value = "背景[255]", example = "https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png")
     private String background;
     @ApiModelProperty(position = 13, required = true, value = "昵称[32]", example = "Swagger")
-    private String nickName;
-    @ApiModelProperty(position = 14, required = true, value = "性别[32]", example = "MALE")
-    private String sex;
+    private String nickname;
+    @ApiModelProperty(position = 14, required = true, value = "性别[32]", example = "{\"val\":\"MS00\",\"desc\":\"其他性别\"}")
+    private AdamTagVo sex;
     @ApiModelProperty(position = 15, required = true, value = "生日[YYYY-MM-DD]", example = "2021-05-17")
     private String birthday;
     @ApiModelProperty(position = 16, required = true, value = "常住地/区域[100]", example = "北京 北京市 朝阳区")
     private String area;
     @ApiModelProperty(position = 17, required = true, value = "签名[255]", example = "...................")
     private String signature;
-    @ApiModelProperty(position = 18, required = true, value = "标签[500]", example = "民歌,金属乐")
-    private String tagMe;
+    @ApiModelProperty(position = 18, required = true, value = "标签[500]", example = "[{\"val\":\"MMS01\",\"desc\":\"民歌\",\"tagVos\":[{\"val\":\"MMS0101\",\"desc\":\"A\"},{\"val\":\"MMS0102\",\"desc\":\"B\"}]},{\"val\":\"MMS02\",\"desc\":\"house\",\"tagVos\":[{\"val\":\"MMS0201\",\"desc\":\"C\"}]}]")
+    private List<AdamTagParentVo> tagMe;
 }

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "AdamCollectionVo", description = "收获地址")
+@Data
+public class AdamCollectionVo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = -7983529662634429915L;
+    @ApiModelProperty(position = 10, value = "用户ID[64]")
+    private String uid;
+    @ApiModelProperty(position = 11, value = "内容ID[64]")
+    private String contentId;
+    @ApiModelProperty(position = 12, value = "内容标题[255]")
+    private String contentTitle;
+    @ApiModelProperty(position = 13, value = "内容快照[255]")
+    private String contentImg;
+    @ApiModelProperty(position = 14, value = "持续时间,单位S,VIDEO类型时存在[30]")
+    private Long duration;
+    @ApiModelProperty(position = 15, value = "内容类型[VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG]")
+    private String type;
+    @ApiModelProperty(position = 16, value = "1-正常,2-删除")
+    private Integer state;
+    @ApiModelProperty(position = 17, value = "收藏时间[yyyy-MM-dd HH:mm:ss]")
+    private String createdAt;
+    @ApiModelProperty(position = 18, value = "更新时间[yyyy-MM-dd HH:mm:ss]")
+    private String updatedAt;
+    @ApiModelProperty(position = 19, value = "备注")
+    private String comment;
+
+    private static final AdamCollectionVo obj = new AdamCollectionVo();
+
+    public static AdamCollectionVo getNew() {
+        try {
+            return (AdamCollectionVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamCollectionVo();
+    }
+}

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "AdamTagParentVo", description = "父级标签库")
+public class AdamTagParentVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -7965840594354555093L;
+    @ApiModelProperty(position = 11, value = "标签Key")
+    private String val;
+    @ApiModelProperty(position = 12, value = "标签名称")
+    private String desc;
+    @ApiModelProperty(position = 13, value = "子标签列表")
+    private List<AdamTagVo> tagVos;
+
+    private static final AdamTagParentVo obj = new AdamTagParentVo();
+
+    public static AdamTagParentVo getNew() {
+        try {
+            return (AdamTagParentVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamTagParentVo();
+    }
+
+    public String getVal() {
+        return val;
+    }
+
+    public AdamTagParentVo setVal(String val) {
+        this.val = val;
+        return this;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public AdamTagParentVo setDesc(String desc) {
+        this.desc = desc;
+        return this;
+    }
+
+    public List<AdamTagVo> getTagVos() {
+        return tagVos;
+    }
+
+    public AdamTagParentVo setTagVos(List<AdamTagVo> tagVos) {
+        this.tagVos = tagVos;
+        return this;
+    }
+}

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamTagVo", description = "标签库")
+public class AdamTagVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 5852327873275898342L;
+    @ApiModelProperty(position = 11, value = "标签Key")
+    private String val;
+    @ApiModelProperty(position = 12, value = "标签名称")
+    private String desc;
+
+    private static final AdamTagVo obj = new AdamTagVo();
+
+    public static AdamTagVo getNew() {
+        try {
+            return (AdamTagVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamTagVo();
+    }
+
+    public String getVal() {
+        return val;
+    }
+
+    public AdamTagVo setVal(String val) {
+        this.val = val;
+        return this;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public AdamTagVo setDesc(String desc) {
+        this.desc = desc;
+        return this;
+    }
+}

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel(value = "AdamUserInfoVo", description = "用户详情")
 @Data
 public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
@@ -13,11 +15,11 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 11, value = "手机号[20]")
     private String mobile;
     @ApiModelProperty(position = 12, value = "昵称[32]")
-    private String nickName;
+    private String nickname;
     @ApiModelProperty(position = 13, value = "状态[1-正常,2-注销]")
     private Integer state;
     @ApiModelProperty(position = 14, value = "性别[32]")
-    private String sex;
+    private AdamTagVo sex;
     @ApiModelProperty(position = 15, value = "生日[YYYY-MM-DD]")
     private String birthday;
     @ApiModelProperty(position = 16, value = "常住地/区域")
@@ -29,7 +31,7 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 19, value = "背景图")
     private String background;
     @ApiModelProperty(position = 20, value = "标签")
-    private String tagMe;
+    private List<AdamTagParentVo> tagMe;
     @ApiModelProperty(position = 21, value = "注册时间")
     private String createAt;
     @ApiModelProperty(position = 22, value = "最近一次更新时间")

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

@@ -45,9 +45,8 @@ public interface IAdamUserService extends IService<AdamUser> {
      *
      * @param uid
      * @param param
-     * @return List<AdamThirdPartInfoVo>
      */
-    List<AdamThirdPartInfoVo> bindTpa(String uid, AdamThirdPartParam param);
+    void bindTpa(String uid, AdamThirdPartParam param);
 
     /**
      * 第三方账号绑定（存在已绑定账号）

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

@@ -39,7 +39,7 @@ public class AdamThirdParty implements Serializable {
     /**
      * 第三方昵称
      */
-    private String nickName;
+    private String nickname;
 
     /**
      * 平台名称

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

@@ -29,7 +29,7 @@ public class AdamUserInfo implements Serializable {
     /**
      * 昵称
      */
-    private String nickName;
+    private String nickname;
 
     /**
      * 性别

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -9,7 +9,7 @@ create table adam_third_party
     uid        varchar(64) default '',
     open_id    varchar(64) comment '第三方ID',
     avatar     varchar(255) comment '第三方头像',
-    nick_name  varchar(64) comment '第三方昵称',
+    nickname   varchar(64) comment '第三方昵称',
     platform   varchar(20) comment '平台名称',
     state      tinyint comment '0-INIT,1-NORMAL,2-INVALID',
     created_at datetime,
@@ -72,7 +72,7 @@ create table adam_user_info
 (
     mid        int unsigned auto_increment primary key,
     uid        varchar(64) not null,
-    nick_name  varchar(32) comment '昵称',
+    nickname   varchar(32) comment '昵称',
     sex        varchar(32) comment '性别',
     birthday   date comment '生日YYYY-MM-DD',
     area       varchar(100) comment '常住地/区域',

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.controller;
 import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.adam.dto.AdamCollectParam;
 import io.swagger.annotations.Api;
@@ -31,10 +32,9 @@ public class AdamCollectionController {
     @ApiOperation(value = "添加收藏")
     @PostMapping("add")
     public ResponseDto<Object> add(@RequestBody AdamCollectParam parameter) {
-        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
-        String uid = "1";
+        // TODO: 2021/4/28 数据校验
+        String currentUid = CurrentUtil.getCurrentUid();
 
-        // TODO: 2021/5/10
 
 
         return ResponseDto.success();
@@ -58,7 +58,7 @@ public class AdamCollectionController {
     }
 
     @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "收藏列表 -> 返回结构待定:遵循原PHP.API查询Collection内容")
+    @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 = "Integer", name = "pageNum", value = "页展示条数"),

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

+package com.liquidnet.service.adam.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.adam.dto.AdamCollectParam;
+import com.liquidnet.service.base.ResponseDto;
+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
+ */
+@ApiSupport(order = 10050)
+@Api(tags = "想去")
+@Slf4j
+@RestController
+@RequestMapping("disposed")
+public class AdamDisposedController {
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "添加")
+    @PostMapping("add")
+    public ResponseDto<Object> add(@RequestBody AdamCollectParam parameter) {
+        // TODO: 2021/4/28 数据校验
+        String currentUid = CurrentUtil.getCurrentUid();
+
+
+
+        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 = "想去列表")
+    @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/AdamLoginController.java

@@ -110,9 +110,9 @@ public class AdamLoginController {
     @PostMapping(value = {"login/sms"})
     public ResponseDto<AdamLoginInfoVo> loginBySms(@RequestParam String mobile, @RequestParam String code) {
         // TODO: 2021/5/12 参数检验
-        log.info("mobile:{},pwd:{}", mobile, code);
+        log.info("mobile:{},code:{}", mobile, code);
 
-        if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure("验证码无效");
+        if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure(ErrorMapping.get("10002"));
 
         String uid = adamUserService.queryUidByRedis(mobile);
         AdamUserInfoVo userInfoVo =
@@ -143,7 +143,7 @@ public class AdamLoginController {
         log.info("login by mobile access token:{}", accessToken);
 
         String mobile = this.getMobile(accessToken);
-        if (StringUtils.isEmpty(mobile)) return ResponseDto.failure("手机号获取失败，请更换登录方式");
+        if (StringUtils.isEmpty(mobile)) return ResponseDto.failure(ErrorMapping.get("10005"));
 
         String uid = adamUserService.queryUidByRedis(mobile);
         AdamUserInfoVo userInfoVo =
@@ -173,13 +173,13 @@ public class AdamLoginController {
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
         if (StringUtils.isEmpty(parameter.getMobile())) {
             String uid = adamUserService.queryUidByRedis(parameter.getOpenId(), parameter.getPlatform());
-            if (StringUtils.isEmpty(uid)) return ResponseDto.failure("第三方账号未注册");
+            if (StringUtils.isEmpty(uid)) return ResponseDto.failure(ErrorMapping.get("10006"));
 
             loginInfoVo.setUserInfo(adamUserService.queryByUid(uid));
             loginInfoVo.setRealNameInfo(adamRealNameService.queryByUid(uid));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(uid));
         } else {// 新账号注册
-            if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode())) return ResponseDto.failure("验证码无效");
+            if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode())) return ResponseDto.failure(ErrorMapping.get("10002"));
 
             loginInfoVo.setUserInfo(adamUserService.register(parameter));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(loginInfoVo.getUserInfo().getUid()));

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

@@ -8,6 +8,8 @@ import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
+import com.liquidnet.service.adam.dto.vo.AdamTagParentVo;
+import com.liquidnet.service.adam.dto.vo.AdamTagVo;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.service.IAdamThirdPartyService;
@@ -26,8 +28,7 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @ApiSupport(order = 10020)
 @Api(tags = "用户中心")
@@ -55,7 +56,7 @@ public class AdamUserController {
         AdamUserInfoVo editUserInfoVo = adamUserService.queryByUid(currentUid);
         editUserInfoVo.setAvatar(parameter.getAvatar());
         editUserInfoVo.setBackground(parameter.getBackground());
-        editUserInfoVo.setNickName(parameter.getNickName());
+        editUserInfoVo.setNickname(parameter.getNickname());
         editUserInfoVo.setSex(parameter.getSex());
         editUserInfoVo.setBirthday(parameter.getBirthday());
         editUserInfoVo.setArea(parameter.getArea());
@@ -70,6 +71,58 @@ public class AdamUserController {
     }
 
     @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "音乐风格")
+    @GetMapping(value = {"tag/ms"})
+    public ResponseDto<List<AdamTagParentVo>> getMsTag() {
+        List<AdamTagParentVo> tagMsVoList = new ArrayList<>();
+        tagMsVoList.add(AdamTagParentVo.getNew().setVal("MMS01").setDesc("民歌").setTagVos(Arrays.asList(
+                AdamTagVo.getNew().setVal("MMS0101").setDesc("A"),
+                AdamTagVo.getNew().setVal("MMS0102").setDesc("B")
+        )));
+        tagMsVoList.add(AdamTagParentVo.getNew().setVal("MMS02").setDesc("house").setTagVos(Arrays.asList(
+                AdamTagVo.getNew().setVal("MMS0201").setDesc("C"),
+                AdamTagVo.getNew().setVal("MMS0202").setDesc("D")
+        )));
+        tagMsVoList.add(AdamTagParentVo.getNew().setVal("MMS03").setDesc("R&B").setTagVos(Arrays.asList(
+                AdamTagVo.getNew().setVal("MMS0301").setDesc("E"),
+                AdamTagVo.getNew().setVal("MMS0302").setDesc("F")
+        )));
+        return ResponseDto.success(tagMsVoList);
+    }
+
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "性别列表")
+    @GetMapping(value = {"tag/sex"})
+    public ResponseDto<List<AdamTagVo>> getSexTag() {
+        List<AdamTagVo> tagSexVoList = new ArrayList<>();
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS00").setDesc("其他性别"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS01").setDesc("男性"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS02").setDesc("女性"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS03").setDesc("跨性别女性"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS04").setDesc("跨性别男性"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS05").setDesc("双性别者"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS06").setDesc("性别模糊"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS07").setDesc("性别流动"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS08").setDesc("无性别者"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS09").setDesc("不确定性别"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS10").setDesc("不在乎性别"));
+        return ResponseDto.success(tagSexVoList);
+//        Map<String, String> tagSexVos = new HashMap<>();
+//        tagSexVos.put("MS00", "其他性别");
+//        tagSexVos.put("MS01", "男性");
+//        tagSexVos.put("MS02", "女性");
+//        tagSexVos.put("MS03", "跨性别女性");
+//        tagSexVos.put("MS04", "跨性别男性");
+//        tagSexVos.put("MS05", "双性别者");
+//        tagSexVos.put("MS06", "性别模糊");
+//        tagSexVos.put("MS07", "性别流动");
+//        tagSexVos.put("MS08", "无性别者");
+//        tagSexVos.put("MS09", "不确定性别");
+//        tagSexVos.put("MS10", "不在乎性别");
+//        return ResponseDto.success(tagSexVos);
+    }
+
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "手机号修改")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "新手机号"),
@@ -89,7 +142,7 @@ public class AdamUserController {
         return ResponseDto.success();
     }
 
-//    @ApiOperationSupport(order = 3)
+//    @ApiOperationSupport(order = 5)
 //    @ApiOperation(value = "密码修改")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
@@ -106,7 +159,7 @@ public class AdamUserController {
 //        return ResponseDto.success();
 //    }
 
-    @ApiOperationSupport(order = 4)
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "绑定第三方账号")
     @PostMapping(value = {"tpa/bind"})
     public ResponseDto<List<AdamThirdPartInfoVo>> bindTpa(@RequestBody AdamThirdPartParam parameter) {
@@ -125,10 +178,11 @@ public class AdamUserController {
             }
             return ResponseDto.failure("第三方账号已绑定其它手机号");
         }
-        return ResponseDto.success(adamUserService.bindTpa(currentUid, parameter));
+        adamUserService.bindTpa(currentUid, parameter);
+        return ResponseDto.success(adamThirdPartyService.queryByUid(currentUid));
     }
 
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "解绑第三方账号")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "platform", value = "平台类型", allowableValues = "WEIBO,WECHAT,QQ"),

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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -34,9 +34,9 @@ public class AdamThirdPartyServiceImpl extends ServiceImpl<AdamThirdPartyMapper,
     @Override
     public List<AdamThirdPartInfoVo> queryByUid(String uid) {
         List<AdamThirdPartInfoVo> thirdPartInfoVos = (List<AdamThirdPartInfoVo>) redisUtil.hget(AdamRedisConst.INFO_THIRD_PARTY, uid);
-        if (null == thirdPartInfoVos) {
+        if (CollectionUtils.isEmpty(thirdPartInfoVos)) {
             thirdPartInfoVos = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
-                    AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
+                    AdamThirdPartInfoVo.class);
 
             redisUtil.hset(AdamRedisConst.INFO_THIRD_PARTY, uid, thirdPartInfoVos);
         }

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

@@ -56,7 +56,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
         );
 
         List<Object> paramList = Arrays.asList(
-                userInfoVo.getNickName(),
+                userInfoVo.getNickname(),
                 userInfoVo.getSex(),
                 userInfoVo.getBirthday(),
                 userInfoVo.getArea(),

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

@@ -149,7 +149,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     }
 
     @Override
-    public List<AdamThirdPartInfoVo> bindTpa(String uid, AdamThirdPartParam param) {
+    public void bindTpa(String uid, AdamThirdPartParam param) {
         LocalDateTime now = LocalDateTime.now();
         String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
 
@@ -164,11 +164,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
         redisUtil.hset(AdamRedisConst.INFO_IDENTITY_THIRD_PARTY, param.getPlatform().concat(param.getOpenId()), uid);
 
-        List<AdamThirdPartInfoVo> thirdPartInfoVos = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
-                AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
-        redisUtil.hset(AdamRedisConst.INFO_THIRD_PARTY, uid, thirdPartInfoVos);
-
-        return thirdPartInfoVos;
+        redisUtil.hdel(AdamRedisConst.INFO_THIRD_PARTY, uid);
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

 10001=验证码发送失败
-10002=
-
+10002=验证码无效
+10003=
+10004=
+10005=手机号获取失败，请更换登录方式
+10006=第三方账号未注册
+10007=
 
 
 10101=

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap/adam_third_party.properties

-adam_third_party.add=insert into ln_adam.adam_third_party (`uid`, open_id, avatar, nick_name, platform, `state`, created_at, updated_at, `comment`) values (?,?,?,?,?,?,?,?,?)
+adam_third_party.add=insert into ln_adam.adam_third_party (`uid`, open_id, avatar, nickname, platform, `state`, created_at, updated_at, `comment`) values (?,?,?,?,?,?,?,?,?)
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap/adam_user_info.properties

-adam_user_info.add=insert into adam_user_info (nick_name, sex, birthday, area, signature, avatar, background, qr_code, qr_pic, tag_me, `uid`) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
-adam_user_info.edit=UPDATE ln_adam.adam_user_info SET nick_name=?, sex=?, birthday=?, area=?, signature=?, avatar=?, background=?, qr_code=?, qr_pic=?, tag_me=? WHERE uid=? 
+adam_user_info.add=insert into adam_user_info (nickname, sex, birthday, area, signature, avatar, background, qr_code, qr_pic, tag_me, `uid`) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
+adam_user_info.edit=UPDATE ln_adam.adam_user_info SET nickname=?, sex=?, birthday=?, area=?, signature=?, avatar=?, background=?, qr_code=?, qr_pic=?, tag_me=? WHERE uid=? 
\ No newline at end of file