Merge remote-tracking branch 'origin/dev0.0.1' into dev0.0.1

game-module/game-common/pom.xml

@@ -16,7 +16,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <!-- nacos配置中心 -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -27,30 +26,45 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <!-- Mybatis Plus -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>${mybatis-plus.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
-
         <!-- Mysql Connector -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <!-- 解决validated不生效的依赖问题 -->
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.17.Final</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--swagger2 的集成-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger2.version}</version>
+        </dependency>
+        <!--swagger样式 的集成-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger2.ui.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

game-module/game-common/src/main/java/com/zanxiang/common/base/BasePage.java

@@ -0,0 +1,64 @@
+package com.zanxiang.common.base;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-22
+ * @description : 分页通用参数
+ */
+@Data
+public class BasePage<T> {
+
+    /**
+     * 当前记录起始索引
+     */
+    @NotNull(message = "当前页数不可为空")
+    @Min(value = 1, message = "起始页最小为 1")
+    @ApiModelProperty(value = "当前记录起始索引")
+    private Integer pageNum;
+
+    /**
+     * 每页显示记录数
+     */
+    @NotNull(message = "单页数量不可为空")
+    @Min(value = 1, message = "页面大小（2~200）之间")
+    @Max(value = 200, message = "页面大小（2~200）之间")
+    @ApiModelProperty(value = "每页显示记录数")
+    private Integer pageSize;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "开始时间")
+    private LocalDate beginDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "结束时间")
+    private LocalDate endDate;
+
+    /**
+     * 构造方法
+     *
+     * @return : 返回分页对象
+     */
+    public IPage<T> toPage() {
+        return new Page<>(pageNum, pageSize);
+    }
+}

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/DeleteEnum.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 @Getter
 @NoArgsConstructor
 public enum DeleteEnum {
-    NO(2, "正常"),
+    NO(0, "正常"),
     YES(1, "已删除");
 
     private int code;

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-common/src/main/java/com/zanxiang/common/enums/Pay/WxPayConfigEnum.java

@@ -1,6 +1,7 @@
 package com.zanxiang.common.enums.Pay;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author xufeng

game-module/game-manage/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>fastjson</artifactId>
             <version>${alibaba.fastjson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.zanxiang.game</groupId>
+            <artifactId>game-common-redis</artifactId>
+            <version>${game-common-redis.vertion}</version>
+        </dependency>
     </dependencies>
 
 </project>

game-module/game-manage/src/main/java/com/zanxiang/manage/config/MybatisPlusConfig.java

@@ -0,0 +1,13 @@
+package com.zanxiang.manage.config;
+
+import com.zanxiang.mybatis.config.MybatisConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-22
+ * @description : 数据库分页插件
+ */
+@Configuration
+public class MybatisPlusConfig extends MybatisConfig {
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/config/SwaggerConfig.java

@@ -0,0 +1,48 @@
+package com.zanxiang.manage.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-3-31
+ * @description : Swagger2 配置
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+    /**
+     * 包扫描
+     */
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .useDefaultResponseMessages(false)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors
+                        .basePackage("com.zanxiang.manage"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    /**
+     * api文档构造
+     *
+     * @return : 返回api模板
+     */
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("游戏管理后台服务")
+                .version("1.0")
+                .build();
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.zanxiang.manage.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zanxiang.common.domain.ResultVo;
+import com.zanxiang.manage.domain.params.CpAddUpdateParam;
+import com.zanxiang.manage.domain.params.CpListParam;
+import com.zanxiang.manage.domain.vo.CpVO;
+import com.zanxiang.manage.service.CpService;
+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.*;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-22
+ * @description : cp管理接口
+ */
+@Api(tags = {"CP管理接口"})
+@RestController
+@RequestMapping("/cp")
+@Slf4j
+public class CpController {
+
+    @Autowired
+    private CpService cpService;
+
+    @ApiOperation(value = "cp新增或者更新")
+    @PostMapping(value = "/add/or/update")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
+    public ResultVo<Boolean> addOrUpdate(@Validated @RequestBody CpAddUpdateParam param) {
+        return new ResultVo<>(cpService.addOrUpdate(param));
+    }
+
+    @ApiOperation(value = "cp列表查询")
+    @PostMapping(value = "/list")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = CpVO.class)})
+    public ResultVo<IPage<CpVO>> list(@Validated @RequestBody CpListParam param) {
+        return new ResultVo<>(cpService.list(param));
+    }
+
+    @ApiOperation(value = "cp删除")
+    @DeleteMapping(value = "/delete")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
+    public ResultVo<Boolean> deleteById(@RequestParam Long id) {
+        return new ResultVo<>(cpService.deleteById(id));
+    }
+}

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/controller/PayApplicationController.java

@@ -4,13 +4,9 @@ import com.zanxiang.common.domain.ResultVo;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.manage.domain.bo.PayApplicationBO;
-import com.zanxiang.manage.domain.bo.PayMerchantBO;
 import com.zanxiang.manage.domain.dto.PayApplicationDTO;
-import com.zanxiang.manage.domain.dto.PayMerchantDTO;
 import com.zanxiang.manage.domain.params.PayApplicationParam;
-import com.zanxiang.manage.domain.params.PayMerchantParam;
 import com.zanxiang.manage.domain.vo.PayApplicationVO;
-import com.zanxiang.manage.domain.vo.PayMerchantVO;
 import com.zanxiang.manage.service.PayApplicationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -6,10 +6,8 @@ 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.apache.tomcat.jni.Time;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/bo/PayApplicationBO.java

@@ -1,13 +1,10 @@
 package com.zanxiang.manage.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 注释游戏应用表

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/dto/PayApplicationDTO.java

@@ -1,7 +1,5 @@
 package com.zanxiang.manage.domain.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/dto/PayBoxDTO.java

@@ -1,7 +1,5 @@
 package com.zanxiang.manage.domain.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/dto/PayMerchantDTO.java

@@ -1,7 +1,5 @@
 package com.zanxiang.manage.domain.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

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

@@ -0,0 +1,68 @@
+package com.zanxiang.manage.domain.params;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-22
+ * @description : cp新增或者更新参数
+ */
+@ApiModel
+@Data
+public class CpAddUpdateParam {
+
+    /**
+     * id
+     */
+    @ApiModelProperty(notes = "传id为修改, 不传id为新增")
+    private Long id;
+
+    /**
+     * cp名称
+     */
+    @NotBlank(message = "cp名称不可为空")
+    @ApiModelProperty(notes = "cp名称")
+    private String cpName;
+
+    /**
+     * 公司名称
+     */
+    @NotBlank(message = "公司名称不可为空")
+    @ApiModelProperty(notes = "公司名称")
+    private String companyName;
+
+    /**
+     * 联系人
+     */
+    @ApiModelProperty(notes = "联系人")
+    private String linkMan;
+
+    /**
+     * 联系人手机号
+     */
+    @ApiModelProperty(notes = "手机号")
+    private String mobile;
+
+    /**
+     * 对接状态
+     */
+    @NotBlank(message = "对接状态不可为空")
+    @ApiModelProperty(notes = "对接状态")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(notes = "备注")
+    private String remark;
+
+    /**
+     * 渠道
+     */
+    @ApiModelProperty(notes = "渠道, 暂时没有用到, 不传值")
+    private Long channel;
+}

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

@@ -0,0 +1,23 @@
+package com.zanxiang.manage.domain.params;
+
+import com.zanxiang.common.base.BasePage;
+import com.zanxiang.mybatis.entity.Cp;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-22
+ * @description : cp查询参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CpListParam extends BasePage<Cp> {
+
+    /**
+     * cp名称
+     */
+    @ApiModelProperty(notes = "cp名称")
+    private String cpName;
+}

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/params/PayApplicationParam.java

@@ -1,13 +1,10 @@
 package com.zanxiang.manage.domain.params;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 注释游戏应用表

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

@@ -2,11 +2,8 @@ package com.zanxiang.manage.domain.params;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @author xufeng

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

@@ -4,8 +4,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @author xufeng

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

@@ -0,0 +1,69 @@
+package com.zanxiang.manage.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-22
+ * @description : cp信息
+ */
+@Data
+public class CpVO {
+
+    /**
+     * id
+     */
+    @ApiModelProperty(notes = "id")
+    private Long id;
+
+    /**
+     * cp名称
+     */
+    @ApiModelProperty(notes = "cp名称")
+    private String cpName;
+
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty(notes = "公司名称")
+    private String companyName;
+
+    /**
+     * 联系人
+     */
+    @ApiModelProperty(notes = "联系人")
+    private String linkMan;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(notes = "手机号")
+    private String mobile;
+
+    /**
+     * 对接状态
+     */
+    @ApiModelProperty(notes = "对接状态")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(notes = "备注")
+    private String describe;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(notes = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(notes = "更新时间")
+    private LocalDateTime updateTime;
+}

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/domain/vo/PayWayVO.java

@@ -1,11 +1,6 @@
 package com.zanxiang.manage.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
+import lombok.Data;
 
 /**
  * @author : lingfeng

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

@@ -0,0 +1,40 @@
+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.CpAddUpdateParam;
+import com.zanxiang.manage.domain.params.CpListParam;
+import com.zanxiang.manage.domain.vo.CpVO;
+import com.zanxiang.mybatis.entity.Cp;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-22
+ * @description : cp管理
+ */
+public interface CpService extends IService<Cp> {
+
+    /**
+     * 新增或者更新cp信息
+     *
+     * @param param 新增或者更新的参数
+     * @return : 返回新增修改结果
+     */
+    boolean addOrUpdate(CpAddUpdateParam param);
+
+    /**
+     * 查询cp列表
+     *
+     * @param param : cp列表查询参数
+     * @return : 返回分页信息
+     */
+    IPage<CpVO> list(CpListParam param);
+
+    /**
+     * 删除cp信息
+     *
+     * @param id : 要删除的cp信息id
+     * @return : 返回删除结果
+     */
+    boolean deleteById(Long id);
+}

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

@@ -0,0 +1,112 @@
+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.exception.BaseException;
+import com.zanxiang.common.utils.StringUtils;
+import com.zanxiang.common.utils.bean.BeanUtils;
+import com.zanxiang.manage.domain.params.CpAddUpdateParam;
+import com.zanxiang.manage.domain.params.CpListParam;
+import com.zanxiang.manage.domain.vo.CpVO;
+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.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-22
+ * @description : cp管理
+ */
+@Slf4j
+@Service
+public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements CpService {
+
+    /**
+     * 新增或者更新cp信息
+     *
+     * @param param 新增或者更新的参数
+     * @return : 返回新增修改结果
+     */
+    @Override
+    public boolean addOrUpdate(CpAddUpdateParam param) {
+        Long id = param.getId();
+        //更新
+        if (id != null) {
+            Cp cp = super.getById(id);
+            if (cp == null) {
+                throw new BaseException("参数错误, 更新的cp信息不存在");
+            }
+            cp.setCpName(param.getCpName());
+            cp.setCompanyName(param.getCompanyName());
+            cp.setLinkMan(param.getLinkMan());
+            cp.setMobile(param.getMobile());
+            cp.setStatus(param.getStatus());
+            cp.setRemark(param.getRemark());
+            cp.setUpdateTime(LocalDateTime.now());
+            return super.updateById(cp);
+        }
+        //判断cp名称是否已经存在
+        int count = super.count(new LambdaQueryWrapper<Cp>()
+                .eq(Cp::getCpName, param.getCpName()));
+        if (count > 0) {
+            throw new BaseException("cp名称已经存在");
+        }
+        //创建
+        return super.save(Cp.builder()
+                .cpName(param.getCpName())
+                .companyName(param.getCompanyName())
+                .linkMan(param.getLinkMan())
+                .mobile(param.getMobile())
+                .status(param.getStatus())
+                .remark(param.getRemark())
+                .createTime(LocalDateTime.now())
+                .updateTime(LocalDateTime.now())
+                .build());
+    }
+
+    /**
+     * 查询cp列表
+     *
+     * @param param : cp列表查询参数
+     * @return : 返回分页信息
+     */
+    @Override
+    public IPage<CpVO> list(CpListParam param) {
+        return page(param.toPage(), new QueryWrapper<Cp>().lambda()
+                .like(StringUtils.isNotBlank(param.getCpName()), Cp::getCpName, param.getCpName())
+                .orderByDesc(Cp::getCreateTime)
+        ).convert(this::toVo);
+    }
+
+    /**
+     * cp对象转换
+     *
+     * @param cp : cp信息
+     * @return : 返回cpVo
+     */
+    private CpVO toVo(Cp cp) {
+        if (Objects.isNull(cp)) {
+            return null;
+        }
+        return BeanUtils.copy(cp, CpVO.class);
+    }
+
+    /**
+     * 删除cp信息
+     *
+     * @param id : 要删除的cp信息id
+     * @return : 返回删除结果
+     */
+    @Override
+    public boolean deleteById(Long 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-manage/src/main/java/com/zanxiang/manage/service/PayApplicationService.java

@@ -1,11 +1,9 @@
 package com.zanxiang.manage.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.manage.domain.bo.PayApplicationBO;
-import com.zanxiang.manage.domain.bo.PayMerchantBO;
 import com.zanxiang.manage.domain.dto.PayApplicationDTO;
-import com.zanxiang.manage.domain.dto.PayMerchantDTO;
 import com.zanxiang.mybatis.entity.PayApplication;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 

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

@@ -1,11 +1,9 @@
 package com.zanxiang.manage.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.manage.domain.bo.PayBoxBO;
-import com.zanxiang.manage.domain.bo.PayMerchantBO;
 import com.zanxiang.manage.domain.dto.PayBoxDTO;
-import com.zanxiang.manage.domain.dto.PayMerchantDTO;
 import com.zanxiang.mybatis.entity.PayBox;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 

game-module/game-mybatis/pom.xml

@@ -17,7 +17,6 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <artifactId>game-common</artifactId>
             <groupId>com.zanxiang.game</groupId>
@@ -34,7 +33,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
-
         <!-- Mysql Connector -->
         <dependency>
             <groupId>mysql</groupId>

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/config/MybatisConfig.java

@@ -0,0 +1,28 @@
+package com.zanxiang.mybatis.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-04-01
+ * @description : 数据库分页插件
+ */
+@EnableTransactionManagement
+@MapperScan({"com.zanxiang.mybatis.mapper"})
+public class MybatisConfig {
+
+    /**
+     * 分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
@@ -52,9 +53,10 @@ public class Channel {
     private String position;
 
     /**
-     * 1 伪删除  2 正常
+     * 1 删除  0 正常
      */
-    private Boolean isDelete;
+    @TableLogic
+    private Integer isDelete;
 
     /**
      * 删除时间

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Cp.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;
@@ -26,6 +24,11 @@ public class Cp {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * cp名称
+     */
+    private String cpName;
+
     /**
      * 公司名称
      */
@@ -34,37 +37,37 @@ public class Cp {
     /**
      * 联系人
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String linkMan;
 
     /**
      * 手机号
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String mobile;
 
     /**
-     * 职位
-     */
-    private String position;
-
-    /**
-     * 1 cp 2 媒体
+     * 对接状态
      */
-    private Byte type;
+    private String status;
 
     /**
-     * 1 伪删除  2 正常
+     * 备注
      */
-    private Boolean isDelete;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String remark;
 
     /**
-     * 删除时间
+     * 渠道
      */
-    private LocalDateTime deleteTime;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long channel;
 
     /**
-     * 渠道
+     * 1 删除  0 正常
      */
-    private Long channel;
+    @TableLogic
+    private Integer isDelete;
 
     /**
      * 创建时间

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

@@ -2,6 +2,7 @@ package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
@@ -132,9 +133,10 @@ public class Game {
     private LocalDateTime onlineTime;
 
     /**
-     * 1 伪删除  2 正常
+     * 1 删除  0 正常
      */
-    private Boolean isDelete;
+    @TableLogic
+    private Integer isDelete;
 
     /**
      * 删除时间

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-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameServer.java

@@ -2,6 +2,7 @@ package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
@@ -54,12 +55,13 @@ public class GameServer {
     /**
      * 新服状态，1为预告，2为已开服
      */
-    private Boolean status;
+    private Integer status;
 
     /**
-     * 伪删除，2 正常，1 删除
+     * 1 删除  0 正常
      */
-    private Boolean isDelete;
+    @TableLogic
+    private Integer isDelete;
 
     /**
      * 删除时间

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

@@ -2,6 +2,7 @@ package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
@@ -62,9 +63,10 @@ public class GameVersion {
     private Boolean isDefault;
 
     /**
-     * 1 已删除  2 正常
+     * 1 删除  0 正常
      */
-    private Boolean isDelete;
+    @TableLogic
+    private Integer isDelete;
 
     /**
      * 删除时间

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Date;

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

@@ -1,13 +1,14 @@
 package com.zanxiang.mybatis.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 游戏应用表
@@ -71,8 +72,9 @@ public class PayApplication implements Serializable {
     private String remark;
 
     /**
-     * 是否已删除 1 已删除 2 正常
+     * 1 删除  0 正常
      */
+    @TableLogic
     private Integer isDelete;
 
     /**

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

@@ -1,13 +1,13 @@
 package com.zanxiang.mybatis.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 支付盒子

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

@@ -1,14 +1,15 @@
 package com.zanxiang.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.IdType;
-
 /**
  * 游戏支付商户配置表
  *
@@ -125,8 +126,9 @@ public class PayMerchant implements Serializable {
     private String remark;
 
     /**
-     * 是否已删除 1 已删除 2 正常
+     * 1 删除  0 正常
      */
+    @TableLogic
     private Integer isDelete;
 
     /**

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/PayApplicationMapper.java

@@ -1,8 +1,8 @@
 package com.zanxiang.mybatis.mapper;
 
-import org.apache.ibatis.annotations.Mapper;
-import com.zanxiang.mybatis.entity.PayApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.mybatis.entity.PayApplication;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 注释游戏应用表 Mapper

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/PayBoxMapper.java

@@ -1,8 +1,8 @@
 package com.zanxiang.mybatis.mapper;
 
-import org.apache.ibatis.annotations.Mapper;
-import com.zanxiang.mybatis.entity.PayBox;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.mybatis.entity.PayBox;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 注释支付盒子 Mapper

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/PayMerchantMapper.java

@@ -1,8 +1,8 @@
 package com.zanxiang.mybatis.mapper;
 
-import org.apache.ibatis.annotations.Mapper;
-import com.zanxiang.mybatis.entity.PayMerchant;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.mybatis.entity.PayMerchant;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 注释游戏支付商户配置表 Mapper

game-module/game-sdk/pom.xml

@@ -30,24 +30,12 @@
             <artifactId>zx-sms</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-        <!-- 解决validated不生效的依赖问题 -->
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>6.0.17.Final</version>
-            <scope>compile</scope>
-        </dependency>
         <!--    支付相关pom  -->
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-easysdk</artifactId>
             <version>2.1.0</version>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>dom4j</groupId>-->
-        <!--            <artifactId>dom4j</artifactId>-->
-        <!--            <version>1.6.1</version>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>

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

@@ -8,7 +8,10 @@ import com.zanxiang.sdk.service.PlatformOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author xufeng

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/PlatformOrderServiceImpl.java

@@ -2,9 +2,7 @@ package com.zanxiang.sdk.service.Impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.enums.OrderStateEnum;
-import com.zanxiang.common.exception.CustomException;
 import com.zanxiang.common.exception.ParamNullException;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;

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/Impl/pay/AlipayServiceImpl.java

@@ -11,7 +11,6 @@ import com.alipay.easysdk.payment.page.models.AlipayTradePagePayResponse;
 import com.alipay.easysdk.payment.wap.models.AlipayTradeWapPayResponse;
 import com.zanxiang.common.domain.ResultMap;
 import com.zanxiang.common.enums.OrderStateEnum;
-import com.zanxiang.common.enums.PayDeviceEnum;
 import com.zanxiang.common.enums.ResEnum;
 import com.zanxiang.common.utils.URIUtil;
 import com.zanxiang.sdk.domain.bo.PlatformOrderBO;

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);
 
     /**
      * 根据手机号获取用户信息

game-module/pom.xml

@@ -38,7 +38,6 @@
             <version>${swagger2.ui.version}</version>
         </dependency>
 
-
     </dependencies>
 
 </project>