feat : sdk后台完成游戏分类接口, 代码提交

game-module/game-common/src/main/java/com/zanxiang/common/domain/ResultVo.java

@@ -96,4 +96,8 @@ public class ResultVo<T> implements Serializable {
     public static <T> ResultVo<T> ok() {
         return new ResultVo<>(HttpStatusEnum.SUCCESS.getCode(), HttpStatusEnum.SUCCESS.getMsg());
     }
+
+    public static <T> ResultVo<T> ok(T data) {
+        return new ResultVo<>(HttpStatusEnum.SUCCESS.getCode(), HttpStatusEnum.SUCCESS.getMsg(), data);
+    }
 }

game-module/game-common/src/main/java/com/zanxiang/common/enums/CmfSaltEnum.java

@@ -1,30 +0,0 @@
-package com.zanxiang.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-09
- * @description : cmf加密盐值
- */
-@Getter
-@AllArgsConstructor
-public enum CmfSaltEnum {
-
-    /**
-     * 密码加密盐值
-     */
-    CMF_PASSWORD("ZX_PASSWORD_SALT", "密码加密盐值");
-
-    /**
-     * 盐值
-     */
-    private String salt;
-
-    /**
-     * 描述
-     */
-    private String describe;
-
-}

game-module/game-common/src/main/java/com/zanxiang/common/enums/GameCategoryEnum.java

@@ -0,0 +1,34 @@
+package com.zanxiang.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏分类标签
+ */
+@Getter
+@AllArgsConstructor
+public enum GameCategoryEnum {
+
+    /**
+     * 苹果正版sdk
+     */
+    GAME_TYPE(1, "游戏类型（微信小游戏/抖音小游戏/h5/app等）"),
+
+    /**
+     * 苹果免越狱sdk
+     */
+    GAME_LABEL(2, "游戏分类（策略游戏/卡牌游戏/）");
+
+    /**
+     * 设备类型
+     */
+    private Integer categoryType;
+
+    /**
+     * 描述
+     */
+    private String describe;
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/CpController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
  * @time : 2022-06-22
  * @description : cp管理接口
  */
-@Api(tags = {"cp管理接口"})
+@Api(tags = {"CP管理接口"})
 @RestController
 @RequestMapping("/cp")
 @Slf4j

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/GameCategoryController.java

@@ -0,0 +1,62 @@
+package com.zanxiang.manage.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zanxiang.common.domain.ResultVo;
+import com.zanxiang.manage.domain.params.GameCategoryAddUpdateParam;
+import com.zanxiang.manage.domain.params.GameCategoryListParam;
+import com.zanxiang.manage.domain.vo.GameCategoryParentVO;
+import com.zanxiang.manage.domain.vo.GameCategoryVO;
+import com.zanxiang.manage.service.GameCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏分类标签
+ */
+@Api(tags = {"游戏分类标签管理接口"})
+@RestController
+@RequestMapping("/game/category")
+@Slf4j
+public class GameCategoryController {
+
+    @Autowired
+    private GameCategoryService gameCategoryService;
+
+    @ApiOperation(value = "查询所有父标签列表")
+    @GetMapping(value = "/parent/list")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameCategoryParentVO.class, responseContainer = "list")})
+    public ResultVo<List<GameCategoryParentVO>> getGameCategoryParent(@RequestParam(required = false, defaultValue = "2") Integer type) {
+        return ResultVo.ok(gameCategoryService.getGameCategoryParent(type));
+    }
+
+    @ApiOperation(value = "查询游戏标签列表")
+    @PostMapping(value = "/list")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameCategoryVO.class)})
+    public ResultVo<IPage<GameCategoryVO>> list(@Validated @RequestBody GameCategoryListParam param) {
+        return ResultVo.ok(gameCategoryService.list(param));
+    }
+
+    @ApiOperation(value = "游戏标签分类添加或修改")
+    @PostMapping(value = "/add/or/update")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
+    public ResultVo<Boolean> addOrUpdate(@Validated @RequestBody GameCategoryAddUpdateParam param) {
+        return ResultVo.ok(gameCategoryService.addOrUpdate(param));
+    }
+
+    @ApiOperation(value = "cp新增或者更新")
+    @DeleteMapping(value = "/delete/by/id")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
+    public ResultVo<Boolean> deleteById(@RequestParam Long id) {
+        return ResultVo.ok(gameCategoryService.deleteById(id));
+    }
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/GameCategoryAddUpdateParam.java

@@ -0,0 +1,40 @@
+package com.zanxiang.manage.domain.params;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 分类标签
+ */
+@Data
+public class GameCategoryAddUpdateParam {
+
+    /**
+     * id
+     */
+    @ApiModelProperty(notes = "id, 不传id为新增, 传id为修改")
+    private Long id;
+
+    /**
+     * 父标签id
+     */
+    @ApiModelProperty(notes = "父标签id")
+    private Long parentId;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "标签分类名称不可为空")
+    @ApiModelProperty(notes = "名称")
+    private String name;
+
+    /**
+     * 标签描述
+     */
+    @ApiModelProperty(notes = "标签描述")
+    private String remark;
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/GameCategoryListParam.java

@@ -0,0 +1,26 @@
+package com.zanxiang.manage.domain.params;
+
+import com.zanxiang.common.base.BasePage;
+import com.zanxiang.mybatis.entity.GameCategory;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 标签查询
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GameCategoryListParam extends BasePage<GameCategory> {
+
+    /**
+     * 标签名称
+     */
+    private String labelName;
+
+    /**
+     * 是否父标签
+     */
+    private Boolean isParent;
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/GameCategoryParentVO.java

@@ -0,0 +1,25 @@
+package com.zanxiang.manage.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description :
+ */
+@Data
+public class GameCategoryParentVO {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(notes = "主键id")
+    private String id;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(notes = "名称")
+    private String name;
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/GameCategoryVO.java

@@ -0,0 +1,72 @@
+package com.zanxiang.manage.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 标签列表查询
+ */
+@ApiModel
+@Data
+public class GameCategoryVO {
+
+    /**
+     * id
+     */
+    @ApiModelProperty(notes = "id")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(notes = "名称")
+    private String name;
+
+    /**
+     * 父标签id
+     */
+    @ApiModelProperty(notes = "父标签id")
+    private Long parentId;
+
+    /**
+     * 父标签名称
+     */
+    @ApiModelProperty(notes = "父标签名称")
+    private String parentName;
+
+    /**
+     * 标签描述
+     */
+    @ApiModelProperty(notes = "标签描述")
+    private String remark;
+
+    /**
+     * 操作者id
+     */
+    @ApiModelProperty(notes = "操作者id")
+    private Long operatorId;
+
+    /**
+     * 操作者名字
+     */
+    @ApiModelProperty(notes = "操作者名字")
+    private String operatorName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(notes = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(notes = "更新时间")
+    private LocalDateTime updateTime;
+
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/CpService.java

@@ -17,7 +17,8 @@ public interface CpService extends IService<Cp> {
     /**
      * 新增或者更新cp信息
      *
-     * @param param : 新增或者更新的参数
+     * @param param 新增或者更新的参数
+     * @return : 返回新增修改结果
      */
     boolean addOrUpdate(CpAddUpdateParam param);
 

game-module/game-manage/src/main/java/com/zanxiang/manage/service/GameCategoryService.java

@@ -0,0 +1,51 @@
+package com.zanxiang.manage.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.manage.domain.params.GameCategoryAddUpdateParam;
+import com.zanxiang.manage.domain.params.GameCategoryListParam;
+import com.zanxiang.manage.domain.vo.GameCategoryParentVO;
+import com.zanxiang.manage.domain.vo.GameCategoryVO;
+import com.zanxiang.mybatis.entity.GameCategory;
+
+import java.util.List;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏分类标签管理
+ */
+public interface GameCategoryService extends IService<GameCategory> {
+
+    /**
+     * 查询所有父标签列表
+     *
+     * @param type : 标签分类
+     * @return : 返回所有父游戏标签
+     */
+    List<GameCategoryParentVO> getGameCategoryParent(Integer type);
+
+    /**
+     * 查询游戏标签列表
+     *
+     * @param param : 游戏标签列表查询呢参数
+     * @return : 返回分页信息
+     */
+    IPage<GameCategoryVO> list(GameCategoryListParam param);
+
+    /**
+     * 游戏标签分类添加或修改
+     *
+     * @param param : 参数
+     * @return : 返回结果
+     */
+    Boolean addOrUpdate(GameCategoryAddUpdateParam param);
+
+    /**
+     * 根据主键id删除
+     *
+     * @param id : 主键id
+     * @return : 删除结果
+     */
+    Boolean deleteById(Long id);
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/CpServiceImpl.java

@@ -2,9 +2,7 @@ package com.zanxiang.manage.service.Impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.utils.StringUtils;
@@ -16,7 +14,6 @@ import com.zanxiang.manage.service.CpService;
 import com.zanxiang.mybatis.entity.Cp;
 import com.zanxiang.mybatis.mapper.CpMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -34,7 +31,8 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements CpServic
     /**
      * 新增或者更新cp信息
      *
-     * @param param : 新增或者更新的参数
+     * @param param 新增或者更新的参数
+     * @return : 返回新增修改结果
      */
     @Override
     public boolean addOrUpdate(CpAddUpdateParam param) {
@@ -61,7 +59,7 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements CpServic
             throw new BaseException("cp名称已经存在");
         }
         //创建
-        Cp cp = Cp.builder()
+        return super.save(Cp.builder()
                 .cpName(param.getCpName())
                 .companyName(param.getCompanyName())
                 .linkMan(param.getLinkMan())
@@ -70,8 +68,7 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements CpServic
                 .remark(param.getRemark())
                 .createTime(LocalDateTime.now())
                 .updateTime(LocalDateTime.now())
-                .build();
-        return super.save(cp);
+                .build());
     }
 
     /**
@@ -82,11 +79,6 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements CpServic
      */
     @Override
     public IPage<CpVO> list(CpListParam param) {
-        LambdaQueryWrapper<Cp> queryWrapper = Wrappers.lambdaQuery();
-        if (Strings.isNotBlank(param.getCpName())) {
-            queryWrapper.like(Cp::getCpName, param.getCpName());
-        }
-        queryWrapper.orderByDesc(Cp::getCreateTime);
         return page(param.toPage(), new QueryWrapper<Cp>().lambda()
                 .like(StringUtils.isNotBlank(param.getCpName()), Cp::getCpName, param.getCpName())
                 .orderByDesc(Cp::getCreateTime)
@@ -114,10 +106,7 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements CpServic
      */
     @Override
     public boolean deleteById(Long id) {
-        return super.update(new LambdaUpdateWrapper<Cp>()
-                .set(Cp::getIsDelete, Boolean.TRUE)
-                .set(Cp::getDeleteTime, LocalDateTime.now())
-                .eq(Cp::getId, id));
+        return super.removeById(id);
     }
 
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/GameCategoryServiceImpl.java

@@ -0,0 +1,128 @@
+package com.zanxiang.manage.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.common.enums.GameCategoryEnum;
+import com.zanxiang.common.exception.BaseException;
+import com.zanxiang.common.utils.StringUtils;
+import com.zanxiang.common.utils.bean.BeanUtils;
+import com.zanxiang.manage.domain.params.GameCategoryAddUpdateParam;
+import com.zanxiang.manage.domain.params.GameCategoryListParam;
+import com.zanxiang.manage.domain.vo.GameCategoryParentVO;
+import com.zanxiang.manage.domain.vo.GameCategoryVO;
+import com.zanxiang.manage.service.GameCategoryService;
+import com.zanxiang.mybatis.entity.GameCategory;
+import com.zanxiang.mybatis.mapper.GameCategoryMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-23
+ * @description : 游戏分类标签管理
+ */
+@Slf4j
+@Service
+public class GameCategoryServiceImpl extends ServiceImpl<GameCategoryMapper, GameCategory> implements GameCategoryService {
+
+    /**
+     * 查询所有父标签列表
+     *
+     * @param type : 标签分类
+     * @return : 返回所有父游戏标签
+     */
+    @Override
+    public List<GameCategoryParentVO> getGameCategoryParent(Integer type) {
+        List<GameCategory> gameCategoryList = list(new LambdaQueryWrapper<GameCategory>()
+                .eq(GameCategory::getType, type));
+        return BeanUtils.copyList(gameCategoryList, GameCategoryParentVO.class);
+    }
+
+    /**
+     * 查询游戏标签列表
+     *
+     * @param param : 游戏标签列表查询呢参数
+     * @return : 返回分页信息
+     */
+    @Override
+    public IPage<GameCategoryVO> list(GameCategoryListParam param) {
+        return page(param.toPage(), new QueryWrapper<GameCategory>().lambda()
+                .like(StringUtils.isNotBlank(param.getLabelName()), GameCategory::getName, param.getLabelName())
+                .eq(Objects.equals(param.getIsParent(), Boolean.TRUE), GameCategory::getParentId, 0)
+                .eq(GameCategory::getType, GameCategoryEnum.GAME_LABEL.getCategoryType())
+                .orderByDesc(GameCategory::getCreateTime))
+                .convert(this::toVo);
+    }
+
+    /**
+     * 游戏标签对象转换
+     *
+     * @param gameCategory : 游戏标签信息
+     * @return : 返回游戏标签vo
+     */
+    private GameCategoryVO toVo(GameCategory gameCategory) {
+        if (Objects.isNull(gameCategory)) {
+            return null;
+        }
+        return BeanUtils.copy(gameCategory, GameCategoryVO.class);
+    }
+
+    /**
+     * 游戏标签分类添加或修改
+     *
+     * @param param : 参数
+     * @return : 返回结果
+     */
+    @Override
+    public Boolean addOrUpdate(GameCategoryAddUpdateParam param) {
+        Long id = param.getId();
+        Long parentId = param.getParentId() == null ? 0 : param.getParentId();
+        //更新
+        if (id != null) {
+            GameCategory gameCategory = super.getById(id);
+            if (gameCategory == null) {
+                throw new BaseException("参数错误, 游戏分类标签信息不存在");
+            }
+            gameCategory.setParentId(parentId);
+            gameCategory.setName(param.getName());
+            gameCategory.setRemark(param.getRemark());
+            gameCategory.setUpdateTime(LocalDateTime.now());
+            return super.updateById(gameCategory);
+        }
+        //判断cp名称是否已经存在
+        int count = super.count(new LambdaQueryWrapper<GameCategory>()
+                .eq(GameCategory::getName, param.getName()));
+        if (count > 0) {
+            throw new BaseException("游戏分类标签名称已经存在");
+        }
+        //创建
+        return super.save(GameCategory.builder()
+                .type(GameCategoryEnum.GAME_LABEL.getCategoryType())
+                .name(param.getName())
+                .remark(param.getRemark())
+                .parentId(parentId)
+                .operatorId(1L)
+                .operatorName("赞象admin")
+                .createTime(LocalDateTime.now())
+                .updateTime(LocalDateTime.now())
+                .build());
+    }
+
+    /**
+     * 根据主键id删除
+     *
+     * @param id : 主键id
+     * @return : 删除结果
+     */
+    @Override
+    public Boolean deleteById(Long id) {
+        return super.removeById(id);
+    }
+
+}

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Cp.java

@@ -60,6 +60,7 @@ public class Cp {
     /**
      * 渠道
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long channel;
 
     /**
@@ -68,11 +69,6 @@ public class Cp {
     @TableLogic
     private Integer isDelete;
 
-    /**
-     * 删除时间
-     */
-    private LocalDateTime deleteTime;
-
     /**
      * 创建时间
      */

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameCategory.java

@@ -1,8 +1,6 @@
 package com.zanxiang.mybatis.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -29,23 +27,40 @@ public class GameCategory {
     /**
      * 分类类型 1、游戏类型（微信小游戏/抖音小游戏/h5/app等） 2、游戏分类（策略游戏/卡牌游戏/）
      */
-    private Boolean type;
+    private Integer type;
 
     /**
-     * 名称
+     * 标签名称
      */
     private String name;
 
     /**
-     * 状态 2为启用 1 为禁用
+     * 备注
      */
-    private Boolean status;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String remark;
 
     /**
      * 父分类id(顶层游戏分类为0)
      */
     private Long parentId;
 
+    /**
+     * 操作者id
+     */
+    private Long operatorId;
+
+    /**
+     * 操作者名字
+     */
+    private String operatorName;
+
+    /**
+     * 1 删除  0 正常
+     */
+    @TableLogic
+    private Integer isDelete;
+
     /**
      * 创建时间
      */

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/RegisterLoginController.java

@@ -33,30 +33,32 @@ public class RegisterLoginController {
     @PostMapping("/register/password")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
     public ResultVo<UserLoginVO> registerPassword(@Validated @RequestBody RegisterPasswordParam registerPasswordParam,
-                                                  HttpServletRequest request) {
-        return registerPassword.registerPassword(registerPasswordParam, request);
+                                                  HttpServletRequest request, UserData userData) {
+        return registerPassword.registerPassword(registerPasswordParam, request, userData);
     }
 
     @ApiOperation(value = "用户手机注册")
     @PostMapping("/register/mobile")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
     public ResultVo<UserLoginVO> registerMobile(@Validated @RequestBody RegisterMobileParam registerMobileParam,
-                                                HttpServletRequest request) {
-        return registerPassword.registerMobile(registerMobileParam, request);
+                                                HttpServletRequest request, UserData userData) {
+        return registerPassword.registerMobile(registerMobileParam, request, userData);
     }
 
     @ApiOperation(value = "用户名密码登录")
     @PostMapping("/login/password")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVo<UserLoginVO> loginPassword(@Validated @RequestBody LoginPasswordParam userLoginParam, HttpServletRequest request) {
-        return registerPassword.loginPassword(userLoginParam, request);
+    public ResultVo<UserLoginVO> loginPassword(@Validated @RequestBody LoginPasswordParam userLoginParam,
+                                               HttpServletRequest request, UserData userData) {
+        return registerPassword.loginPassword(userLoginParam, request, userData);
     }
 
     @ApiOperation(value = "用户手机号登录")
     @PostMapping("/login/mobile")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVo<UserLoginVO> loginMobile(@Validated @RequestBody LoginMobileParam loginMobileParam, HttpServletRequest request) {
-        return registerPassword.loginMobile(loginMobileParam, request);
+    public ResultVo<UserLoginVO> loginMobile(@Validated @RequestBody LoginMobileParam loginMobileParam,
+                                             HttpServletRequest request, UserData userData) {
+        return registerPassword.loginMobile(loginMobileParam, request, userData);
     }
 
     @ApiOperation(value = "用户QQ授权登录")
@@ -70,8 +72,9 @@ public class RegisterLoginController {
     @ApiOperation(value = "用户QQ授权登录回调接口")
     @PostMapping("/register/login/qq/call/back")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVo<UserLoginVO> qqLoginCallback(@Validated @RequestBody QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request) {
-        return registerPassword.qqLoginCallback(qqLoginCallbackParam, request);
+    public ResultVo<UserLoginVO> qqLoginCallback(@Validated @RequestBody QqLoginCallbackParam qqLoginCallbackParam,
+                                                 HttpServletRequest request, UserData userData) {
+        return registerPassword.qqLoginCallback(qqLoginCallbackParam, request, userData);
     }
 
     @ApiOperation(value = "用户微信授权登录")
@@ -85,7 +88,8 @@ public class RegisterLoginController {
     @ApiOperation(value = "用户微信授权登录回调接口")
     @PostMapping("/register/login/vx/call/back")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVo<UserLoginVO> vxLoginCallback(@Validated @RequestBody QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request) {
-        return registerPassword.vxLoginCallback(qqLoginCallbackParam, request);
+    public ResultVo<UserLoginVO> vxLoginCallback(@Validated @RequestBody QqLoginCallbackParam qqLoginCallbackParam,
+                                                 HttpServletRequest request, UserData userData) {
+        return registerPassword.vxLoginCallback(qqLoginCallbackParam, request, userData);
     }
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/SmsController.java

@@ -3,6 +3,7 @@ package com.zanxiang.sdk.controller;
 import com.zanxiang.common.domain.ResultVo;
 import com.zanxiang.sdk.domain.params.SmsCheckParam;
 import com.zanxiang.sdk.domain.params.SmsSendParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
 import com.zanxiang.sdk.service.SmsService;
 import io.swagger.annotations.Api;
@@ -37,7 +38,7 @@ public class SmsController {
     @ApiOperation(value = "验证码校验")
     @PostMapping("/check/msg")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVo<String> smsCheck(@Validated @RequestBody SmsCheckParam smsCheckParam) {
-        return smsService.smsCheck(smsCheckParam);
+    public ResultVo<String> smsCheck(@Validated @RequestBody SmsCheckParam smsCheckParam, UserData userData) {
+        return smsService.smsCheck(smsCheckParam, userData);
     }
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/UserController.java

@@ -1,7 +1,9 @@
 package com.zanxiang.sdk.controller;
 
 import com.zanxiang.common.domain.ResultVo;
+import com.zanxiang.sdk.common.annotation.ValidLogin;
 import com.zanxiang.sdk.domain.params.UpdatePasswordParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.params.UserDetailParam;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
 import com.zanxiang.sdk.service.UserService;
@@ -30,14 +32,14 @@ public class UserController {
     @ApiOperation(value = "用户重置密码")
     @PostMapping("/update/password")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVo updatePassword(@Validated @RequestBody UpdatePasswordParam updatePasswordParam) {
-        return userService.updatePassword(updatePasswordParam);
+    public ResultVo updatePassword(@Validated @RequestBody UpdatePasswordParam updatePasswordParam, UserData userData) {
+        return userService.updatePassword(updatePasswordParam, userData);
     }
 
     @ApiOperation(value = "用户获取信息详情")
     @PostMapping("/get/user/detail")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVo getUserDetail(@Validated @RequestBody UserDetailParam userDetailParam) {
-        return userService.getUserDetail(userDetailParam);
+    public ResultVo getUserDetail(@Validated @RequestBody UserDetailParam userDetailParam, @ValidLogin UserData userData) {
+        return userService.getUserDetail(userDetailParam, userData);
     }
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/UserData.java

@@ -1,8 +1,8 @@
 package com.zanxiang.sdk.domain.params;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.io.Serializable;
 
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @time : 2022-06-20
  * @description : 用户信息
  */
-@Data
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
 public class UserData implements Serializable {
@@ -27,4 +27,17 @@ public class UserData implements Serializable {
      */
     private Integer deviceType;
 
+    public Long getUserId() {
+        if (userId == null) {
+            return 1L;
+        }
+        return userId;
+    }
+
+    public Integer getDeviceType() {
+        if (deviceType == null) {
+            return 1;
+        }
+        return deviceType;
+    }
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/RegisterLoginServiceImpl.java

@@ -109,13 +109,14 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
      *
      * @param qqLoginCallbackParam : 回调参数
      * @param request              : request
+     * @param userData             : userData
      * @return : 返回登录token
      */
     @Override
-    public ResultVo<UserLoginVO> qqLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request) {
+    public ResultVo<UserLoginVO> qqLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request, UserData userData) {
         String code = qqLoginCallbackParam.getCode();
         String state = qqLoginCallbackParam.getState();
-        String deviceType = qqLoginCallbackParam.getDeviceType();
+        String deviceType = userData.getDeviceType().toString();
         //验证state，如果不一致，可能被CSRF攻击
         this.checkState(state);
         //获取用户信息
@@ -167,11 +168,12 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
      *
      * @param qqLoginCallbackParam : 回调参数
      * @param request              : request
+     * @param userData             : userData
      * @return : 返回登录token
      */
     @Override
-    public ResultVo<UserLoginVO> vxLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request) {
-        String deviceType = qqLoginCallbackParam.getDeviceType();
+    public ResultVo<UserLoginVO> vxLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request, UserData userData) {
+        String deviceType = userData.getDeviceType().toString();
         String code = qqLoginCallbackParam.getCode();
         String state = qqLoginCallbackParam.getState();
         //验证state，如果不一致，可能被CSRF攻击
@@ -200,11 +202,12 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
      *
      * @param registerPasswordParam : 用户名密码注册参数
      * @param request               : request
+     * @param userData              : userData
      * @return : 返回注册结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultVo<UserLoginVO> registerPassword(RegisterPasswordParam registerPasswordParam, HttpServletRequest request) {
+    public ResultVo<UserLoginVO> registerPassword(RegisterPasswordParam registerPasswordParam, HttpServletRequest request, UserData userData) {
         String username = registerPasswordParam.getUsername();
         String password = registerPasswordParam.getPassword();
         //用户名密码校验
@@ -228,7 +231,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
         //插入用户登录记录
         userLoginLogService.addUserLoginLog(realIp, user, registerPasswordParam.getGameId());
         //获取token
-        String userToken = userTokenService.getUserToken(user.getId(), registerPasswordParam.getDeviceType());
+        String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType().toString());
         //返回用户token
         return new ResultVo<>(new UserLoginVO(userToken));
     }
@@ -238,11 +241,12 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
      *
      * @param registerMobileParam : 手机注册参数
      * @param request             : HttpServletRequest
+     * @param userData            : userData
      * @return : 返回注册结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultVo<UserLoginVO> registerMobile(RegisterMobileParam registerMobileParam, HttpServletRequest request) {
+    public ResultVo<UserLoginVO> registerMobile(RegisterMobileParam registerMobileParam, HttpServletRequest request, UserData userData) {
         Integer type = registerMobileParam.getType();
         String mobile = registerMobileParam.getMobile();
         String code = registerMobileParam.getCode();
@@ -275,7 +279,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
                 .build();
         userService.save(user);
         //获取token
-        String userToken = userTokenService.getUserToken(user.getId(), registerMobileParam.getDeviceType());
+        String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType().toString());
         //登录的ip
         String realIp = IpUtils.getRealIp(request);
         //插入用户登录记录
@@ -289,10 +293,11 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
      *
      * @param userLoginParam : 登录参数
      * @param request        : HttpServletRequest
+     * @param userData       : userData
      * @return : 返回登录token
      */
     @Override
-    public ResultVo<UserLoginVO> loginPassword(LoginPasswordParam userLoginParam, HttpServletRequest request) {
+    public ResultVo<UserLoginVO> loginPassword(LoginPasswordParam userLoginParam, HttpServletRequest request, UserData userData) {
         //用户名
         String username = userLoginParam.getUsername();
         //密码
@@ -318,7 +323,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
             return new ResultVo<>(HttpStatusEnum.USERNAME_OR_PASSWORD_ERR);
         }
         //验证通过, 获取token
-        String userToken = userTokenService.getUserToken(user.getId(), userLoginParam.getDeviceType());
+        String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType().toString());
         //登录的ip
         String realIp = IpUtils.getRealIp(request);
         //插入用户登录记录
@@ -333,10 +338,11 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
      *
      * @param loginMobileParam : 手机号登录参数
      * @param request          : HttpServletRequest
+     * @param userData         : userData
      * @return : 返回登录信息
      */
     @Override
-    public ResultVo<UserLoginVO> loginMobile(LoginMobileParam loginMobileParam, HttpServletRequest request) {
+    public ResultVo<UserLoginVO> loginMobile(LoginMobileParam loginMobileParam, HttpServletRequest request, UserData userData) {
         Integer type = loginMobileParam.getType();
         String mobile = loginMobileParam.getMobile();
         String code = loginMobileParam.getCode();
@@ -357,7 +363,7 @@ public class RegisterLoginServiceImpl implements RegisterLoginService {
             return new ResultVo<>(HttpStatusEnum.ACCOUNT_HALT);
         }
         //验证通过, 获取token
-        String userToken = userTokenService.getUserToken(user.getId(), loginMobileParam.getDeviceType());
+        String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType().toString());
         //登录的ip
         String realIp = IpUtils.getRealIp(request);
         //插入用户登录记录

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/SmsServiceImpl.java

@@ -10,6 +10,7 @@ import com.zanxiang.sdk.common.util.RedisUtil;
 import com.zanxiang.sdk.domain.dto.UserDTO;
 import com.zanxiang.sdk.domain.params.SmsCheckParam;
 import com.zanxiang.sdk.domain.params.SmsSendParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.service.SmsService;
 import com.zanxiang.sdk.service.UserService;
 import com.zanxiang.sdk.service.UserTokenService;
@@ -100,10 +101,11 @@ public class SmsServiceImpl implements SmsService {
      * 前端校验短信验证码
      *
      * @param smsCheckParam : 参数
+     * @param userData      : userData
      * @return : 返回验证结果和token
      */
     @Override
-    public ResultVo<String> smsCheck(SmsCheckParam smsCheckParam) {
+    public ResultVo<String> smsCheck(SmsCheckParam smsCheckParam, UserData userData) {
         //校验短信验证码
         HttpStatusEnum httpStatusEnum = this.smsCheck(smsCheckParam.getType(), smsCheckParam.getMobile(), smsCheckParam.getCode());
         //校验不通过
@@ -116,7 +118,7 @@ public class SmsServiceImpl implements SmsService {
             return new ResultVo<>(HttpStatusEnum.PHONE_NOT_REG);
         }
         //获取token
-        String userToken = userTokenService.getUserToken(userDTO.getId(), userDTO.getDeviceType());
+        String userToken = userTokenService.getUserToken(userDTO.getId(), userData.getDeviceType().toString());
         //返回
         return new ResultVo<>(HttpStatusEnum.SUCCESS, userToken);
     }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserServiceImpl.java

@@ -13,6 +13,7 @@ import com.zanxiang.sdk.common.util.RegisterUtil;
 import com.zanxiang.sdk.domain.dto.UserDTO;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;
 import com.zanxiang.sdk.domain.params.UpdatePasswordParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.params.UserDetailParam;
 import com.zanxiang.sdk.domain.vo.UserVO;
 import com.zanxiang.sdk.service.UserService;
@@ -41,11 +42,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * 用户重置密码
      *
      * @param updatePasswordParam : 修改密码的参数
+     * @param userData            : userData
      * @return : 返回修改结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultVo<Boolean> updatePassword(UpdatePasswordParam updatePasswordParam) {
+    public ResultVo<Boolean> updatePassword(UpdatePasswordParam updatePasswordParam, UserData userData) {
         String token = updatePasswordParam.getToken();
         String password = updatePasswordParam.getPassword();
         String username = updatePasswordParam.getUsername();
@@ -61,7 +63,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             return new ResultVo<>(HttpStatusEnum.USERNAME_NOT_EXISTS);
         }
         //验证token是否存在
-        HttpStatusEnum checkUserTokenEnum = userTokenService.checkUserToken(token, user.getId(), updatePasswordParam.getDeviceType());
+        HttpStatusEnum checkUserTokenEnum = userTokenService.checkUserToken(token, user.getId(), userData.getDeviceType().toString());
         if (!Objects.equals(HttpStatusEnum.SUCCESS, checkUserTokenEnum)) {
             return new ResultVo<>(checkUserTokenEnum);
         }
@@ -83,12 +85,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * 获取用户信息
      *
      * @param userDetailParam : 用户详情参数
+     * @param userData        : userData
      * @return : 返回用户信息
      */
     @Override
-    public ResultVo<UserVO> getUserDetail(UserDetailParam userDetailParam) {
+    public ResultVo<UserVO> getUserDetail(UserDetailParam userDetailParam, UserData userData) {
         String token = userDetailParam.getToken();
-        String deviceType = userDetailParam.getDeviceType();
+        String deviceType = userData.getDeviceType().toString();
         UserTokenDTO userTokenDTO = userTokenService.getTokenInfoByTokenDevice(token, deviceType);
         if (userTokenDTO == null) {
             return new ResultVo<>(HttpStatusEnum.INVALID_PARAMS);

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/RegisterLoginService.java

@@ -22,13 +22,14 @@ public interface RegisterLoginService {
     void qqLoginAuth(HttpServletResponse response);
 
     /**
-     * QQ授权登录回调
+     * QQ授权注册登录回调
      *
      * @param qqLoginCallbackParam : 回调参数
      * @param request              : request
+     * @param userData             : userData
      * @return : 返回登录token
      */
-    ResultVo<UserLoginVO> qqLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request);
+    ResultVo<UserLoginVO> qqLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request, UserData userData);
 
     /**
      * 微信授权登录
@@ -38,47 +39,52 @@ public interface RegisterLoginService {
     void vxLoginAuth(HttpServletResponse response);
 
     /**
-     * 微信回调方法
+     * 微信授权注册登录回调
      *
      * @param qqLoginCallbackParam : 回调参数
      * @param request              : request
+     * @param userData             : userData
      * @return : 返回登录token
      */
-    ResultVo<UserLoginVO> vxLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request);
+    ResultVo<UserLoginVO> vxLoginCallback(QqLoginCallbackParam qqLoginCallbackParam, HttpServletRequest request, UserData userData);
 
     /**
      * 用户名密码注册
      *
      * @param registerPasswordParam : 用户名密码注册参数
      * @param request               : request
+     * @param userData              : userData
      * @return : 返回注册结果
      */
-    ResultVo<UserLoginVO> registerPassword(RegisterPasswordParam registerPasswordParam, HttpServletRequest request);
+    ResultVo<UserLoginVO> registerPassword(RegisterPasswordParam registerPasswordParam, HttpServletRequest request, UserData userData);
 
     /**
-     * 手机注册
+     * 手机号注册
      *
      * @param registerMobileParam : 手机注册参数
      * @param request             : HttpServletRequest
+     * @param userData            : userData
      * @return : 返回注册结果
      */
-    ResultVo<UserLoginVO> registerMobile(RegisterMobileParam registerMobileParam, HttpServletRequest request);
+    ResultVo<UserLoginVO> registerMobile(RegisterMobileParam registerMobileParam, HttpServletRequest request, UserData userData);
 
     /**
      * 用户名密码登录
      *
      * @param userLoginParam : 登录参数
      * @param request        : HttpServletRequest
+     * @param userData       : userData
      * @return : 返回登录token
      */
-    ResultVo<UserLoginVO> loginPassword(LoginPasswordParam userLoginParam, HttpServletRequest request);
+    ResultVo<UserLoginVO> loginPassword(LoginPasswordParam userLoginParam, HttpServletRequest request, UserData userData);
 
     /**
      * 手机号登录
      *
      * @param loginMobileParam : 手机号登录参数
      * @param request          : HttpServletRequest
+     * @param userData         : userData
      * @return : 返回登录信息
      */
-    ResultVo<UserLoginVO> loginMobile(LoginMobileParam loginMobileParam, HttpServletRequest request);
+    ResultVo<UserLoginVO> loginMobile(LoginMobileParam loginMobileParam, HttpServletRequest request, UserData userData);
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/SmsService.java

@@ -4,6 +4,7 @@ import com.zanxiang.common.domain.ResultVo;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.sdk.domain.params.SmsCheckParam;
 import com.zanxiang.sdk.domain.params.SmsSendParam;
+import com.zanxiang.sdk.domain.params.UserData;
 
 /**
  * @author : lingfeng
@@ -24,9 +25,10 @@ public interface SmsService {
      * 前端校验短信验证码
      *
      * @param smsCheckParam : 参数
+     * @param userData      : userData
      * @return : 返回验证结果和token
      */
-    ResultVo<String> smsCheck(SmsCheckParam smsCheckParam);
+    ResultVo<String> smsCheck(SmsCheckParam smsCheckParam, UserData userData);
 
     /**
      * 校验短信验证码

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserService.java

@@ -5,6 +5,7 @@ import com.zanxiang.common.domain.ResultVo;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.sdk.domain.dto.UserDTO;
 import com.zanxiang.sdk.domain.params.UpdatePasswordParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.params.UserDetailParam;
 import com.zanxiang.sdk.domain.vo.UserVO;
 
@@ -19,17 +20,19 @@ public interface UserService extends IService<User> {
      * 用户重置密码
      *
      * @param updatePasswordParam : 修改密码的参数
+     * @param userData            : userData
      * @return : 返回修改结果
      */
-    ResultVo updatePassword(UpdatePasswordParam updatePasswordParam);
+    ResultVo<Boolean> updatePassword(UpdatePasswordParam updatePasswordParam, UserData userData);
 
     /**
      * 获取用户信息
      *
      * @param userDetailParam : 用户详情参数
+     * @param userData        : userData
      * @return : 返回用户信息
      */
-    ResultVo<UserVO> getUserDetail(UserDetailParam userDetailParam);
+    ResultVo<UserVO> getUserDetail(UserDetailParam userDetailParam, UserData userData);
 
     /**
      * 根据手机号获取用户信息