소스 검색

fix : game-module模块命名规范统一

bilingfeng 1 년 전
부모
커밋
a8a8272afd
100개의 변경된 파일0개의 추가작업 그리고 8625개의 파일을 삭제
  1. 0 36
      game-module/game-common/pom.xml
  2. 0 64
      game-module/game-common/src/main/java/com/zanxiang/game/common/base/BasePage.java
  3. 0 219
      game-module/game-common/src/main/java/com/zanxiang/game/common/constant/Constants.java
  4. 0 79
      game-module/game-common/src/main/java/com/zanxiang/game/common/domain/ResultMap.java
  5. 0 111
      game-module/game-common/src/main/java/com/zanxiang/game/common/domain/ResultVO.java
  6. 0 39
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/AppletStoreEnum.java
  7. 0 35
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/BanStatusEnum.java
  8. 0 39
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/CallBackEnum.java
  9. 0 38
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/CpStatusEnum.java
  10. 0 33
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/DeleteEnum.java
  11. 0 55
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/DeviceTypeEnum.java
  12. 0 65
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/ExpireTimeEnum.java
  13. 0 46
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/FileTypeEnum.java
  14. 0 44
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/GameCategoryEnum.java
  15. 0 44
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/GameStatusEnum.java
  16. 0 50
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/GameStrategyTypeEnum.java
  17. 0 294
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/HttpStatusEnum.java
  18. 0 33
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/MaxPayLock.java
  19. 0 44
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/OrderStateEnum.java
  20. 0 77
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/OsEnum.java
  21. 0 51
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/Pay/AlipayPayConfigEnum.java
  22. 0 46
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/Pay/WxPayConfigEnum.java
  23. 0 49
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PayApplicationTypeEnum.java
  24. 0 85
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PayDeviceEnum.java
  25. 0 66
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PayWayEnum.java
  26. 0 57
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PromoAccountTypeEnum.java
  27. 0 62
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PromoMediaTypeEnum.java
  28. 0 57
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PromoProviderEnum.java
  29. 0 61
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/SmsTypeEnum.java
  30. 0 33
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/StatusEnum.java
  31. 0 84
      game-module/game-common/src/main/java/com/zanxiang/game/common/enums/VipLevelEnum.java
  32. 0 59
      game-module/game-common/src/main/java/com/zanxiang/game/common/exception/BaseException.java
  33. 0 42
      game-module/game-common/src/main/java/com/zanxiang/game/common/exception/CustomException.java
  34. 0 19
      game-module/game-common/src/main/java/com/zanxiang/game/common/exception/ParamNullException.java
  35. 0 13
      game-module/game-common/src/main/java/com/zanxiang/game/common/exception/PreAuthorizeException.java
  36. 0 22
      game-module/game-common/src/main/java/com/zanxiang/game/common/exception/UtilException.java
  37. 0 101
      game-module/game-common/src/main/java/com/zanxiang/game/common/handler/GlobalExceptionHandler.java
  38. 0 91
      game-module/game-common/src/main/java/com/zanxiang/game/common/text/CharsetKit.java
  39. 0 870
      game-module/game-common/src/main/java/com/zanxiang/game/common/text/Convert.java
  40. 0 77
      game-module/game-common/src/main/java/com/zanxiang/game/common/text/StrFormatter.java
  41. 0 441
      game-module/game-common/src/main/java/com/zanxiang/game/common/text/UUID.java
  42. 0 115
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/BaseHttpSSLSocketFactory.java
  43. 0 56
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/DateUtils.java
  44. 0 44
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/MD5Util.java
  45. 0 102
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/SpringUtils.java
  46. 0 366
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/StringUtils.java
  47. 0 149
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/URIUtil.java
  48. 0 144
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/bean/BeanUtils.java
  49. 0 139
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/http/AjaxResult.java
  50. 0 88
      game-module/game-common/src/main/java/com/zanxiang/game/common/utils/http/HttpStatus.java
  51. 0 138
      game-module/game-manage/pom.xml
  52. 0 36
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/ManageApplication.java
  53. 0 13
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/config/MybatisPlusConfig.java
  54. 0 48
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/config/SwaggerConfig.java
  55. 0 247
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/ChoiceController.java
  56. 0 56
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/CpController.java
  57. 0 54
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GameAppletController.java
  58. 0 122
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GameController.java
  59. 0 62
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GamePayStrategyController.java
  60. 0 62
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GamePayWayController.java
  61. 0 47
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GamePictureController.java
  62. 0 56
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GameTagController.java
  63. 0 59
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/OrderController.java
  64. 0 53
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/OssController.java
  65. 0 71
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PayApplicationController.java
  66. 0 62
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PayBoxController.java
  67. 0 70
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PayMerchantController.java
  68. 0 63
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PromoAccountController.java
  69. 0 54
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PromoChannelController.java
  70. 0 54
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PromoMediaController.java
  71. 0 54
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PromoSiteController.java
  72. 0 79
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserBanController.java
  73. 0 42
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserCardController.java
  74. 0 96
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserController.java
  75. 0 42
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserGameController.java
  76. 0 50
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserRoleController.java
  77. 0 57
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/CpDTO.java
  78. 0 97
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameAppletDTO.java
  79. 0 44
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameCategoryDTO.java
  80. 0 179
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameDTO.java
  81. 0 85
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GamePayWayDTO.java
  82. 0 69
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameTagDTO.java
  83. 0 115
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameUserRoleDTO.java
  84. 0 93
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PayApplicationDTO.java
  85. 0 47
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PayBoxDTO.java
  86. 0 27
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PayDeviceDTO.java
  87. 0 121
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PayMerchantDTO.java
  88. 0 27
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PayWayDTO.java
  89. 0 72
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PromoAccountDTO.java
  90. 0 62
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PromoChannelDTO.java
  91. 0 64
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PromoMediaDTO.java
  92. 0 32
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PromoSiteDTO.java
  93. 0 59
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/UserCardDTO.java
  94. 0 160
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/UserDTO.java
  95. 0 109
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/UserExtDTO.java
  96. 0 68
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/params/CpAddUpdateParam.java
  97. 0 23
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/params/CpListParam.java
  98. 0 67
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/params/GameAccountUpdateParam.java
  99. 0 84
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/params/GameAddParam.java
  100. 0 40
      game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/params/GameDockParam.java

+ 0 - 36
game-module/game-common/pom.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>game-module</artifactId>
-        <groupId>com.zanxiang.game</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>game-common</artifactId>
-
-    <dependencies>
-        <dependency>
-            <artifactId>game-mybatis</artifactId>
-            <groupId>com.zanxiang.game</groupId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.zanxiang.module</groupId>
-            <artifactId>zx-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger2.ui.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>

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

@@ -1,64 +0,0 @@
-package com.zanxiang.game.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);
-    }
-}

+ 0 - 219
game-module/game-common/src/main/java/com/zanxiang/game/common/constant/Constants.java

@@ -1,219 +0,0 @@
-package com.zanxiang.game.common.constant;
-
-import java.math.BigDecimal;
-
-/**
- * 通用常量信息
- *
- * @author ruoyi
- */
-public class Constants {
-    /**
-     * UTF-8 字符集
-     */
-    public static final String UTF8 = "UTF-8";
-
-    /**
-     * GBK 字符集
-     */
-    public static final String GBK = "GBK";
-
-    /**
-     * http请求
-     */
-    public static final String HTTP = "http://";
-
-    /**
-     * https请求
-     */
-    public static final String HTTPS = "https://";
-
-    /**
-     * 登录成功
-     */
-    public static final String LOGIN_SUCCESS = "Success";
-
-    /**
-     * 注销
-     */
-    public static final String LOGOUT = "Logout";
-
-    /**
-     * 注册
-     */
-    public static final String REGISTER = "Register";
-
-    /**
-     * 登录失败
-     */
-    public static final String LOGIN_FAIL = "Error";
-
-    /**
-     * 当前记录起始索引
-     */
-    public static final String PAGE_NUM = "pageNum";
-
-    /**
-     * 每页显示记录数
-     */
-    public static final String PAGE_SIZE = "pageSize";
-
-    /**
-     * 排序列
-     */
-    public static final String ORDER_BY_COLUMN = "orderByColumn";
-
-    /**
-     * 排序的方向 "desc" 或者 "asc".
-     */
-    public static final String IS_ASC = "isAsc";
-
-    /**
-     * 验证码 redis key
-     */
-    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
-
-    /**
-     * 验证码有效期(分钟)
-     */
-    public static final long CAPTCHA_EXPIRATION = 5;
-
-    /**
-     * 最大令牌有效期(秒)
-     */
-    public final static long TOKEN_EXPIRE = 24 * 60 * 60;
-
-    /**
-     * 参数管理 cache key
-     */
-    public static final String SYS_CONFIG_KEY = "sys_config:";
-
-    /**
-     * 微信信息存储的前缀(所有 WxJava存储的信息都已这个开头)
-     */
-    public static final String WX_PREFIX = "wx:";
-
-    /**
-     * 微信预授权码前缀(存储用户 id)
-     */
-    public static final String WX_PRE_AUTH_PREFIX = "wx-auth:";
-
-    /**
-     * 微信延时消息列表的前缀:yyyy-MM-dd_HH:mm
-     */
-    public static final String WX_SEND_MSG = "wx-send-msg:";
-
-    /**
-     * 读取微信延时消息列表的锁
-     */
-    public static final String WX_SEND_MSG_LOCK = "wx-send-msg_lock:";
-
-    /**
-     * 刷新 access_token时的锁
-     */
-    public static final String AUTH_ACCESS_TOKEN_LOCK = "auth_access_token_lock:";
-
-    /**
-     * 字典管理 cache key
-     */
-    public static final String SYS_DICT_KEY = "sys_dict:";
-
-    /**
-     * 资源映射路径 前缀
-     */
-    public static final String RESOURCE_PREFIX = "/profile";
-
-    public static final String SINGLE_USER = "single_user_";
-
-    public static final String ROCKET_MQ_ORDER_MSG_KEY_KEFU = "sharding_key_kefu:";
-
-    /**
-     * 异步同步粉丝 Redis锁
-     */
-    public static final String ROCK_ASYNC_MP_FANS = "ROCK_ASYNC_MP_FANS_";
-
-    public static final BigDecimal NUM_100 = new BigDecimal(100);
-
-    public static final boolean ENABLE_NO = false;
-    public static final boolean ENABLE_YES = true;
-
-    /**
-     * 异步消费时间的锁
-     */
-    public static final String ASYNC_SAVE_LOG_LAST_TIME = "ASYNC_SAVE_LOG_LAST_TIME";
-
-    /**
-     * 临时缓存 mpFansLog日志
-     */
-    public static final String MP_FANS_LOG_BUFFER = "MP_FANS_LOG_BUFFER";
-    /**
-     * 临时缓存的 mp_kefu_msg_exection_log日志
-     */
-    public static final String KEFU_MSG_EXECUTION_DETAIL_BUFFER = "KEFU_MSG_EXECUTION_DETAIL_BUFFER";
-
-    /**
-     * 客服消息执行日志的统计信息
-     */
-    public static final String KEFU_MSG_EXECUTION_LOG_STAT = "KEFU_MSG_EXECUTION_LOG_STAT";
-
-    public static final String KEFU_STRATEGY_MQ_STAT = "KEFU_STRATEGY_MQ_STAT:";
-
-    public static final String TEMPLATE_STRATEGY_MQ_STAT = "TEMPLATE_STRATEGY_MQ_STAT:";
-
-    public static final String GROUP_STRATEGY_MQ_STAT = "GROUP_STRATEGY_MQ_STAT:";
-
-    /**
-     * 模板消息执行统计
-     */
-    public static final String TEMPLATE_SEND_DETAIL_STAT = "TEMPLATE_SEND_DETAIL_STAT:";
-
-    /**
-     * 模板消息回调执行统计
-     */
-    public static final String TEMPLATE_SEND_CALL_BACK_SUCCESS_STAT = "TEMPLATE_SEND_CALL_BACK_SUCCESS_STAT:";
-
-    /**
-     * 模板消息回调执行统计
-     */
-    public static final String TEMPLATE_SEND_CALL_BACK_FAILED_STAT = "TEMPLATE_SEND_CALL_BACK_FAILED_STAT:";
-
-    /**
-     * 模板消息发送日志,冒号后面加公众号 appid
-     */
-    public static final String TEMPLATE_SEND_LOG = "TEMPLATE_SEND_LOG:";
-
-    public static final String REDIS_CACHE_PREFIX = "SpringCache:";
-
-    /**
-     * 网关账号信息缓存
-     */
-    public static final String REDIS_GATEWAY_ACCOUNT_INFO = "Gateway:AccountInfo";
-
-    /**
-     * 网关服务信息
-     */
-    public static final String REDIS_GATEWAY_SERVER_INFO = "Gateway:ServerInfo:";
-
-    /**
-     * 网关白名单列表
-     */
-    public static final String REDIS_GATEWAY_WHITE_URL = "Gateway:WhiteUrl:";
-
-    /**
-     * 已登录用户列表
-     */
-    public static final String REDIS_LOGIN_USER_LIST = "Gateway:LoginUserList:";
-
-
-    /**
-     * 成功
-     */
-    public static final String SUCCESS = "success";
-
-    /**
-     * 失败
-     */
-    public static final String FAIL = "fail";
-
-
-}

+ 0 - 79
game-module/game-common/src/main/java/com/zanxiang/game/common/domain/ResultMap.java

@@ -1,79 +0,0 @@
-package com.zanxiang.game.common.domain;
-
-import com.zanxiang.game.common.enums.HttpStatusEnum;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 返回对象
- *
- * @author xufeng
- * @date 2022/6/9 10:41
- */
-public class ResultMap extends HashMap<String, Object> {
-
-    private static final long serialVersionUID = 1L;
-
-    public ResultMap() {
-        put("code", 0);
-    }
-
-    public static ResultMap error() {
-        return error(500, "未知异常,请联系管理员");
-    }
-
-    public static ResultMap error(String msg) {
-        return error(500, msg);
-    }
-
-    public static ResultMap error(int code, String msg) {
-        ResultMap r = new ResultMap();
-        r.put("code", code);
-        r.put("msg", msg);
-        return r;
-    }
-
-    public static ResultMap ok() {
-        ResultMap r = new ResultMap();
-        r.put("code", HttpStatusEnum.SUCCESS.getCode());
-        r.put("msg", HttpStatusEnum.SUCCESS.getMsg());
-        return r;
-    }
-
-    public static ResultMap ok(Object data) {
-        ResultMap r = new ResultMap();
-        r.put("code", HttpStatusEnum.SUCCESS.getCode());
-        r.put("msg", HttpStatusEnum.SUCCESS.getMsg());
-        r.put("data", data);
-        return r;
-    }
-
-    public static ResultMap ok(Long deviceType, Object data, String orderId) {
-        ResultMap r = new ResultMap();
-        r.put("code", HttpStatusEnum.SUCCESS.getCode());
-        r.put("msg", HttpStatusEnum.SUCCESS.getMsg());
-        HashMap<String, Object> dataMap = new HashMap<>(2);
-        dataMap.put("data", data);
-        dataMap.put("deviceType", deviceType);
-        dataMap.put("orderId", orderId);
-        r.put("data", dataMap);
-        return r;
-    }
-
-    public static ResultMap ok(Map<String, Object> map) {
-        ResultMap r = new ResultMap();
-        r.put("code", HttpStatusEnum.SUCCESS.getCode());
-        r.put("msg", HttpStatusEnum.SUCCESS.getMsg());
-        HashMap<String, Object> dataMap = new HashMap<>(2);
-        dataMap.putAll(map);
-        r.put("data", dataMap);
-        return r;
-    }
-
-    @Override
-    public ResultMap put(String key, Object value) {
-        super.put(key, value);
-        return this;
-    }
-}

+ 0 - 111
game-module/game-common/src/main/java/com/zanxiang/game/common/domain/ResultVO.java

@@ -1,111 +0,0 @@
-package com.zanxiang.game.common.domain;
-
-import com.zanxiang.game.common.enums.HttpStatusEnum;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-07
- * @description : http响应消息
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ResultVO<T> implements Serializable {
-
-    /**
-     * 序列化
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 错误码
-     */
-    private Integer code;
-
-    /**
-     * 错误信息
-     */
-    private String msg;
-
-    /**
-     * 返回内容
-     */
-    private T data;
-
-    /**
-     * 错误消息返回构造
-     *
-     * @param httpStatusEnum : http响应消息枚举
-     */
-    public ResultVO(HttpStatusEnum httpStatusEnum) {
-        this.code = httpStatusEnum.getCode();
-        this.msg = httpStatusEnum.getMsg();
-    }
-
-    /**
-     * 默认返回成功构造
-     *
-     * @param data : 返回的内容
-     */
-    public ResultVO(T data) {
-        this.code = HttpStatusEnum.SUCCESS.getCode();
-        this.msg = HttpStatusEnum.SUCCESS.getMsg();
-        this.data = data;
-    }
-
-    /**
-     * 消息返回构造
-     *
-     * @param httpStatusEnum : http响应消息枚举
-     * @param data           : 返回的内容
-     */
-    public ResultVO(HttpStatusEnum httpStatusEnum, T data) {
-        this.code = httpStatusEnum.getCode();
-        this.msg = httpStatusEnum.getMsg();
-        this.data = data;
-    }
-
-    /**
-     * 自定义消息异常
-     *
-     * @param code : 错误码
-     * @param msg  : 错误消息
-     */
-    public ResultVO(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    /**
-     * 判断是否成功
-     */
-    public boolean isSuccess() {
-        return Objects.equals(HttpStatusEnum.SUCCESS.getCode(), this.code);
-    }
-
-    public static <T> ResultVO<T> fail(String msg) {
-        return new ResultVO<>(HttpStatusEnum.ERROR.getCode(), msg);
-    }
-
-    public static <T> ResultVO<T> ok(int code, String msg, T data) {
-        return new ResultVO<>(code, msg, data);
-    }
-
-    public static <T> ResultVO<T> ok(int code, String msg) {
-        return new ResultVO<>(code, msg);
-    }
-
-    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);
-    }
-}

+ 0 - 39
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/AppletStoreEnum.java

@@ -1,39 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2023-01-15
- * @description : 商城小程序枚举类型
- */
-@Getter
-@AllArgsConstructor
-public enum AppletStoreEnum {
-
-    /**
-     * 商城百货
-     */
-    STORE_GOODS(1, "商城百货"),
-
-    /**
-     * 商城美妆
-     */
-    STORE_BEAUTY(2, "商城美妆"),
-
-    /**
-     * 商城内容
-     */
-    STORE_CONTENT(3, "商城内容");
-
-    /**
-     * 账号类型
-     */
-    private Integer type;
-
-    /**
-     * 账号类型名称
-     */
-    private String name;
-}

+ 0 - 35
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/BanStatusEnum.java

@@ -1,35 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-28
- * @description : ip封禁管理状态
- */
-@Getter
-@AllArgsConstructor
-public enum BanStatusEnum {
-
-    /**
-     * 正常
-     */
-    NORMAL_STATUS(0, "正常"),
-
-    /**
-     * 冻结/封禁 状态
-     */
-    BAN_STATUS(1, " 冻结/封禁 状态");
-
-    /**
-     * 状态
-     */
-    private Integer status;
-
-    /**
-     * 描述
-     */
-    private String describe;
-
-}

+ 0 - 39
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/CallBackEnum.java

@@ -1,39 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-11
- * @description : 上报枚举
- */
-@Getter
-@AllArgsConstructor
-public enum CallBackEnum {
-
-    /**
-     * 未上报
-     */
-    UN_CALL_BACK(0, "未上报"),
-
-    /**
-     * 上报成功
-     */
-    SUCCESS_CALL_BACK(1, "上报成功"),
-
-    /**
-     * 上报失败
-     */
-    FAIL_CALL_BACK(2, "上报失败");
-
-    /**
-     * 数据类型
-     */
-    private Integer callBackStatus;
-
-    /**
-     * 描述
-     */
-    private String name;
-}

+ 0 - 38
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/CpStatusEnum.java

@@ -1,38 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author xufeng
- * @date 2022/6/27 14:31
- */
-@Getter
-@AllArgsConstructor
-public enum CpStatusEnum {
-
-    /**
-     * 同步失败
-     */
-    FAIL(-1, "失败"),
-
-    /**
-     * 待同步
-     */
-    READY(1, "待同步"),
-
-    /**
-     * 同步成功
-     */
-    SUCCESS(2, "同步成功");
-
-    /**
-     * 类型
-     */
-    private Integer status;
-
-    /**
-     * 描述
-     */
-    private String desc;
-}

+ 0 - 33
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/DeleteEnum.java

@@ -1,33 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author xufeng
- * @date 2022/6/13 11:39
- */
-@Getter
-@AllArgsConstructor
-public enum DeleteEnum {
-
-    /**
-     * 正常
-     */
-    NO(0, "正常"),
-
-    /**
-     * 已删除
-     */
-    YES(1, "已删除");
-
-    /**
-     *
-     */
-    private int code;
-
-    /**
-     * 状态
-     */
-    private String name;
-}

+ 0 - 55
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/DeviceTypeEnum.java

@@ -1,55 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-07
- * @description : 客户端类型
- */
-@Getter
-@AllArgsConstructor
-public enum DeviceTypeEnum {
-
-    /**
-     * 安卓app
-     */
-    DEVICE_TYPE_ANDROID(1, "android"),
-
-    /**
-     * 苹果app
-     */
-    DEVICE_TYPE_IOS(2, "ios"),
-
-    /**
-     * h5网页
-     */
-    DEVICE_TYPE_H5(3, "h5"),
-
-    /**
-     * 小程序
-     */
-    DEVICE_TYPE_MINI_APP(4, "miniApp");
-
-    /**
-     * 设备类型
-     */
-    private Integer deviceType;
-
-    /**
-     * 描述
-     */
-    private String describe;
-
-    public static DeviceTypeEnum getByDeviceType(Integer deviceType) {
-        for (DeviceTypeEnum deviceTypeEnum : DeviceTypeEnum.values()) {
-            if (Objects.equals(deviceTypeEnum.getDeviceType(), deviceType)) {
-                return deviceTypeEnum;
-            }
-        }
-        return null;
-    }
-}

+ 0 - 65
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/ExpireTimeEnum.java

@@ -1,65 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2021-11-16
- * @description : 时间常量
- */
-@Getter
-@AllArgsConstructor
-public enum ExpireTimeEnum {
-
-    /**
-     * 无固定期限
-     */
-    NONE(0, "无固定期限"),
-
-    /**
-     * 1分钟
-     */
-    ONE_MIN(60, "1分钟"),
-
-    /**
-     * 5分钟
-     */
-    FIVE_MIN(5 * 60, "5分钟"),
-
-    /**
-     * 1小时
-     */
-    ONE_HOUR(60 * 60, "1小时"),
-
-    /**
-     * 1
-     */
-    ONE_DAY(24 * 60 * 60, "1天"),
-
-    /**
-     * 一周
-     */
-    ONE_WEEK(24 * 60 * 60 * 7, "一周"),
-
-    /**
-     * 1个月
-     */
-    ONE_MON(30 * 24 * 60 * 60, "1个月"),
-
-    /**
-     * 1
-     */
-    ONE_YEAR(365 * 24 * 60 * 60, "1年");
-
-    /**
-     * 时间
-     */
-    private final long time;
-
-    /**
-     * 描述
-     */
-    private final String desc;
-
-}  

+ 0 - 46
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/FileTypeEnum.java

@@ -1,46 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2021-08-11
- * @description : oss文件上传类型
- */
-@Getter
-public enum FileTypeEnum {
-
-    /**
-     * 视频类型
-     */
-    FILE_TYPE_VIDEO("video", "video/"),
-
-    /**
-     * 图片类型
-     */
-    FILE_TYPE_IMAGE("image", "image/");
-
-    /**
-     * 文件类型
-     */
-    private String fileType;
-
-    /**
-     * 文件存储文件名
-     */
-    private String filePath;
-
-    FileTypeEnum(String fileType, String filePath) {
-        this.fileType = fileType;
-        this.filePath = filePath;
-    }
-
-    public static FileTypeEnum getByFileType(String fileType) {
-        for (FileTypeEnum fileTypeEnum : FileTypeEnum.values()) {
-            if (fileTypeEnum.getFileType().equals(fileType)) {
-                return fileTypeEnum;
-            }
-        }
-        return null;
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-13
- * @description : 游戏应用类型
- */
-@Getter
-@AllArgsConstructor
-public enum GameCategoryEnum {
-
-    /**
-     * 微信小游戏
-     */
-    CATEGORY_WX_APPLET("wx_applet", "微信小游戏"),
-
-    /**
-     * 抖音小游戏
-     */
-    CATEGORY_DY_APPLET("byte_applet", "抖音小游戏"),
-
-    /**
-     * h5游戏
-     */
-    CATEGORY_H5("h5", "h5游戏"),
-
-    /**
-     * app游戏
-     */
-    CATEGORY_APP("app", "app游戏");
-
-    /**
-     * 游戏分类key
-     */
-    private String key;
-
-    /**
-     * 描述
-     */
-    private String name;
-}

+ 0 - 44
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/GameStatusEnum.java

@@ -1,44 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-15
- * @description : 游戏状态
- */
-@Getter
-@AllArgsConstructor
-public enum GameStatusEnum {
-
-    /**
-     * 未接入
-     */
-    UN_JOIN_UP(1, "未接入"),
-
-    /**
-     * 接入中
-     */
-    NOW_JOIN_UP(2, "接入中"),
-
-    /**
-     * 上线
-     */
-    ON_LINE(3, "上线"),
-
-    /**
-     * 下线
-     */
-    OFF_LINE(4, "下线");
-
-    /**
-     * 状态
-     */
-    private Integer status;
-
-    /**
-     * 描述
-     */
-    private String name;
-}

+ 0 - 50
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/GameStrategyTypeEnum.java

@@ -1,50 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2023-02-16
- * @description : 游戏支付策略类型
- */
-@Getter
-@AllArgsConstructor
-public enum GameStrategyTypeEnum {
-
-    /**
-     * 切换规则
-     */
-    CUT_RULE(1, "切换规则"),
-
-    /**
-     * 显示规则
-     */
-    SHOW_RULE(2, "显示规则"),
-
-    /**
-     * 订单起量切换规则
-     */
-    QUANTITY_CUT_RULE(3, "订单起量切换规则");
-
-    /**
-     * 游戏支付策略类型
-     */
-    private Integer type;
-
-    /**
-     * 游戏支付策略类型名称
-     */
-    private String name;
-
-    public static String getNameByType(Integer type) {
-        for (GameStrategyTypeEnum gameStrategyTypeEnum : GameStrategyTypeEnum.values()) {
-            if (Objects.equals(type, gameStrategyTypeEnum.getType())) {
-                return gameStrategyTypeEnum.getName();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 294
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/HttpStatusEnum.java

@@ -1,294 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-07
- * @description : 用户状态
- */
-@Getter
-@AllArgsConstructor
-public enum HttpStatusEnum {
-
-    /**
-     * 成功
-     */
-    SUCCESS(200, "success"),
-
-    /**
-     * 失败
-     */
-    FAIL(400, "failed"),
-
-    /**
-     * 服务器异常
-     */
-    ERROR(500, "服务器异常"),
-
-    /**
-     * 未知错误
-     */
-    UNKNOWN_ERROR(-9999, "未知错误"),
-
-    /**
-     * 请先登录
-     */
-    USER_NO_LOGIN(40400, "请登录"),
-
-    /**
-     * 用户名为空
-     */
-    USERNAME_EMPTY(41101, "用户名为空"),
-
-    /**
-     * 用户名含敏感字
-     */
-    USERNAME_SENSITIVE(41102, "用户名含敏感字"),
-
-    /**
-     * 用户名已存在
-     */
-    USERNAME_EXISTS(41103, "用户名已存在"),
-
-    /**
-     * 用户名不存在
-     */
-    USERNAME_NOT_EXISTS(41114, "用户名不存在"),
-
-    /**
-     * 用户名或密码错误
-     */
-    USERNAME_OR_PASSWORD_ERR(41104, "用户名或密码错误"),
-
-    /**
-     * 用户名太短
-     */
-    USERNAME_TOO_SHORT(41105, "用户名太短"),
-
-    /**
-     * 用户名太长
-     */
-    USERNAME_TOO_LONG(41106, "用户名太长"),
-
-    /**
-     * 用户名必须为数字字母组合
-     */
-    USERNAME_BAD_CHAR(41107, "用户名必须为数字字母组合"),
-
-    /**
-     * 账号停用
-     */
-    ACCOUNT_HALT(41108, "账号停用"),
-
-    /**
-     * ip封禁
-     */
-    IP_HALT(41109, "ip封禁"),
-
-    /**
-     * 账户未绑定手机
-     */
-    ACCOUNT_NOT_BIND_PHONE(41110, "账户未绑定手机"),
-
-    /**
-     * 手机号请使用手机注册
-     */
-    USERNAME_LIKE_MOBILE(41113, "手机号请使用手机注册"),
-
-    /**
-     * 密码为空
-     */
-    PASSWORD_EMPTY(41201, "密码为空"),
-
-    /**
-     * 密码必须为数字字母组合
-     */
-    PASSWORD_BAD_CHAR(41202, "密码必须为数字字母组合"),
-
-    /**
-     * 密码太长
-     */
-    PASSWORD_TOO_LONG(41203, "密码太长"),
-
-    /**
-     * 密码太短
-     */
-    PASSWORD_TOO_SHORT(41204, "密码太短"),
-
-    /**
-     * 密码错误
-     */
-    PASSWORD_ERROR(41205, "密码错误"),
-
-    /**
-     * 旧密码错误
-     */
-    OLD_PASSWORD_ERROR(41206, "旧密码错误"),
-
-    /**
-     * 旧密码不可为空
-     */
-    OLD_PASSWORD_EMPTY(41207, "旧密码不可为空"),
-
-    /**
-     * 手机号为空
-     */
-    PHONE_EMPTY(41301, "手机号为空"),
-
-    /**
-     * 手机号格式错误
-     */
-    PHONE_ERROR(41302, "手机号格式错误"),
-
-    /**
-     * 未绑定手机号
-     */
-    PHONE_NOT_BIND(41304, "未绑定手机号"),
-
-    /**
-     * 账号已绑定该手机号
-     */
-    PHONE_IS_BIND(41305, "账号已绑定该手机号"),
-
-    /**
-     * 验证码发送过于频繁
-     */
-    PHONE_SEND_MORE(41306, "验证码发送过于频繁"),
-
-    /**
-     * 验证码发送失败
-     */
-    PHONE_SEND_ERROR(41307, "验证码发送失败"),
-
-    /**
-     * 验证码已发送请稍后再试
-     */
-    PHONE_HAS_SEND(41308, "验证码已发送请稍后再试"),
-
-    /**
-     * 手机号已注册
-     */
-    PHONE_IS_REG(41309, "手机号已注册"),
-
-    /**
-     * 手机号未注册
-     */
-    PHONE_NOT_REG(41310, "手机号未注册"),
-
-    /**
-     * 请先校验原有手机号
-     */
-    PHONE_NOT_CHECK(41311, "请先校验原有手机号"),
-
-    /**
-     * 手机号绑定账号过多
-     */
-    PHONE_BIND_TOO_MUCH(41312, "手机号绑定账号过多"),
-
-    /**
-     * 手机号错误
-     */
-    PHONE_NUM_ERROR(41313, "手机号错误"),
-
-    /**
-     * 验证码错误
-     */
-    CODE_ERROR(41601, "验证码错误"),
-
-    /**
-     * 验证码类型错误
-     */
-    CODE_TYPE_ERROR(41602, "验证码类型错误"),
-
-    /**
-     * 验证码类型错误
-     */
-    CODE_NOT_SEND(41603, "验证码类型错误"),
-
-    /**
-     * 验证码已过期
-     */
-    CODE_IS_EXPIRED(41604, "验证码已过期"),
-
-    /**
-     * 配置错误
-     */
-    CONFIG_ERROR(41699, "配置错误"),
-
-    /**
-     * 参数非法
-     */
-    INVALID_PARAMS(1000, "参数非法"),
-
-    /**
-     * 订单游戏id为空
-     */
-    ORDER_GAME_ID_IS_NULL(41501, "订单游戏id为空"),
-
-    /**
-     * 订单不存在
-     */
-    ORDER_NO_FIND(41502, "订单不存在"),
-
-    /**
-     * 玩家充值未达标
-     */
-    ORDER_AMOUNT_IS_NULL(41503, "订单金额为空"),
-
-    /**
-     * 生成access_token失败
-     */
-    ACCESS_TOKEN_CREATE_ERROR(41504, "生成access_token失败"),
-
-    /**
-     * 米大师连接失败
-     */
-    MDS_CONNECT_ERROR(41505, "米大师连接失败"),
-
-    /**
-     * 获取配置异常
-     */
-    GET_CONFIG_ERROR(41507, "获取配置异常"),
-
-    /**
-     * 游戏用户未创建成功
-     */
-    GAME_USER_UN_CREATE(41511, "更新游戏角色时,检测为先创建游戏用户"),
-
-    /**
-     * 实名认证名字不合法
-     */
-    CARD_NAME_ERROR(41512, "名字输入错误"),
-
-    /**
-     * 实名认证身份证号不合法
-     */
-    CARD_ID_ERROR(41513, "身份证号输入错误"),
-
-    /**
-     * 已实名认证, 不可重复操作
-     */
-    REPEAT_OPERATE(41514, "已实名认证, 不可重复操作"),
-
-    /**
-     * 实名认证失败
-     */
-    AUTHENTICATION_FAIL(41515, "实名认证失败"),
-
-    /**
-     * 参数为空
-     */
-    PARAM_IS_NULL(41500, "参数为空:");
-
-    /**
-     * 回传类型
-     */
-    private final Integer code;
-
-    /**
-     * 回传名称
-     */
-    private final String msg;
-}

+ 0 - 33
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/MaxPayLock.java

@@ -1,33 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author xufeng
- * @date 2022/6/13 13:39
- */
-@Getter
-@AllArgsConstructor
-public enum MaxPayLock {
-
-    /**
-     * 已锁定
-     */
-    LOCK(1, "已锁定"),
-
-    /**
-     * 未锁定
-     */
-    UNLOCK(0, "未锁定");
-
-    /**
-     * 状态
-     */
-    private Integer code;
-
-    /**
-     * 描述
-     */
-    private String name;
-}

+ 0 - 44
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/OrderStateEnum.java

@@ -1,44 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-07
- * @description : 用户状态
- */
-@Getter
-@AllArgsConstructor
-public enum OrderStateEnum {
-
-    /**
-     * 预下单
-     */
-    READY_PAY(0, "预下单"),
-
-    /**
-     * 待支付
-     */
-    WAIT_PAY(1, "待支付"),
-
-    /**
-     * 支付成功
-     */
-    SUCCESS_PAY(2, "支付成功"),
-
-    /**
-     * 订单关闭
-     */
-    CANCEL_PAY(-1, "订单关闭");
-
-    /**
-     * 状态
-     */
-    private final Integer code;
-
-    /**
-     * 描述
-     */
-    private final String msg;
-}

+ 0 - 77
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/OsEnum.java

@@ -1,77 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-30
- * @description : 操作系统类型
- */
-@Getter
-@AllArgsConstructor
-public enum OsEnum {
-
-    /**
-     * 安卓
-     */
-    SYSTEM_ANDROID(1, "android", "安卓手机操作系统"),
-
-    /**
-     * 苹果
-     */
-    SYSTEM_IOS(2, "ios", "苹果手机操作系统"),
-
-    /**
-     * window操作系统
-     */
-    SYSTEM_WINDOW(3, "windows", "window操作系统"),
-
-    /**
-     * Mac操作系统
-     */
-    SYSTEM_MAC(4, "mac", "Mac操作系统"),
-
-    /**
-     * linux操作系统
-     */
-    SYSTEM_LINUX(5, "linux", "linux操作系统"),
-
-    /**
-     * 其它操作系统
-     */
-    SYSTEM_OTHER(0, "other", "other操作系统");
-
-    /**
-     * 数据类型
-     */
-    private Integer osType;
-
-    /**
-     * 平台id
-     */
-    private String os;
-
-    /**
-     * 平台名称
-     */
-    private String osName;
-
-
-    /**
-     * 得到名字
-     *
-     * @param name 名字
-     * @return {@link Integer}
-     */
-    public static Integer getByName(String name) {
-        for (OsEnum osEnum : OsEnum.values()) {
-            if (Objects.equals(name, osEnum.getOsName())) {
-                return osEnum.getOsType();
-            }
-        }
-        return OsEnum.SYSTEM_OTHER.osType;
-    }
-}

+ 0 - 51
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/Pay/AlipayPayConfigEnum.java

@@ -1,51 +0,0 @@
-package com.zanxiang.game.common.enums.Pay;
-
-import lombok.Getter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author xufeng
- * @date 2022/6/9 15:29
- */
-@Getter
-public enum AlipayPayConfigEnum {
-    APPID("appId", "商户支付appId", false),
-    ALIPAYPUBLICKEY("alipayPublicKey", "支付宝公钥key", false),
-    MERCHANTPRIVATEKEY("merchantPrivateKey", "商户私钥key", false),
-    SIGNTYPE("signType", "加密方式", false),
-    MERCHANTCERTPATH("merchantCertPath", "商户证书", true),
-    ALIPAYCERTPATH("alipayCertPath", "支付宝证书", true),
-    ALIPAYROOTCERTPATH("alipayRootCertPath", "支付宝根证书", true);
-
-    private final String code;
-    private final String msg;
-    private Boolean isFile; //是否为文件
-
-    AlipayPayConfigEnum(String code, String msg, Boolean isFile) {
-        this.code = code;
-        this.msg = msg;
-        this.isFile = isFile;
-    }
-
-    public static List<String> getCodeList() {
-        List<String> arr = new ArrayList<>(20);
-        AlipayPayConfigEnum[] data = AlipayPayConfigEnum.values();
-        if (data.length == 0) {
-            return arr;
-        }
-        for (int i = 0; i < data.length; i++) {
-            arr.add(data[i].getCode());
-        }
-        return arr;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-}

+ 0 - 46
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/Pay/WxPayConfigEnum.java

@@ -1,46 +0,0 @@
-package com.zanxiang.game.common.enums.Pay;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author xufeng
- * @date 2022/6/9 15:29
- */
-public enum WxPayConfigEnum {
-    APPID("appId", "商户支付appId"),
-    APPSECRET("appSecret", "公众帐号secert"),
-    MCHID("mchId", "商户号"),
-    APIKEY("apiKey", "商户支付密钥"),
-    SIGNTYPE("signType", "加密方式"),
-    CERTPATH("certPath", "密钥地址"),
-    NOTIFYURL("notifyUrl", "回调地址(默认为空即可)");
-
-    private final String code;
-    private final String msg;
-
-    WxPayConfigEnum(String code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public static List<String> getCodeList() {
-        List<String> arr = new ArrayList<>(20);
-        WxPayConfigEnum[] data = WxPayConfigEnum.values();
-        if (data.length == 0) {
-            return arr;
-        }
-        for (int i = 0; i < data.length; i++) {
-            arr.add(data[i].getCode());
-        }
-        return arr;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-}

+ 0 - 49
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PayApplicationTypeEnum.java

@@ -1,49 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-25
- * @description : 应用类型枚举
- */
-@Getter
-@AllArgsConstructor
-public enum PayApplicationTypeEnum {
-
-    /**
-     * 微信小程序
-     */
-    WX_MINI_APP(1, "微信小程序"),
-
-    /**
-     * 微信公众号
-     */
-    WX_MP(2, "微信公众号"),
-
-    /**
-     * 支付宝应用
-     */
-    ALI_PAY_APP(3, "支付宝应用");
-
-    /**
-     * 应用类型
-     */
-    private Integer type;
-
-    /**
-     * 描述
-     */
-    private String describe;
-
-    public static String getDescByType(Integer type) {
-        PayApplicationTypeEnum[] values = PayApplicationTypeEnum.values();
-        for (PayApplicationTypeEnum value : values) {
-            if (value.getType().equals(type)) {
-                return value.getDescribe();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 85
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PayDeviceEnum.java

@@ -1,85 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 支付设备类型
- *
- * @author xufeng
- * @date 2022/6/16 18:07
- */
-@Getter
-@AllArgsConstructor
-public enum PayDeviceEnum {
-
-    /**
-     * Pc端支付
-     */
-    PC_PAY(1L, "PC", "PC二维码支付"),
-
-    /**
-     * h5支付
-     */
-    H5_PAY(2L, "H5", "H5支付"),
-
-    /**
-     * App支付
-     */
-    APP_PAY(3L, "APP", "APP支付"),
-
-    /**
-     * 小程序支付
-     */
-    APPLET_PAY(4L, "APPLET", "盒子支付"),
-
-    /**
-     * 米大师支付
-     */
-    MI_PAY(5L, "MI_PAY", "米大师支付"),
-
-    /**
-     * 客服支付
-     */
-    CUSTOM_PAY(6L, "CUSTOM_PAY", "客服支付");
-
-    /**
-     * 支付方式id
-     */
-    private Long payDeviceId;
-
-    /**
-     * 支付方式key
-     */
-    private String payDeviceKey;
-
-    /**
-     * 支付方式名称
-     */
-    private String payDeviceName;
-
-    public static String getDescByNum(Integer code) {
-        PayDeviceEnum[] values = PayDeviceEnum.values();
-        for (int i = 0; i < values.length; i++) {
-            if (values[i].getPayDeviceId().equals(code)) {
-                return values[i].getPayDeviceName();
-            }
-        }
-        return "";
-    }
-
-    public static String getDesc(String obj) {
-        List<String> Desc = new ArrayList<>(10);
-        String str = obj.substring(1, obj.length() - 1);
-        String[] strArr = str.split(",");
-        for (int i = 0; i < strArr.length; i++) {
-            String name = PayDeviceEnum.getDescByNum(Integer.valueOf(strArr[i]));
-            Desc.add(name);
-        }
-        return Desc.stream().collect(Collectors.joining(","));
-    }
-}

+ 0 - 66
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PayWayEnum.java

@@ -1,66 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * 支付渠道枚举
- *
- * @author xufeng
- * @date 2022/6/9 10:41
- */
-@Getter
-@AllArgsConstructor
-public enum PayWayEnum {
-
-    /**
-     * 支付宝
-     */
-    ALI_PAY(1, "ALI_PAY", "支付宝"),
-
-    /**
-     * 微信
-     */
-    WX_PAY(2, "WX_PAY", "微信"),
-
-    /**
-     * 米大师
-     */
-    MI_PAY(3, "MI_PAY", "米大师");
-
-    /**
-     * 支付渠道id
-     */
-    private Integer payWayId;
-
-    /**
-     * 支付渠道key
-     */
-    private String payWayKey;
-
-    /**
-     * 支付渠道名称
-     */
-    private String payWayName;
-
-    /**
-     * 根据书城key获取名称
-     *
-     * @param payType : 支付类型
-     * @return : 支付类型枚举
-     */
-    public static String getByPayType(Long payType) {
-        if (payType == null) {
-            return null;
-        }
-        for (PayWayEnum payWayEnum : PayWayEnum.values()) {
-            if (Objects.equals(payType.intValue(), payWayEnum.getPayWayId())) {
-                return payWayEnum.getPayWayName();
-            }
-        }
-        return null;
-    }
-
-}

+ 0 - 57
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PromoAccountTypeEnum.java

@@ -1,57 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广账号类型
- */
-@Getter
-@AllArgsConstructor
-public enum PromoAccountTypeEnum {
-
-    /**
-     * 微信公众号
-     */
-    ACCOUNT_WX_MP(1, "微信公众号"),
-
-    /**
-     * 今日头条账号
-     */
-    ACCOUNT_BYTE(2, "今日头条账号"),
-
-    /**
-     * ADQ(QQ)账号
-     */
-    ACCOUNT_ADQ_QQ(3, "ADQ(QQ)账号");
-
-    /**
-     * 账号类型
-     */
-    private Integer type;
-
-    /**
-     * 账号类型名称
-     */
-    private String name;
-
-    /**
-     * 被类型名称
-     *
-     * @param type 类型
-     * @return {@link String}
-     */
-    public static String getNameByType(Integer type) {
-        PromoAccountTypeEnum[] values = PromoAccountTypeEnum.values();
-        for (PromoAccountTypeEnum promoAccountTypeEnum : values) {
-            if (Objects.equals(promoAccountTypeEnum.getType(), type)) {
-                return promoAccountTypeEnum.getName();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 62
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PromoMediaTypeEnum.java

@@ -1,62 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-17
- * @description : 推广媒体类型
- */
-@Getter
-@AllArgsConstructor
-public enum PromoMediaTypeEnum {
-
-    /**
-     * 社交类
-     */
-    MEDIA_SOCIAL_CONTACT(1, "社交类"),
-
-    /**
-     * 短视频
-     */
-    MEDIA_SHORT_VIDEO(2, "短视频"),
-
-    /**
-     * 资讯
-     */
-    MEDIA_NEWS_INFO(3, "资讯"),
-
-    /**
-     * 视频
-     */
-    MEDIA_VIDEO(4, "视频");
-
-    /**
-     * 媒体类型
-     */
-    private Integer type;
-
-    /**
-     * 媒体名称
-     */
-    private String name;
-
-    /**
-     * 被类型名称
-     *
-     * @param type 类型
-     * @return {@link String}
-     */
-    public static String getNameByType(Integer type) {
-        PromoMediaTypeEnum[] values = PromoMediaTypeEnum.values();
-        for (PromoMediaTypeEnum promoMediaTypeEnum : values) {
-            if (Objects.equals(promoMediaTypeEnum.getType(), type)) {
-                return promoMediaTypeEnum.getName();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 57
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/PromoProviderEnum.java

@@ -1,57 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : 推广服务商
- */
-@Getter
-@AllArgsConstructor
-public enum PromoProviderEnum {
-
-    /**
-     * 巨网
-     */
-    JU_GU(1, "巨网"),
-
-    /**
-     * 广联
-     */
-    GUANG_LIAN(2, "广联"),
-
-    /**
-     * 太古
-     */
-    TAI_GU(3, "太古");
-
-    /**
-     * 推广服务商id
-     */
-    private Integer providerId;
-
-    /**
-     * 推广媒体
-     */
-    private String providerName;
-
-    /**
-     * 被类型名称
-     *
-     * @param type 类型
-     * @return {@link String}
-     */
-    public static String getNameByType(Integer type) {
-        PromoProviderEnum[] values = PromoProviderEnum.values();
-        for (PromoProviderEnum promoProviderEnum : values) {
-            if (Objects.equals(promoProviderEnum.getProviderId(), type)) {
-                return promoProviderEnum.getProviderName();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 61
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/SmsTypeEnum.java

@@ -1,61 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-07
- * @description : 手机验证码类型枚举
- */
-@Getter
-@AllArgsConstructor
-public enum SmsTypeEnum {
-
-    /**
-     * 注册登录
-     */
-    SMS_REG(1, "注册登录"),
-
-    /**
-     * 修改密码
-     */
-    SMS_MODIFY(2, "修改密码"),
-
-    /**
-     * 绑定手机
-     */
-    SMS_BIND(3, "绑定手机"),
-
-    /**
-     * 找回密码
-     */
-    SMS_FIND_PWD(4, "找回密码");
-
-    /**
-     * 类型
-     */
-    private Integer type;
-
-    /**
-     * 描述
-     */
-    private String describe;
-
-    /**
-     * 根据type获取枚举
-     *
-     * @return : 返回枚举对象
-     */
-    public static SmsTypeEnum getByType(Integer type) {
-        if (type == null) {
-            return null;
-        }
-        return Arrays.stream(SmsTypeEnum.values())
-                .filter(e -> Objects.equals(e.getType(), type))
-                .findFirst().orElse(null);
-    }
-}

+ 0 - 33
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/StatusEnum.java

@@ -1,33 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author xufeng
- * @date 2022/6/13 11:39
- */
-@Getter
-@AllArgsConstructor
-public enum StatusEnum {
-
-    /**
-     * 正常
-     */
-    YES(0, "正常"),
-
-    /**
-     * 禁止
-     */
-    NO(1, "禁止");
-
-    /**
-     * 状态
-     */
-    private int code;
-
-    /**
-     * 描述
-     */
-    private String name;
-}

+ 0 - 84
game-module/game-common/src/main/java/com/zanxiang/game/common/enums/VipLevelEnum.java

@@ -1,84 +0,0 @@
-package com.zanxiang.game.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-30
- * @description : vip等级枚举
- */
-@Getter
-@AllArgsConstructor
-public enum VipLevelEnum {
-
-    /**
-     * vip_0
-     */
-    VIP_LEVEL_ZERO(0, "0"),
-
-    /**
-     * vip_1
-     */
-    VIP_LEVEL_ONE(1, "1"),
-
-    /**
-     * vip_2
-     */
-    VIP_LEVEL_TWO(2, "2"),
-
-    /**
-     * vip_3
-     */
-    VIP_LEVEL_THREE(3, "3"),
-
-    /**
-     * vip_4
-     */
-    VIP_LEVEL_FOUR(4, "4"),
-
-    /**
-     * vip_5
-     */
-    VIP_LEVEL_FIVE(5, "5"),
-
-    /**
-     * vip_6
-     */
-    VIP_LEVEL_SIX(6, "6"),
-
-    /**
-     * vip_7
-     */
-    VIP_LEVEL_SEVEN(7, "7"),
-
-    /**
-     * vip_8
-     */
-    VIP_LEVEL_EIGHT(8, "8"),
-
-    /**
-     * vip_9
-     */
-    VIP_LEVEL_NINE(9, "9"),
-
-    /**
-     * vip_10
-     */
-    VIP_LEVEL_TEN(10, "10"),
-
-    /**
-     * vip_10以上
-     */
-    VIP_LEVEL_GT_TEN(1010, "10以上");
-
-    /**
-     * vip等级
-     */
-    private Integer vipLevel;
-
-    /**
-     * vip等级名称
-     */
-    private String vipLevelName;
-}

+ 0 - 59
game-module/game-common/src/main/java/com/zanxiang/game/common/exception/BaseException.java

@@ -1,59 +0,0 @@
-package com.zanxiang.game.common.exception;
-
-/**
- * 基础异常
- */
-public class BaseException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 所属模块
-     */
-    private String module;
-
-    /**
-     * 错误码
-     */
-    private String code;
-
-    /**
-     * 错误码对应的参数
-     */
-    private Object[] args;
-
-    public BaseException(String module, String code, Object[] args, String message) {
-        super(message);
-        this.module = module;
-        this.code = code;
-        this.args = args;
-    }
-
-    public BaseException(String module, String code, Object[] args) {
-        this(module, code, args, null);
-    }
-
-    public BaseException(String module, String message) {
-        this(module, null, null, message);
-    }
-
-    public BaseException(String code, Object[] args) {
-        this(null, code, args, null);
-    }
-
-    public BaseException(String message) {
-        this(null, null, null, message);
-    }
-
-    public String getModule() {
-        return module;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public Object[] getArgs() {
-        return args;
-    }
-}
-

+ 0 - 42
game-module/game-common/src/main/java/com/zanxiang/game/common/exception/CustomException.java

@@ -1,42 +0,0 @@
-package com.zanxiang.game.common.exception;
-
-import com.zanxiang.game.common.enums.HttpStatusEnum;
-
-/**
- * 自定义异常
- */
-public class CustomException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    private Integer code;
-
-    private String message;
-
-    public CustomException(String message) {
-        this.message = message;
-    }
-
-    public CustomException(String message, Integer code) {
-        this.message = message;
-        this.code = code;
-    }
-
-    public CustomException(HttpStatusEnum httpStatusEnum) {
-        this.message = httpStatusEnum.getMsg();
-        this.code = httpStatusEnum.getCode();
-    }
-
-    public CustomException(String message, Throwable e) {
-        super(message, e);
-        this.message = message;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-}

+ 0 - 19
game-module/game-common/src/main/java/com/zanxiang/game/common/exception/ParamNullException.java

@@ -1,19 +0,0 @@
-package com.zanxiang.game.common.exception;
-
-/**
- * 参数为空异常
- *
- * @author xufeng
- * @date 2022/6/22 17:31
- */
-public class ParamNullException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    private Integer code;
-
-    private String message;
-
-    public ParamNullException(String message) {
-        this.message = message;
-    }
-}

+ 0 - 13
game-module/game-common/src/main/java/com/zanxiang/game/common/exception/PreAuthorizeException.java

@@ -1,13 +0,0 @@
-package com.zanxiang.game.common.exception;
-
-/**
- * 权限异常
- *
- * @author ruoyi
- */
-public class PreAuthorizeException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public PreAuthorizeException() {
-    }
-}

+ 0 - 22
game-module/game-common/src/main/java/com/zanxiang/game/common/exception/UtilException.java

@@ -1,22 +0,0 @@
-package com.zanxiang.game.common.exception;
-
-/**
- * 工具类异常
- *
- * @author ruoyi
- */
-public class UtilException extends RuntimeException {
-    private static final long serialVersionUID = 8247610319171014183L;
-
-    public UtilException(Throwable e) {
-        super(e.getMessage(), e);
-    }
-
-    public UtilException(String message) {
-        super(message);
-    }
-
-    public UtilException(String message, Throwable throwable) {
-        super(message, throwable);
-    }
-}

+ 0 - 101
game-module/game-common/src/main/java/com/zanxiang/game/common/handler/GlobalExceptionHandler.java

@@ -1,101 +0,0 @@
-package com.zanxiang.game.common.handler;
-
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.common.enums.HttpStatusEnum;
-import com.zanxiang.game.common.exception.BaseException;
-import com.zanxiang.game.common.exception.CustomException;
-import com.zanxiang.game.common.exception.ParamNullException;
-import com.zanxiang.game.common.exception.PreAuthorizeException;
-import com.zanxiang.game.common.utils.StringUtils;
-import com.zanxiang.game.common.utils.http.AjaxResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.validation.BindException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
-
-/**
- * 全局异常处理器
- */
-@RestControllerAdvice
-public class GlobalExceptionHandler {
-    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
-
-    /**
-     * 基础异常
-     */
-    @ExceptionHandler(BaseException.class)
-    public ResultVO<?> baseException(BaseException e) {
-        return ResultVO.fail(e.getMessage());
-    }
-
-    /**
-     * 业务异常
-     */
-    @ExceptionHandler(CustomException.class)
-    public ResultVO<?> businessException(CustomException e) {
-        if (StringUtils.isNull(e.getCode())) {
-            return ResultVO.fail(e.getMessage());
-        }
-        return new ResultVO<>(e.getCode(), e.getMessage());
-    }
-
-    /**
-     * 参数异常
-     */
-    @ExceptionHandler(ParamNullException.class)
-    public ResultVO<?> paramNullException(CustomException e) {
-        if (StringUtils.isNull(e.getCode())) {
-            return new ResultVO<>(HttpStatusEnum.PARAM_IS_NULL.getCode(), HttpStatusEnum.PARAM_IS_NULL.getMsg() + e.getMessage());
-        }
-        return new ResultVO<>(e.getCode(), e.getMessage());
-    }
-
-    @ExceptionHandler(Exception.class)
-    public ResultVO<?> handleException(Exception e) {
-        log.error(e.getMessage(), e);
-        return ResultVO.fail("操作异常");
-    }
-
-    /**
-     * 自定义验证异常
-     */
-    @ExceptionHandler(BindException.class)
-    public ResultVO<?> validatedBindException(BindException e) {
-        log.error(e.getMessage(), e);
-        String message = e.getAllErrors().get(0).getDefaultMessage();
-        return ResultVO.fail(message);
-    }
-
-    /**
-     * 参数类型不匹配导致转换异常
-     *
-     * @param e
-     * @return
-     */
-    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
-    public ResultVO<?> mismatchErrorHandler(MethodArgumentTypeMismatchException e) {
-        log.error("方法:{},字段:{},参数:{},错误信息:{}", e.getParameter().getMethod(), e.getName(), e.getValue(), e.getMessage());
-        return ResultVO.fail("参数异常,请勿非法操作");
-    }
-
-    /**
-     * 自定义验证异常
-     */
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public Object validExceptionHandler(MethodArgumentNotValidException e) {
-        log.error(e.getMessage(), e);
-        String message = e.getBindingResult().getFieldError().getDefaultMessage();
-        return AjaxResult.error(message);
-    }
-
-    /**
-     * 权限异常
-     */
-    @ExceptionHandler(PreAuthorizeException.class)
-    public ResultVO<?> preAuthorizeException(PreAuthorizeException e) {
-        return ResultVO.fail("没有权限,请联系管理员授权");
-    }
-}

+ 0 - 91
game-module/game-common/src/main/java/com/zanxiang/game/common/text/CharsetKit.java

@@ -1,91 +0,0 @@
-package com.zanxiang.game.common.text;
-
-import org.springframework.util.StringUtils;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-/**
- * 字符集工具类
- *
- * @author ruoyi
- */
-public class CharsetKit {
-    /**
-     * ISO-8859-1
-     */
-    public static final String ISO_8859_1 = "ISO-8859-1";
-    /**
-     * UTF-8
-     */
-    public static final String UTF_8 = "UTF-8";
-    /**
-     * GBK
-     */
-    public static final String GBK = "GBK";
-
-    /**
-     * ISO-8859-1
-     */
-    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
-    /**
-     * UTF-8
-     */
-    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
-    /**
-     * GBK
-     */
-    public static final Charset CHARSET_GBK = Charset.forName(GBK);
-
-    /**
-     * 转换为Charset对象
-     *
-     * @param charset 字符集,为空则返回默认字符集
-     * @return Charset
-     */
-    public static Charset charset(String charset) {
-        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
-    }
-
-    /**
-     * 转换字符串的字符集编码
-     *
-     * @param source      字符串
-     * @param srcCharset  源字符集,默认ISO-8859-1
-     * @param destCharset 目标字符集,默认UTF-8
-     * @return 转换后的字符集
-     */
-    public static String convert(String source, String srcCharset, String destCharset) {
-        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
-    }
-
-    /**
-     * 转换字符串的字符集编码
-     *
-     * @param source      字符串
-     * @param srcCharset  源字符集,默认ISO-8859-1
-     * @param destCharset 目标字符集,默认UTF-8
-     * @return 转换后的字符集
-     */
-    public static String convert(String source, Charset srcCharset, Charset destCharset) {
-        if (null == srcCharset) {
-            srcCharset = StandardCharsets.ISO_8859_1;
-        }
-
-        if (null == destCharset) {
-            srcCharset = StandardCharsets.UTF_8;
-        }
-
-        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
-            return source;
-        }
-        return new String(source.getBytes(srcCharset), destCharset);
-    }
-
-    /**
-     * @return 系统字符集编码
-     */
-    public static String systemCharset() {
-        return Charset.defaultCharset().name();
-    }
-}

+ 0 - 870
game-module/game-common/src/main/java/com/zanxiang/game/common/text/Convert.java

@@ -1,870 +0,0 @@
-package com.zanxiang.game.common.text;
-
-
-import com.zanxiang.game.common.utils.StringUtils;
-import com.zanxiang.module.util.JsonUtil;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.text.NumberFormat;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 类型转换器
- *
- * @author ruoyi
- */
-public class Convert {
-    /**
-     * 转换为字符串<br>
-     * 如果给定的值为null,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static String toStr(Object value, String defaultValue) {
-        if (null == value) {
-            return defaultValue;
-        }
-        if (value instanceof String) {
-            return (String) value;
-        }
-        return value.toString();
-    }
-
-    /**
-     * 转换为字符串<br>
-     * 如果给定的值为<code>null</code>,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static String toStr(Object value) {
-        return toStr(value, null);
-    }
-
-    /**
-     * 转换为字符<br>
-     * 如果给定的值为null,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Character toChar(Object value, Character defaultValue) {
-        if (null == value) {
-            return defaultValue;
-        }
-        if (value instanceof Character) {
-            return (Character) value;
-        }
-
-        final String valueStr = toStr(value, null);
-        return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
-    }
-
-    /**
-     * 转换为字符<br>
-     * 如果给定的值为<code>null</code>,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Character toChar(Object value) {
-        return toChar(value, null);
-    }
-
-    /**
-     * 转换为byte<br>
-     * 如果给定的值为<code>null</code>,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Byte toByte(Object value, Byte defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Byte) {
-            return (Byte) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).byteValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Byte.parseByte(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为byte<br>
-     * 如果给定的值为<code>null</code>,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Byte toByte(Object value) {
-        return toByte(value, null);
-    }
-
-    /**
-     * 转换为Short<br>
-     * 如果给定的值为<code>null</code>,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Short toShort(Object value, Short defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Short) {
-            return (Short) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).shortValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Short.parseShort(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Short<br>
-     * 如果给定的值为<code>null</code>,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Short toShort(Object value) {
-        return toShort(value, null);
-    }
-
-    /**
-     * 转换为Number<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Number toNumber(Object value, Number defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Number) {
-            return (Number) value;
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return NumberFormat.getInstance().parse(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Number<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Number toNumber(Object value) {
-        return toNumber(value, null);
-    }
-
-    /**
-     * 转换为int<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Integer toInt(Object value, Integer defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Integer) {
-            return (Integer) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).intValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Integer.parseInt(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为int<br>
-     * 如果给定的值为<code>null</code>,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Integer toInt(Object value) {
-        return toInt(value, null);
-    }
-
-    /**
-     * 转换为Integer数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static Integer[] toIntArray(String str) {
-        return toIntArray(",", str);
-    }
-
-    /**
-     * 转换为Long数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static Long[] toLongArray(String str) {
-        return toLongArray(",", str);
-    }
-
-    /**
-     * 转换为Integer数组<br>
-     *
-     * @param split 分隔符
-     * @param split 被转换的值
-     * @return 结果
-     */
-    public static Integer[] toIntArray(String split, String str) {
-        if (StringUtils.isEmpty(str)) {
-            return new Integer[]{};
-        }
-        String[] arr = str.split(split);
-        final Integer[] ints = new Integer[arr.length];
-        for (int i = 0; i < arr.length; i++) {
-            final Integer v = toInt(arr[i], 0);
-            ints[i] = v;
-        }
-        return ints;
-    }
-
-    /**
-     * 转换为Long数组<br>
-     *
-     * @param split 分隔符
-     * @param str   被转换的值
-     * @return 结果
-     */
-    public static Long[] toLongArray(String split, String str) {
-        if (StringUtils.isEmpty(str)) {
-            return new Long[]{};
-        }
-        String[] arr = str.split(split);
-        final Long[] longs = new Long[arr.length];
-        for (int i = 0; i < arr.length; i++) {
-            final Long v = toLong(arr[i], null);
-            longs[i] = v;
-        }
-        return longs;
-    }
-
-    /**
-     * 转换为String数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static String[] toStrArray(String str) {
-        return toStrArray(",", str);
-    }
-
-    /**
-     * 转换为String数组<br>
-     *
-     * @param split 分隔符
-     * @param split 被转换的值
-     * @return 结果
-     */
-    public static String[] toStrArray(String split, String str) {
-        return str.split(split);
-    }
-
-    /**
-     * 转换为long<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Long toLong(Object value, Long defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Long) {
-            return (Long) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            // 支持科学计数法
-            return new BigDecimal(valueStr.trim()).longValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为long<br>
-     * 如果给定的值为<code>null</code>,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Long toLong(Object value) {
-        return toLong(value, null);
-    }
-
-    /**
-     * 转换为double<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Double toDouble(Object value, Double defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Double) {
-            return (Double) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).doubleValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            // 支持科学计数法
-            return new BigDecimal(valueStr.trim()).doubleValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为double<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Double toDouble(Object value) {
-        return toDouble(value, null);
-    }
-
-    /**
-     * 转换为Float<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Float toFloat(Object value, Float defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Float) {
-            return (Float) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).floatValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Float.parseFloat(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Float<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Float toFloat(Object value) {
-        return toFloat(value, null);
-    }
-
-    /**
-     * 转换为boolean<br>
-     * String支持的值为:truefalse、yes、ok、no,1,0 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Boolean toBool(Object value, Boolean defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Boolean) {
-            return (Boolean) value;
-        }
-        String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        valueStr = valueStr.trim().toLowerCase();
-        switch (valueStr) {
-            case "true":
-                return true;
-            case "false":
-                return false;
-            case "yes":
-                return true;
-            case "ok":
-                return true;
-            case "no":
-                return false;
-            case "1":
-                return true;
-            case "0":
-                return false;
-            default:
-                return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为boolean<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Boolean toBool(Object value) {
-        return toBool(value, null);
-    }
-
-    /**
-     * 转换为Enum对象<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     *
-     * @param clazz        Enum的Class
-     * @param value        值
-     * @param defaultValue 默认值
-     * @return Enum
-     */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (clazz.isAssignableFrom(value.getClass())) {
-            @SuppressWarnings("unchecked")
-            E myE = (E) value;
-            return myE;
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Enum.valueOf(clazz, valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Enum对象<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<code>null</code><br>
-     *
-     * @param clazz Enum的Class
-     * @param value 值
-     * @return Enum
-     */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value) {
-        return toEnum(clazz, value, null);
-    }
-
-    /**
-     * 转换为BigInteger<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof BigInteger) {
-            return (BigInteger) value;
-        }
-        if (value instanceof Long) {
-            return BigInteger.valueOf((Long) value);
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return new BigInteger(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为BigInteger<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static BigInteger toBigInteger(Object value) {
-        return toBigInteger(value, null);
-    }
-
-    /**
-     * 转换为BigDecimal<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof BigDecimal) {
-            return (BigDecimal) value;
-        }
-        if (value instanceof Long) {
-            return new BigDecimal((Long) value);
-        }
-        if (value instanceof Double) {
-            return new BigDecimal((Double) value);
-        }
-        if (value instanceof Integer) {
-            return new BigDecimal((Integer) value);
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return new BigDecimal(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为BigDecimal<br>
-     * 如果给定的值为空,或者转换失败,返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static BigDecimal toBigDecimal(Object value) {
-        return toBigDecimal(value, null);
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj 对象
-     * @return 字符串
-     */
-    public static String utf8Str(Object obj) {
-        return str(obj, CharsetKit.CHARSET_UTF_8);
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj         对象
-     * @param charsetName 字符集
-     * @return 字符串
-     */
-    public static String str(Object obj, String charsetName) {
-        return str(obj, Charset.forName(charsetName));
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj     对象
-     * @param charset 字符集
-     * @return 字符串
-     */
-    public static String str(Object obj, Charset charset) {
-        if (null == obj) {
-            return null;
-        }
-
-        if (obj instanceof String) {
-            return (String) obj;
-        } else if (obj instanceof byte[] || obj instanceof Byte[]) {
-            return str((Byte[]) obj, charset);
-        } else if (obj instanceof ByteBuffer) {
-            return str((ByteBuffer) obj, charset);
-        }
-        return obj.toString();
-    }
-
-    /**
-     * 将byte数组转为字符串
-     *
-     * @param bytes   byte数组
-     * @param charset 字符集
-     * @return 字符串
-     */
-    public static String str(byte[] bytes, String charset) {
-        return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
-    }
-
-    /**
-     * 解码字节码
-     *
-     * @param data    字符串
-     * @param charset 字符集,如果此字段为空,则解码的结果取决于平台
-     * @return 解码后的字符串
-     */
-    public static String str(byte[] data, Charset charset) {
-        if (data == null) {
-            return null;
-        }
-
-        if (null == charset) {
-            return new String(data);
-        }
-        return new String(data, charset);
-    }
-
-    /**
-     * 将编码的byteBuffer数据转换为字符串
-     *
-     * @param data    数据
-     * @param charset 字符集,如果为空使用当前系统字符集
-     * @return 字符串
-     */
-    public static String str(ByteBuffer data, String charset) {
-        if (data == null) {
-            return null;
-        }
-
-        return str(data, Charset.forName(charset));
-    }
-
-    /**
-     * 将编码的byteBuffer数据转换为字符串
-     *
-     * @param data    数据
-     * @param charset 字符集,如果为空使用当前系统字符集
-     * @return 字符串
-     */
-    public static String str(ByteBuffer data, Charset charset) {
-        if (null == charset) {
-            charset = Charset.defaultCharset();
-        }
-        return charset.decode(data).toString();
-    }
-
-    /**
-     * 半角转全角
-     *
-     * @param input String.
-     * @return 全角字符串.
-     */
-    public static String toSBC(String input) {
-        return toSBC(input, null);
-    }
-
-    /**
-     * 半角转全角
-     *
-     * @param input         String
-     * @param notConvertSet 不替换的字符集合
-     * @return 全角字符串.
-     */
-    public static String toSBC(String input, Set<Character> notConvertSet) {
-        char c[] = input.toCharArray();
-        for (int i = 0; i < c.length; i++) {
-            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-                // 跳过不替换的字符
-                continue;
-            }
-
-            if (c[i] == ' ') {
-                c[i] = '\u3000';
-            } else if (c[i] < '\177') {
-                c[i] = (char) (c[i] + 65248);
-
-            }
-        }
-        return new String(c);
-    }
-
-    /**
-     * 全角转半角
-     *
-     * @param input String.
-     * @return 半角字符串
-     */
-    public static String toDBC(String input) {
-        return toDBC(input, null);
-    }
-
-    /**
-     * 替换全角为半角
-     *
-     * @param text          文本
-     * @param notConvertSet 不替换的字符集合
-     * @return 替换后的字符
-     */
-    public static String toDBC(String text, Set<Character> notConvertSet) {
-        char c[] = text.toCharArray();
-        for (int i = 0; i < c.length; i++) {
-            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-                // 跳过不替换的字符
-                continue;
-            }
-
-            if (c[i] == '\u3000') {
-                c[i] = ' ';
-            } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
-                c[i] = (char) (c[i] - 65248);
-            }
-        }
-        String returnString = new String(c);
-
-        return returnString;
-    }
-
-    /**
-     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
-     *
-     * @param n 数字
-     * @return 中文大写数字
-     */
-    public static String digitUppercase(double n) {
-        String[] fraction = {"角", "分"};
-        String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
-        String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
-
-        String head = n < 0 ? "负" : "";
-        n = Math.abs(n);
-
-        String s = "";
-        for (int i = 0; i < fraction.length; i++) {
-            s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
-        }
-        if (s.length() < 1) {
-            s = "整";
-        }
-        int integerPart = (int) Math.floor(n);
-
-        for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
-            String p = "";
-            for (int j = 0; j < unit[1].length && n > 0; j++) {
-                p = digit[integerPart % 10] + unit[1][j] + p;
-                integerPart = integerPart / 10;
-            }
-            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
-        }
-        return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
-    }
-
-    /**
-     * unicode编码转换中文
-     *
-     * @param object: 需要转码的字符串
-     * @return : 转码之后的结果
-     */
-    public static String unicodeToString(Object object) {
-        String str = JsonUtil.toString(object);
-        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
-        Matcher matcher = pattern.matcher(str);
-        char ch;
-        while (matcher.find()) {
-            ch = (char) Integer.parseInt(matcher.group(2), 16);
-            str = str.replace(matcher.group(1), ch + "");
-        }
-        return str;
-    }
-}

+ 0 - 77
game-module/game-common/src/main/java/com/zanxiang/game/common/text/StrFormatter.java

@@ -1,77 +0,0 @@
-package com.zanxiang.game.common.text;
-
-
-import com.zanxiang.game.common.utils.StringUtils;
-
-/**
- * 字符串格式化
- *
- * @author ruoyi
- */
-public class StrFormatter {
-    public static final String EMPTY_JSON = "{}";
-    public static final char C_BACKSLASH = '\\';
-    public static final char C_DELIM_START = '{';
-    public static final char C_DELIM_END = '}';
-
-    /**
-     * 格式化字符串<br>
-     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
-     * 如果想输出 {} 使用 \\转义 { 即可,如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
-     * 例:<br>
-     * 通常使用:format("this is {} for {}", "a", "b") -> this is a for b<br>
-     * 转义{}: format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
-     * 转义\: format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     *
-     * @param strPattern 字符串模板
-     * @param argArray   参数列表
-     * @return 结果
-     */
-    public static String format(final String strPattern, final Object... argArray) {
-        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) {
-            return strPattern;
-        }
-        final int strPatternLength = strPattern.length();
-
-        // 初始化定义好的长度以获得更好的性能
-        StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
-
-        int handledPosition = 0;
-        int delimIndex;// 占位符所在位置
-        for (int argIndex = 0; argIndex < argArray.length; argIndex++) {
-            delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
-            if (delimIndex == -1) {
-                if (handledPosition == 0) {
-                    return strPattern;
-                } else { // 字符串模板剩余部分不再包含占位符,加入剩余部分后返回结果
-                    sbuf.append(strPattern, handledPosition, strPatternLength);
-                    return sbuf.toString();
-                }
-            } else {
-                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {
-                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {
-                        // 转义符之前还有一个转义符,占位符依旧有效
-                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
-                        sbuf.append(Convert.utf8Str(argArray[argIndex]));
-                        handledPosition = delimIndex + 2;
-                    } else {
-                        // 占位符被转义
-                        argIndex--;
-                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
-                        sbuf.append(C_DELIM_START);
-                        handledPosition = delimIndex + 1;
-                    }
-                } else {
-                    // 正常占位符
-                    sbuf.append(strPattern, handledPosition, delimIndex);
-                    sbuf.append(Convert.utf8Str(argArray[argIndex]));
-                    handledPosition = delimIndex + 2;
-                }
-            }
-        }
-        // 加入最后一个占位符后所有的字符
-        sbuf.append(strPattern, handledPosition, strPattern.length());
-
-        return sbuf.toString();
-    }
-}

+ 0 - 441
game-module/game-common/src/main/java/com/zanxiang/game/common/text/UUID.java

@@ -1,441 +0,0 @@
-package com.zanxiang.game.common.text;
-
-
-import com.zanxiang.game.common.exception.UtilException;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-
-/**
- * 提供通用唯一识别码(universally unique identifier)(UUID)实现
- *
- * @author ruoyi
- */
-public final class UUID implements java.io.Serializable, Comparable<UUID> {
-    private static final long serialVersionUID = -1185015143654744140L;
-
-    /**
-     * SecureRandom 的单例
-     */
-    private static class Holder {
-        static final SecureRandom numberGenerator = getSecureRandom();
-    }
-
-    /**
-     * 此UUID的最高64有效位
-     */
-    private final long mostSigBits;
-
-    /**
-     * 此UUID的最低64有效位
-     */
-    private final long leastSigBits;
-
-    /**
-     * 私有构造
-     *
-     * @param data 数据
-     */
-    private UUID(byte[] data) {
-        long msb = 0;
-        long lsb = 0;
-        assert data.length == 16 : "data must be 16 bytes in length";
-        for (int i = 0; i < 8; i++) {
-            msb = (msb << 8) | (data[i] & 0xff);
-        }
-        for (int i = 8; i < 16; i++) {
-            lsb = (lsb << 8) | (data[i] & 0xff);
-        }
-        this.mostSigBits = msb;
-        this.leastSigBits = lsb;
-    }
-
-    /**
-     * 使用指定的数据构造新的 UUID。
-     *
-     * @param mostSigBits  用于 {@code UUID} 的最高有效 64
-     * @param leastSigBits 用于 {@code UUID} 的最低有效 64
-     */
-    public UUID(long mostSigBits, long leastSigBits) {
-        this.mostSigBits = mostSigBits;
-        this.leastSigBits = leastSigBits;
-    }
-
-    /**
-     * 获取类型 4(伪随机生成的)UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。
-     *
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID fastUUID() {
-        return randomUUID(false);
-    }
-
-    /**
-     * 获取类型 4(伪随机生成的)UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
-     *
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID randomUUID() {
-        return randomUUID(true);
-    }
-
-    /**
-     * 获取类型 4(伪随机生成的)UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
-     *
-     * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码,否则可以得到更好的性能
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID randomUUID(boolean isSecure) {
-        final Random ng = isSecure ? Holder.numberGenerator : getRandom();
-
-        byte[] randomBytes = new byte[16];
-        ng.nextBytes(randomBytes);
-        randomBytes[6] &= 0x0f; /* clear version */
-        randomBytes[6] |= 0x40; /* set to version 4 */
-        randomBytes[8] &= 0x3f; /* clear variant */
-        randomBytes[8] |= 0x80; /* set to IETF variant */
-        return new UUID(randomBytes);
-    }
-
-    /**
-     * 根据指定的字节数组获取类型 3(基于名称的)UUID 的静态工厂。
-     *
-     * @param name 用于构造 UUID 的字节数组。
-     * @return 根据指定数组生成的 {@code UUID}
-     */
-    public static UUID nameUUIDFromBytes(byte[] name) {
-        MessageDigest md;
-        try {
-            md = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException nsae) {
-            throw new InternalError("MD5 not supported");
-        }
-        byte[] md5Bytes = md.digest(name);
-        md5Bytes[6] &= 0x0f; /* clear version */
-        md5Bytes[6] |= 0x30; /* set to version 3 */
-        md5Bytes[8] &= 0x3f; /* clear variant */
-        md5Bytes[8] |= 0x80; /* set to IETF variant */
-        return new UUID(md5Bytes);
-    }
-
-    /**
-     * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
-     *
-     * @param name 指定 {@code UUID} 字符串
-     * @return 具有指定值的 {@code UUID}
-     * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
-     */
-    public static UUID fromString(String name) {
-        String[] components = name.split("-");
-        if (components.length != 5) {
-            throw new IllegalArgumentException("Invalid UUID string: " + name);
-        }
-        for (int i = 0; i < 5; i++) {
-            components[i] = "0x" + components[i];
-        }
-
-        long mostSigBits = Long.decode(components[0]).longValue();
-        mostSigBits <<= 16;
-        mostSigBits |= Long.decode(components[1]).longValue();
-        mostSigBits <<= 16;
-        mostSigBits |= Long.decode(components[2]).longValue();
-
-        long leastSigBits = Long.decode(components[3]).longValue();
-        leastSigBits <<= 48;
-        leastSigBits |= Long.decode(components[4]).longValue();
-
-        return new UUID(mostSigBits, leastSigBits);
-    }
-
-    /**
-     * 返回此 UUID 的 128 位值中的最低有效 64 位。
-     *
-     * @return 此 UUID 的 128 位值中的最低有效 64 位。
-     */
-    public long getLeastSignificantBits() {
-        return leastSigBits;
-    }
-
-    /**
-     * 返回此 UUID 的 128 位值中的最高有效 64 位。
-     *
-     * @return 此 UUID 的 128 位值中最高有效 64 位。
-     */
-    public long getMostSignificantBits() {
-        return mostSigBits;
-    }
-
-    /**
-     * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
-     * <p>
-     * 版本号具有以下含意:
-     * <ul>
-     * <li>1 基于时间的 UUID
-     * <li>2 DCE 安全 UUID
-     * <li>3 基于名称的 UUID
-     * <li>4 随机生成的 UUID
-     * </ul>
-     *
-     * @return 此 {@code UUID} 的版本号
-     */
-    public int version() {
-        // Version is bits masked by 0x000000000000F000 in MS long
-        return (int) ((mostSigBits >> 12) & 0x0f);
-    }
-
-    /**
-     * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
-     * <p>
-     * 变体号具有以下含意:
-     * <ul>
-     * <li>0 为 NCS 向后兼容保留
-     * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>(Leach-Salz), 用于此类
-     * <li>6 保留,微软向后兼容
-     * <li>7 保留供以后定义使用
-     * </ul>
-     *
-     * @return 此 {@code UUID} 相关联的变体号
-     */
-    public int variant() {
-        // This field is composed of a varying number of bits.
-        // 0 - - Reserved for NCS backward compatibility
-        // 1 0 - The IETF aka Leach-Salz variant (used by this class)
-        // 1 1 0 Reserved, Microsoft backward compatibility
-        // 1 1 1 Reserved for future definition.
-        return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
-    }
-
-    /**
-     * 与此 UUID 相关联的时间戳值。
-     *
-     * <p>
-     * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。<br>
-     * 所得到的时间戳以 100 毫微秒为单位,从 UTC(通用协调时间) 15821015 日零时开始。
-     *
-     * <p>
-     * 时间戳值仅在在基于时间的 UUID(其 version 类型为 1)中才有意义。<br>
-     * 如果此 {@code UUID} 不是基于时间的 UUID,则此方法抛出 UnsupportedOperationException。
-     *
-     * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
-     */
-    public long timestamp() throws UnsupportedOperationException {
-        checkTimeBase();
-        return (mostSigBits & 0x0FFFL) << 48//
-                | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
-                | mostSigBits >>> 32;
-    }
-
-    /**
-     * 与此 UUID 相关联的时钟序列值。
-     *
-     * <p>
-     * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
-     * <p>
-     * {@code clockSequence} 值仅在基于时间的 UUID(其 version 类型为 1)中才有意义。 如果此 UUID 不是基于时间的 UUID,则此方法抛出
-     * UnsupportedOperationException。
-     *
-     * @return 此 {@code UUID} 的时钟序列
-     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
-     */
-    public int clockSequence() throws UnsupportedOperationException {
-        checkTimeBase();
-        return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
-    }
-
-    /**
-     * 与此 UUID 相关的节点值。
-     *
-     * <p>
-     * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址,该地址用于生成此 UUID 以保证空间唯一性。
-     * <p>
-     * 节点值仅在基于时间的 UUID(其 version 类型为 1)中才有意义。<br>
-     * 如果此 UUID 不是基于时间的 UUID,则此方法抛出 UnsupportedOperationException。
-     *
-     * @return 此 {@code UUID} 的节点值
-     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
-     */
-    public long node() throws UnsupportedOperationException {
-        checkTimeBase();
-        return leastSigBits & 0x0000FFFFFFFFFFFFL;
-    }
-
-    /**
-     * 返回此{@code UUID} 的字符串表现形式。
-     *
-     * <p>
-     * UUID 的字符串表示形式由此 BNF 描述:
-     *
-     * <pre>
-     * {@code
-     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
-     * time_low               = 4*<hexOctet>
-     * time_mid               = 2*<hexOctet>
-     * time_high_and_version  = 2*<hexOctet>
-     * variant_and_sequence   = 2*<hexOctet>
-     * node                   = 6*<hexOctet>
-     * hexOctet               = <hexDigit><hexDigit>
-     * hexDigit               = [0-9a-fA-F]
-     * }
-     * </pre>
-     *
-     * </blockquote>
-     *
-     * @return 此{@code UUID} 的字符串表现形式
-     * @see #toString(boolean)
-     */
-    @Override
-    public String toString() {
-        return toString(false);
-    }
-
-    /**
-     * 返回此{@code UUID} 的字符串表现形式。
-     *
-     * <p>
-     * UUID 的字符串表示形式由此 BNF 描述:
-     *
-     * <pre>
-     * {@code
-     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
-     * time_low               = 4*<hexOctet>
-     * time_mid               = 2*<hexOctet>
-     * time_high_and_version  = 2*<hexOctet>
-     * variant_and_sequence   = 2*<hexOctet>
-     * node                   = 6*<hexOctet>
-     * hexOctet               = <hexDigit><hexDigit>
-     * hexDigit               = [0-9a-fA-F]
-     * }
-     * </pre>
-     *
-     * </blockquote>
-     *
-     * @param isSimple 是否简单模式,简单模式为不带'-'的UUID字符串
-     * @return 此{@code UUID} 的字符串表现形式
-     */
-    public String toString(boolean isSimple) {
-        final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
-        // time_low
-        builder.append(digits(mostSigBits >> 32, 8));
-        if (false == isSimple) {
-            builder.append('-');
-        }
-        // time_mid
-        builder.append(digits(mostSigBits >> 16, 4));
-        if (false == isSimple) {
-            builder.append('-');
-        }
-        // time_high_and_version
-        builder.append(digits(mostSigBits, 4));
-        if (false == isSimple) {
-            builder.append('-');
-        }
-        // variant_and_sequence
-        builder.append(digits(leastSigBits >> 48, 4));
-        if (false == isSimple) {
-            builder.append('-');
-        }
-        // node
-        builder.append(digits(leastSigBits, 12));
-
-        return builder.toString();
-    }
-
-    /**
-     * 返回此 UUID 的哈希码。
-     *
-     * @return UUID 的哈希码值。
-     */
-    @Override
-    public int hashCode() {
-        long hilo = mostSigBits ^ leastSigBits;
-        return ((int) (hilo >> 32)) ^ (int) hilo;
-    }
-
-    /**
-     * 将此对象与指定对象比较。
-     * <p>
-     * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值(每一位均相同)时,结果才为 {@code true}。
-     *
-     * @param obj 要与之比较的对象
-     * @return 如果对象相同,则返回 {@code true};否则返回 {@code false}
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if ((null == obj) || (obj.getClass() != UUID.class)) {
-            return false;
-        }
-        UUID id = (UUID) obj;
-        return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
-    }
-
-    // Comparison Operations
-
-    /**
-     * 将此 UUID 与指定的 UUID 比较。
-     *
-     * <p>
-     * 如果两个 UUID 不同,且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段,则第一个 UUID 大于第二个 UUID。
-     *
-     * @param val 与此 UUID 比较的 UUID
-     * @return 在此 UUID 小于、等于或大于 val 时,分别返回 -101
-     */
-    @Override
-    public int compareTo(UUID val) {
-        // The ordering is intentionally set up so that the UUIDs
-        // can simply be numerically compared as two numbers
-        return (this.mostSigBits < val.mostSigBits ? -1 : //
-                (this.mostSigBits > val.mostSigBits ? 1 : //
-                        (this.leastSigBits < val.leastSigBits ? -1 : //
-                                (this.leastSigBits > val.leastSigBits ? 1 : //
-                                        0))));
-    }
-
-    // Private method start
-
-    /**
-     * 返回指定数字对应的hex值
-     *
-     * @param val    值
-     * @param digits 位
-     * @return
-     */
-    private static String digits(long val, int digits) {
-        long hi = 1L << (digits * 4);
-        return Long.toHexString(hi | (val & (hi - 1))).substring(1);
-    }
-
-    /**
-     * 检查是否为time-based版本UUID
-     */
-    private void checkTimeBase() {
-        if (version() != 1) {
-            throw new UnsupportedOperationException("Not a time-based UUID");
-        }
-    }
-
-    /**
-     * 获取{@link SecureRandom},类提供加密的强随机数生成器 (RNG)
-     *
-     * @return {@link SecureRandom}
-     */
-    public static SecureRandom getSecureRandom() {
-        try {
-            return SecureRandom.getInstance("SHA1PRNG");
-        } catch (NoSuchAlgorithmException e) {
-            throw new UtilException(e);
-        }
-    }
-
-    /**
-     * 获取随机数生成器对象<br>
-     * ThreadLocalRandom是JDK 7之后提供并发产生随机数,能够解决多个线程发生的竞争争夺。
-     *
-     * @return {@link ThreadLocalRandom}
-     */
-    public static ThreadLocalRandom getRandom() {
-        return ThreadLocalRandom.current();
-    }
-}

+ 0 - 115
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/BaseHttpSSLSocketFactory.java

@@ -1,115 +0,0 @@
-/**
- * Licensed Property to China UnionPay Co., Ltd.
- * <p>
- * (C) Copyright of China UnionPay Co., Ltd. 2010
- * All Rights Reserved.
- * <p>
- * <p>
- * Modification History:
- * =============================================================================
- * Author         Date          Description
- * ------------ ---------- ---------------------------------------------------
- * xshu       2014-05-28     SSLSocket 链接工具类(用于https)
- * =============================================================================
- */
-package com.zanxiang.game.common.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.net.ssl.*;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.cert.X509Certificate;
-
-public class BaseHttpSSLSocketFactory extends SSLSocketFactory {
-    private static final Logger logger = LoggerFactory.getLogger(BaseHttpSSLSocketFactory.class);
-
-    private SSLContext getSSLContext() {
-        return createEasySSLContext();
-    }
-
-    @Override
-    public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2,
-                               int arg3) throws IOException {
-        return getSSLContext().getSocketFactory().createSocket(arg0, arg1,
-                arg2, arg3);
-    }
-
-    @Override
-    public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3)
-            throws IOException, UnknownHostException {
-        return getSSLContext().getSocketFactory().createSocket(arg0, arg1,
-                arg2, arg3);
-    }
-
-    @Override
-    public Socket createSocket(InetAddress arg0, int arg1) throws IOException {
-        return getSSLContext().getSocketFactory().createSocket(arg0, arg1);
-    }
-
-    @Override
-    public Socket createSocket(String arg0, int arg1) throws IOException,
-            UnknownHostException {
-        return getSSLContext().getSocketFactory().createSocket(arg0, arg1);
-    }
-
-    @Override
-    public String[] getSupportedCipherSuites() {
-        return null;
-    }
-
-    @Override
-    public String[] getDefaultCipherSuites() {
-        return null;
-    }
-
-    @Override
-    public Socket createSocket(Socket arg0, String arg1, int arg2, boolean arg3)
-            throws IOException {
-        return getSSLContext().getSocketFactory().createSocket(arg0, arg1,
-                arg2, arg3);
-    }
-
-    private SSLContext createEasySSLContext() {
-        try {
-            SSLContext context = SSLContext.getInstance("SSL");
-            context.init(null,
-                    new TrustManager[]{MyX509TrustManager.manger}, null);
-            return context;
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            return null;
-        }
-    }
-
-    public static class MyX509TrustManager implements X509TrustManager {
-
-        static MyX509TrustManager manger = new MyX509TrustManager();
-
-        public MyX509TrustManager() {
-        }
-
-        public X509Certificate[] getAcceptedIssuers() {
-            return null;
-        }
-
-        public void checkClientTrusted(X509Certificate[] chain, String authType) {
-        }
-
-        public void checkServerTrusted(X509Certificate[] chain, String authType) {
-        }
-    }
-
-    /**
-     * 解决由于服务器证书问题导致HTTPS无法访问的情况 PS:HTTPS hostname wrong: should be <localhost>
-     */
-    public static class TrustAnyHostnameVerifier implements HostnameVerifier {
-        public boolean verify(String hostname, SSLSession session) {
-            // 直接返回true
-            return true;
-        }
-    }
-}

+ 0 - 56
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/DateUtils.java

@@ -1,56 +0,0 @@
-package com.zanxiang.game.common.utils;
-
-import com.zanxiang.module.util.DateUtil;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.TemporalAdjusters;
-
-/**
- * 时间工具类
- *
- * @author ruoyi
- */
-public class DateUtils extends DateUtil {
-
-    /**
-     * 验证当前时间是否为当天
-     *
-     * @param time
-     * @return
-     */
-    public static boolean isToday(LocalDateTime time) {
-        LocalDateTime startTime = LocalDateTime.now().with(LocalTime.MIN);
-        LocalDateTime endTime = LocalDateTime.now().with(LocalTime.MAX);
-        //如果大于今天的开始日期,小于今天的结束日期
-        return time.isAfter(startTime) && time.isBefore(endTime);
-    }
-
-    /**
-     * 验证当前时间是否为当月
-     *
-     * @param time
-     * @return
-     */
-    public static boolean isThisMonth(LocalDateTime time) {
-        LocalDate localDate = time.toLocalDate();
-        LocalDate now = LocalDate.now();
-        return localDate.isAfter(now.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth())) &&
-                localDate.isBefore(now.plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()));
-    }
-
-    /**
-     * 验证当前时间是否为本周
-     *
-     * @param time
-     * @return
-     */
-    public static boolean isThisWeek(LocalDateTime time) {
-        LocalDateTime now = LocalDateTime.now();
-        int dayOfWeek = now.getDayOfWeek().getValue();
-        LocalDateTime weekStart = now.minusDays(dayOfWeek - 1).with(LocalTime.MIN);
-        LocalDateTime weekEnd = now.plusDays(7 - dayOfWeek).with(LocalTime.MAX);
-        return time.isAfter(weekStart) && time.isBefore(weekEnd);
-    }
-}

+ 0 - 44
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/MD5Util.java

@@ -1,44 +0,0 @@
-package com.zanxiang.game.common.utils;
-
-import java.security.MessageDigest;
-
-/**
- * MD5加密
- */
-public class MD5Util {
-
-    private static String byteArrayToHexString(byte[] b) {
-        StringBuffer resultSb = new StringBuffer();
-        for (int i = 0; i < b.length; i++) {
-            resultSb.append(byteToHexString(b[i]));
-        }
-        return resultSb.toString();
-    }
-
-    private static String byteToHexString(byte b) {
-        int n = b;
-        if (n < 0) {
-            n += 256;
-        }
-        int d1 = n / 16;
-        int d2 = n % 16;
-        return hexDigits[d1] + hexDigits[d2];
-    }
-
-    public static String MD5Encode(String origin, String charsetName) {
-        String resultString = null;
-        try {
-            resultString = origin;
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            if (StringUtils.isBlank(charsetName)) {
-                resultString = byteArrayToHexString(md.digest(resultString.getBytes()));
-            } else {
-                resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetName)));
-            }
-        } catch (Exception exception) {
-        }
-        return resultString;
-    }
-
-    private static final String[] hexDigits = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};
-}

+ 0 - 102
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/SpringUtils.java

@@ -1,102 +0,0 @@
-package com.zanxiang.game.common.utils;
-
-import org.springframework.aop.framework.AopContext;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * spring工具类 方便在非spring管理环境中获取bean
- *
- * @author ruoyi
- */
-@Component
-public final class SpringUtils implements BeanFactoryPostProcessor {
-    /**
-     * Spring应用上下文环境
-     */
-    private static ConfigurableListableBeanFactory beanFactory;
-
-    @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-        SpringUtils.beanFactory = beanFactory;
-    }
-
-    /**
-     * 获取对象
-     *
-     * @param name
-     * @return Object 一个以所给名字注册的bean的实例
-     * @throws BeansException
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T getBean(String name) throws BeansException {
-        return (T) beanFactory.getBean(name);
-    }
-
-    /**
-     * 获取类型为requiredType的对象
-     *
-     * @param clz
-     * @return
-     * @throws BeansException
-     */
-    public static <T> T getBean(Class<T> clz) throws BeansException {
-        T result = (T) beanFactory.getBean(clz);
-        return result;
-    }
-
-    /**
-     * 如果BeanFactory包含一个与所给名称匹配的bean定义,则返回true
-     *
-     * @param name
-     * @return boolean
-     */
-    public static boolean containsBean(String name) {
-        return beanFactory.containsBean(name);
-    }
-
-    /**
-     * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到,将会抛出一个异常(NoSuchBeanDefinitionException)
-     *
-     * @param name
-     * @return boolean
-     * @throws NoSuchBeanDefinitionException
-     */
-    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
-        return beanFactory.isSingleton(name);
-    }
-
-    /**
-     * @param name
-     * @return Class 注册对象的类型
-     * @throws NoSuchBeanDefinitionException
-     */
-    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
-        return beanFactory.getType(name);
-    }
-
-    /**
-     * 如果给定的bean名字在bean定义中有别名,则返回这些别名
-     *
-     * @param name
-     * @return
-     * @throws NoSuchBeanDefinitionException
-     */
-    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
-        return beanFactory.getAliases(name);
-    }
-
-    /**
-     * 获取aop代理对象
-     *
-     * @param invoker
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T getAopProxy(T invoker) {
-        return (T) AopContext.currentProxy();
-    }
-}

+ 0 - 366
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/StringUtils.java

@@ -1,366 +0,0 @@
-package com.zanxiang.game.common.utils;
-
-import com.zanxiang.game.common.text.StrFormatter;
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * 字符串工具类
- *
- * @author ruoyi
- */
-public class StringUtils extends org.apache.commons.lang3.StringUtils {
-
-    /**
-     * 空字符串
-     */
-    private static final String NULLSTR = "";
-
-    /**
-     * 下划线
-     */
-    private static final char SEPARATOR = '_';
-
-    /**
-     * 获取参数不为空值
-     *
-     * @param value defaultValue 要判断的value
-     * @return value 返回值
-     */
-    public static <T> T nvl(T value, T defaultValue) {
-        return value != null ? value : defaultValue;
-    }
-
-    /**
-     * * 判断一个Collection是否为空, 包含List,Set,Queue
-     *
-     * @param coll 要判断的Collection
-     * @return true:为空 false:非空
-     */
-    public static boolean isEmpty(Collection<?> coll) {
-        return isNull(coll) || coll.isEmpty();
-    }
-
-    /**
-     * * 判断一个Collection是否非空,包含List,Set,Queue
-     *
-     * @param coll 要判断的Collection
-     * @return true:非空 false:空
-     */
-    public static boolean isNotEmpty(Collection<?> coll) {
-        return !isEmpty(coll);
-    }
-
-    /**
-     * * 判断一个对象数组是否为空
-     *
-     * @param objects 要判断的对象数组
-     *                * @return true:为空 false:非空
-     */
-    public static boolean isEmpty(Object[] objects) {
-        return isNull(objects) || (objects.length == 0);
-    }
-
-    /**
-     * * 判断一个对象数组是否非空
-     *
-     * @param objects 要判断的对象数组
-     * @return true:非空 false:空
-     */
-    public static boolean isNotEmpty(Object[] objects) {
-        return !isEmpty(objects);
-    }
-
-    /**
-     * * 判断一个Map是否为空
-     *
-     * @param map 要判断的Map
-     * @return true:为空 false:非空
-     */
-    public static boolean isEmpty(Map<?, ?> map) {
-        return isNull(map) || map.isEmpty();
-    }
-
-    /**
-     * * 判断一个Map是否为空
-     *
-     * @param map 要判断的Map
-     * @return true:非空 false:空
-     */
-    public static boolean isNotEmpty(Map<?, ?> map) {
-        return !isEmpty(map);
-    }
-
-    /**
-     * * 判断一个字符串是否为空串
-     *
-     * @param str String
-     * @return true:为空 false:非空
-     */
-    public static boolean isEmpty(String str) {
-        return isNull(str) || NULLSTR.equals(str.trim());
-    }
-
-    /**
-     * * 判断一个字符串是否为非空串
-     *
-     * @param str String
-     * @return true:非空串 false:空串
-     */
-    public static boolean isNotEmpty(String str) {
-        return !isEmpty(str);
-    }
-
-    /**
-     * * 判断一个对象是否为空
-     *
-     * @param object Object
-     * @return true:为空 false:非空
-     */
-    public static boolean isNull(Object object) {
-        return object == null;
-    }
-
-    /**
-     * * 判断一个对象是否非空
-     *
-     * @param object Object
-     * @return true:非空 false:空
-     */
-    public static boolean isNotNull(Object object) {
-        return !isNull(object);
-    }
-
-    /**
-     * * 判断一个对象是否是数组类型(Java基本型别的数组)
-     *
-     * @param object 对象
-     * @return true:是数组 false:不是数组
-     */
-    public static boolean isArray(Object object) {
-        return isNotNull(object) && object.getClass().isArray();
-    }
-
-    /**
-     * 去空格
-     */
-    public static String trim(String str) {
-        return (str == null ? "" : str.trim());
-    }
-
-    /**
-     * 截取字符串
-     *
-     * @param str   字符串
-     * @param start 开始
-     * @return 结果
-     */
-    public static String substring(final String str, int start) {
-        if (str == null) {
-            return NULLSTR;
-        }
-
-        if (start < 0) {
-            start = str.length() + start;
-        }
-
-        if (start < 0) {
-            start = 0;
-        }
-        if (start > str.length()) {
-            return NULLSTR;
-        }
-
-        return str.substring(start);
-    }
-
-    /**
-     * 截取字符串
-     *
-     * @param str   字符串
-     * @param start 开始
-     * @param end   结束
-     * @return 结果
-     */
-    public static String substring(final String str, int start, int end) {
-        if (str == null) {
-            return NULLSTR;
-        }
-
-        if (end < 0) {
-            end = str.length() + end;
-        }
-        if (start < 0) {
-            start = str.length() + start;
-        }
-
-        if (end > str.length()) {
-            end = str.length();
-        }
-
-        if (start > end) {
-            return NULLSTR;
-        }
-
-        if (start < 0) {
-            start = 0;
-        }
-        if (end < 0) {
-            end = 0;
-        }
-
-        return str.substring(start, end);
-    }
-
-    /**
-     * 格式化文本, {} 表示占位符<br>
-     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
-     * 如果想输出 {} 使用 \\转义 { 即可,如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
-     * 例:<br>
-     * 通常使用:format("this is {} for {}", "a", "b") -> this is a for b<br>
-     * 转义{}: format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
-     * 转义\: format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     *
-     * @param template 文本模板,被替换的部分用 {} 表示
-     * @param params   参数值
-     * @return 格式化后的文本
-     */
-    public static String format(String template, Object... params) {
-        if (isEmpty(params) || isEmpty(template)) {
-            return template;
-        }
-        return StrFormatter.format(template, params);
-    }
-
-    /**
-     * 下划线转驼峰命名
-     */
-    public static String toUnderScoreCase(String str) {
-        if (str == null) {
-            return null;
-        }
-        StringBuilder sb = new StringBuilder();
-        // 前置字符是否大写
-        boolean preCharIsUpperCase = true;
-        // 当前字符是否大写
-        boolean curreCharIsUpperCase = true;
-        // 下一字符是否大写
-        boolean nexteCharIsUpperCase = true;
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if (i > 0) {
-                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
-            } else {
-                preCharIsUpperCase = false;
-            }
-
-            curreCharIsUpperCase = Character.isUpperCase(c);
-
-            if (i < (str.length() - 1)) {
-                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
-            }
-
-            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
-                sb.append(SEPARATOR);
-            } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) {
-                sb.append(SEPARATOR);
-            }
-            sb.append(Character.toLowerCase(c));
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * 是否包含字符串
-     *
-     * @param str  验证字符串
-     * @param strs 字符串组
-     * @return 包含返回true
-     */
-    public static boolean inStringIgnoreCase(String str, String... strs) {
-        if (str != null && strs != null) {
-            for (String s : strs) {
-                if (str.equalsIgnoreCase(trim(s))) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空,则返回空字符串。 例如:HELLO_WORLD->HelloWorld
-     *
-     * @param name 转换前的下划线大写方式命名的字符串
-     * @return 转换后的驼峰式命名的字符串
-     */
-    public static String convertToCamelCase(String name) {
-        StringBuilder result = new StringBuilder();
-        // 快速检查
-        if (name == null || name.isEmpty()) {
-            // 没必要转换
-            return "";
-        } else if (!name.contains("_")) {
-            // 不含下划线,仅将首字母大写
-            return name.substring(0, 1).toUpperCase() + name.substring(1);
-        }
-        // 用下划线将原始字符串分割
-        String[] camels = name.split("_");
-        for (String camel : camels) {
-            // 跳过原始字符串中开头、结尾的下换线或双重下划线
-            if (camel.isEmpty()) {
-                continue;
-            }
-            // 首字母大写
-            result.append(camel.substring(0, 1).toUpperCase());
-            result.append(camel.substring(1).toLowerCase());
-        }
-        return result.toString();
-    }
-
-    /**
-     * 驼峰式命名法 例如:user_name->userName
-     */
-    public static String toCamelCase(String s) {
-        if (s == null) {
-            return null;
-        }
-        s = s.toLowerCase();
-        StringBuilder sb = new StringBuilder(s.length());
-        boolean upperCase = false;
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-
-            if (c == SEPARATOR) {
-                upperCase = true;
-            } else if (upperCase) {
-                sb.append(Character.toUpperCase(c));
-                upperCase = false;
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * 判断数组里的字符串是否存在空值
-     *
-     * @param css : 需要判断的参数
-     * @return : 返回判断结果
-     */
-    public static boolean isAnyEmpty(final String... css) {
-        if (ArrayUtils.isEmpty(css)) {
-            return false;
-        }
-        for (final String cs : css) {
-            if (isEmpty(cs)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}

+ 0 - 149
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/URIUtil.java

@@ -1,149 +0,0 @@
-package com.zanxiang.game.common.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.Assert;
-
-import java.io.UnsupportedEncodingException;
-import java.net.InetSocketAddress;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.Map;
-
-/**
- * @Author wcc
- * @Date 2020/12/28 11:36
- * @Version 1.0
- * @Description
- */
-@Slf4j
-public class URIUtil {
-
-    /**
-     * 填充 url的请求参数,如果 params的值为空,不会写在 url上
-     *
-     * @param url
-     * @param params
-     * @return
-     */
-    public static String fillUrlParams(String url, Map<String, String> params, boolean ignoreBlank) {
-        if (params == null || params.isEmpty()) {
-            return url;
-        }
-        boolean first = !url.contains("?");
-        StringBuilder urlBuilder = new StringBuilder(url);
-        for (Map.Entry<String, String> param : params.entrySet()) {
-            if (ignoreBlank && StringUtils.isBlank(param.getValue())) {
-                continue;
-            }
-            if (first) {
-                urlBuilder.append("?");
-                first = false;
-            } else {
-                urlBuilder.append("&");
-            }
-            urlBuilder.append(param.getKey()).append("=").append(StringUtils.isBlank(param.getValue()) ? "" : param.getValue());
-        }
-        url = urlBuilder.toString();
-        return url;
-    }
-
-    /**
-     * 对应 js中的 encodeURIComponent
-     *
-     * @param uri
-     * @return
-     */
-    public static String encodeURIComponent(String uri) {
-        return encodeURIComponent(uri, "UTF-8");
-    }
-
-    /**
-     * 对应 js中的 encodeURIComponent
-     *
-     * @param uri
-     * @return
-     */
-    public static String encodeURIComponent(String uri, String enc) {
-        try {
-            return URLEncoder.encode(uri, enc)
-                    .replaceAll("\\+", "%20")
-                    .replaceAll("\\!", "%21")
-                    .replaceAll("\\'", "%27")
-                    .replaceAll("\\(", "%28")
-                    .replaceAll("\\)", "%29")
-                    .replaceAll("\\~", "%7E");
-        } catch (UnsupportedEncodingException e) {
-            log.error(e.getMessage(), e);
-            return null;
-        }
-    }
-
-    /**
-     * 对应 js的 decodeURIComponent
-     *
-     * @param uri
-     * @return
-     */
-    public static String decodeURIComponent(String uri) {
-        return decodeURIComponent(uri, "UTF-8");
-    }
-
-    /**
-     * 对应 js的 decodeURIComponent
-     *
-     * @param uri
-     * @return
-     */
-    public static String decodeURIComponent(String uri, String enc) {
-        try {
-            return URLDecoder.decode(uri.replaceAll("%20", "+")
-                    .replaceAll("%21", "!")
-                    .replaceAll("%27", "'")
-                    .replaceAll("%28", "(")
-                    .replaceAll("%29", ")")
-                    .replaceAll("%7E", "~"), enc);
-        } catch (UnsupportedEncodingException e) {
-            log.error(e.getMessage(), e);
-            return null;
-        }
-    }
-
-    public static InetSocketAddress parseURI(String uri, int defaultPort) {
-        Assert.notNull(uri, "uri must not be null");
-        String host;
-        String portString = null;
-
-        int colonPos = uri.indexOf(':');
-        if (colonPos >= 0 && uri.indexOf(':', colonPos + 1) == -1) {
-            // Exactly 1 colon. Split into host:port.
-            host = uri.substring(0, colonPos);
-            portString = uri.substring(colonPos + 1);
-        } else {
-            // 0 or 2+ colons. Bare hostname or IPv6 literal.
-            host = uri;
-        }
-
-        int port = defaultPort;
-        if (StringUtils.isNotBlank(portString)) {
-            // Try to parse the whole port string as a number.
-            Assert.isTrue(!portString.startsWith("+"), String.format("Cannot parse port number: %s", uri));
-            try {
-                port = Integer.parseInt(portString);
-            } catch (NumberFormatException e) {
-                throw new IllegalArgumentException(String.format("Cannot parse port number: %s", uri));
-            }
-
-            Assert.isTrue(isValidPort(port), String.format("Port number out of range: %s", uri));
-        }
-
-        return InetSocketAddress.createUnresolved(host, port);
-    }
-
-    /**
-     * @param port the port number
-     * @return {@literal true} for valid port numbers.
-     */
-    private static boolean isValidPort(int port) {
-        return port >= 0 && port <= 65535;
-    }
-}

+ 0 - 144
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/bean/BeanUtils.java

@@ -1,144 +0,0 @@
-package com.zanxiang.game.common.utils.bean;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Bean 工具类
- *
- * @author ruoyi
- */
-public class BeanUtils extends org.springframework.beans.BeanUtils {
-    /**
-     * Bean方法名中属性名开始的下标
-     */
-    private static final int BEAN_METHOD_PROP_INDEX = 3;
-
-    /**
-     * 匹配getter方法的正则表达式
-     */
-    private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
-
-    /**
-     * 匹配setter方法的正则表达式
-     */
-    private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
-
-    /**
-     * 对象浅拷贝
-     *
-     * @param source
-     * @param target
-     * @param <T>
-     * @return
-     */
-    public static <T> T copy(Object source, Class<T> target) {
-        if (source == null) {
-            return null;
-        }
-        T obj = instantiateClass(target);
-        copyProperties(source, obj);
-        return obj;
-    }
-
-    /**
-     * 对象浅拷贝
-     *
-     * @param sourceList
-     * @param target
-     * @param <T>
-     * @return
-     */
-    public static <T> List<T> copyList(Collection sourceList, Class<T> target) {
-        if (sourceList == null || sourceList.isEmpty()) {
-            return Collections.emptyList();
-        }
-        List<T> objs = new ArrayList<>(sourceList.size());
-        for (Object source : sourceList) {
-            objs.add(copy(source, target));
-        }
-        return objs;
-    }
-
-    /**
-     * 获取对象的setter方法。
-     *
-     * @param obj 对象
-     * @return 对象的setter方法列表
-     */
-    public static List<Method> getSetterMethods(Object obj) {
-        // setter方法列表
-        List<Method> setterMethods = new ArrayList<Method>();
-
-        // 获取所有方法
-        Method[] methods = obj.getClass().getMethods();
-
-        // 查找setter方法
-
-        for (Method method : methods) {
-            Matcher m = SET_PATTERN.matcher(method.getName());
-            if (m.matches() && (method.getParameterTypes().length == 1)) {
-                setterMethods.add(method);
-            }
-        }
-        // 返回setter方法列表
-        return setterMethods;
-    }
-
-    /**
-     * 获取对象的getter方法。
-     *
-     * @param obj 对象
-     * @return 对象的getter方法列表
-     */
-
-    public static List<Method> getGetterMethods(Object obj) {
-        // getter方法列表
-        List<Method> getterMethods = new ArrayList<Method>();
-        // 获取所有方法
-        Method[] methods = obj.getClass().getMethods();
-        // 查找getter方法
-        for (Method method : methods) {
-            Matcher m = GET_PATTERN.matcher(method.getName());
-            if (m.matches() && (method.getParameterTypes().length == 0)) {
-                getterMethods.add(method);
-            }
-        }
-        // 返回getter方法列表
-        return getterMethods;
-    }
-
-    /**
-     * 检查Bean方法名中的属性名是否相等。<br>
-     * 如getName()和setName()属性名一样,getName()和setAge()属性名不一样。
-     *
-     * @param m1 方法名1
-     * @param m2 方法名2
-     * @return 属性名一样返回true,否则返回false
-     */
-
-    public static boolean isMethodPropEquals(String m1, String m2) {
-        return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
-    }
-
-    /**
-     * 将对象转为map
-     *
-     * @param obj
-     * @return
-     */
-    public static Map<String, String> parseObj2Map(Object obj) throws IllegalAccessException {
-        Map<String, String> map = new HashMap();
-        Field[] declaredFields = obj.getClass().getDeclaredFields();
-        for (Field field : declaredFields) {
-            field.setAccessible(true);
-            if (Objects.nonNull(field.get(obj))) {
-                map.put(field.getName(), field.get(obj).toString());
-            }
-        }
-        return map;
-    }
-}

+ 0 - 139
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/http/AjaxResult.java

@@ -1,139 +0,0 @@
-package com.zanxiang.game.common.utils.http;
-
-import com.zanxiang.game.common.utils.StringUtils;
-
-import java.util.HashMap;
-
-/**
- * 操作消息提醒
- */
-public class AjaxResult<T> extends HashMap<String, Object> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 状态码
-     */
-    public static final String CODE_TAG = "code";
-
-    /**
-     * 返回内容
-     */
-    public static final String MSG_TAG = "msg";
-
-    /**
-     * 数据对象
-     */
-    public static final String DATA_TAG = "data";
-
-    /**
-     * 初始化一个新创建的 AjaxResult 对象,使其表示一个空消息。
-     */
-    public AjaxResult() {
-    }
-
-    /**
-     * 初始化一个新创建的 AjaxResult 对象
-     *
-     * @param code 状态码
-     * @param msg  返回内容
-     */
-    public AjaxResult(int code, String msg) {
-        super.put(CODE_TAG, code);
-        super.put(MSG_TAG, msg);
-    }
-
-    /**
-     * 初始化一个新创建的 AjaxResult 对象
-     *
-     * @param code 状态码
-     * @param msg  返回内容
-     * @param data 数据对象
-     */
-    public AjaxResult(int code, String msg, T data) {
-        super.put(CODE_TAG, code);
-        super.put(MSG_TAG, msg);
-        if (StringUtils.isNotNull(data)) {
-            super.put(DATA_TAG, data);
-        }
-    }
-
-    /**
-     * 返回成功消息
-     *
-     * @return 成功消息
-     */
-    public static <T> AjaxResult<T> success() {
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 返回成功数据
-     *
-     * @return 成功消息
-     */
-    public static <T> AjaxResult<T> success(T data) {
-        return AjaxResult.success("操作成功", data);
-    }
-
-    /**
-     * 返回成功消息
-     *
-     * @param msg 返回内容
-     * @return 成功消息
-     */
-    public static <T> AjaxResult<T> success(String msg) {
-        return AjaxResult.success(msg, null);
-    }
-
-    /**
-     * 返回成功消息
-     *
-     * @param msg  返回内容
-     * @param data 数据对象
-     * @return 成功消息
-     */
-    public static <T> AjaxResult<T> success(String msg, T data) {
-        return new AjaxResult<>(HttpStatus.SUCCESS, msg, data);
-    }
-
-    /**
-     * 返回错误消息
-     *
-     * @return
-     */
-    public static <T> AjaxResult<T> error() {
-        return AjaxResult.error("操作失败");
-    }
-
-    /**
-     * 返回错误消息
-     *
-     * @param msg 返回内容
-     * @return 警告消息
-     */
-    public static <T> AjaxResult<T> error(String msg) {
-        return AjaxResult.error(msg, null);
-    }
-
-    /**
-     * 返回错误消息
-     *
-     * @param msg  返回内容
-     * @param data 数据对象
-     * @return 警告消息
-     */
-    public static <T> AjaxResult<T> error(String msg, T data) {
-        return new AjaxResult<>(HttpStatus.ERROR, msg, data);
-    }
-
-    /**
-     * 返回错误消息
-     *
-     * @param code 状态码
-     * @param msg  返回内容
-     * @return 警告消息
-     */
-    public static <T> AjaxResult<T> error(int code, String msg) {
-        return new AjaxResult<>(code, msg, null);
-    }
-}

+ 0 - 88
game-module/game-common/src/main/java/com/zanxiang/game/common/utils/http/HttpStatus.java

@@ -1,88 +0,0 @@
-package com.zanxiang.game.common.utils.http;
-
-/**
- * 返回状态码
- *
- * @author ruoyi
- */
-public class HttpStatus {
-    /**
-     * 操作成功
-     */
-    public static final int SUCCESS = 200;
-
-    /**
-     * 对象创建成功
-     */
-    public static final int CREATED = 201;
-
-    /**
-     * 请求已经被接受
-     */
-    public static final int ACCEPTED = 202;
-
-    /**
-     * 操作已经执行成功,但是没有返回数据
-     */
-    public static final int NO_CONTENT = 204;
-
-    /**
-     * 资源已被移除
-     */
-    public static final int MOVED_PERM = 301;
-
-    /**
-     * 重定向
-     */
-    public static final int SEE_OTHER = 303;
-
-    /**
-     * 资源没有被修改
-     */
-    public static final int NOT_MODIFIED = 304;
-
-    /**
-     * 参数列表错误(缺少,格式不匹配)
-     */
-    public static final int BAD_REQUEST = 400;
-
-    /**
-     * 未授权
-     */
-    public static final int UNAUTHORIZED = 401;
-
-    /**
-     * 访问受限,授权过期
-     */
-    public static final int FORBIDDEN = 403;
-
-    /**
-     * 资源,服务未找到
-     */
-    public static final int NOT_FOUND = 404;
-
-    /**
-     * 不允许的http方法
-     */
-    public static final int BAD_METHOD = 405;
-
-    /**
-     * 资源冲突,或者资源被锁
-     */
-    public static final int CONFLICT = 409;
-
-    /**
-     * 不支持的数据,媒体类型
-     */
-    public static final int UNSUPPORTED_TYPE = 415;
-
-    /**
-     * 系统内部错误
-     */
-    public static final int ERROR = 500;
-
-    /**
-     * 接口未实现
-     */
-    public static final int NOT_IMPLEMENTED = 501;
-}

+ 0 - 138
game-module/game-manage/pom.xml

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>game-module</artifactId>
-        <groupId>com.zanxiang.game</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>game-manage</artifactId>
-
-    <dependencies>
-        <dependency>
-            <artifactId>game-common</artifactId>
-            <groupId>com.zanxiang.game</groupId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter</artifactId>
-        </dependency>
-        <!-- spring boot默认不去扫描 bootstrap.yml文件了 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        </dependency>
-        <!-- SpringBoot start -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <!-- nacos配置中心 默认的 nacos-client 2.0.3有 bug -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba.nacos</groupId>
-                    <artifactId>nacos-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- nacos注册中心 -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba.nacos</groupId>
-                    <artifactId>nacos-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-        </dependency>
-        <!-- 解决validated不生效的依赖问题 -->
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>6.0.17.Final</version>
-            <scope>compile</scope>
-        </dependency>
-        <!--oss集成-->
-        <dependency>
-            <groupId>com.zanxiang.module</groupId>
-            <artifactId>zx-oss</artifactId>
-        </dependency>
-        <!--redis集成-->
-        <dependency>
-            <groupId>com.zanxiang.module</groupId>
-            <artifactId>zx-redis</artifactId>
-        </dependency>
-        <!-- 谷歌http工具类 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.0.M1</version>
-        </dependency>
-        <!-- erp权限 -->
-        <dependency>
-            <groupId>com.zanxiang.erp</groupId>
-            <artifactId>erp-security</artifactId>
-        </dependency>
-        <!-- dubbo -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-metadata-definition-protobuf</artifactId>
-        </dependency>
-        <!-- 头条回传api -->
-        <dependency>
-            <groupId>com.zanxiang.advertising.oceanengine</groupId>
-            <artifactId>advertising-oceanengine-track-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.14</version>
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 36
game-module/game-manage/src/main/java/com/zanxiang/game/manage/ManageApplication.java

@@ -1,36 +0,0 @@
-package com.zanxiang.game.manage;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-25
- * @description : 启动类
- */
-@Slf4j
-@EnableDiscoveryClient
-@SpringBootApplication
-@MapperScan({"com.zanxiang.mybatis.mapper"})
-@EnableDubbo
-@EnableSwagger2
-public class ManageApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功opQ ( ´・・)ノ(._.`) \n" +
-                " ______  __     __     \n" +
-                "/_____/\\/__/\\ /__/\\    \n" +
-                "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +
-                "   /: /  \\_\\::_\\:_\\/   \n" +
-                "  /::/___  _\\/__\\_\\_/\\ \n" +
-                " /_:/____/\\\\ \\ \\ \\::\\ \\\n" +
-                " \\_______\\/ \\_\\/  \\__\\/\n");
-    }
-
-}

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

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

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

@@ -1,48 +0,0 @@
-package com.zanxiang.game.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();
-    }
-}

+ 0 - 247
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/ChoiceController.java

@@ -1,247 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.common.enums.*;
-import com.zanxiang.game.common.utils.bean.BeanUtils;
-import com.zanxiang.game.manage.domain.vo.*;
-import com.zanxiang.game.manage.service.*;
-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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-03
- * @description : 条件选择接口
- */
-@Api(tags = {"选择下拉接口"})
-@RestController
-@RequestMapping("/choice")
-@Slf4j
-public class ChoiceController {
-
-    @Autowired
-    private ICpService cpService;
-
-    @Autowired
-    private IGameService gameService;
-
-    @Autowired
-    private IGameCategoryService gameCategoryService;
-
-    @Autowired
-    private IPromoChannelService promoChannelService;
-
-    @Autowired
-    private IPromoAccountService promoAccountService;
-
-    @Autowired
-    private IPayWayService payWayService;
-
-    @Autowired
-    private IPayMerchantService payMerchantService;
-
-    @Autowired
-    private IGameTagService gameTagService;
-
-    @Autowired
-    private IPromoMediaService promoMediaService;
-
-    @Autowired
-    private IPromoSiteService promoSiteService;
-
-    @Autowired
-    private IPayApplicationService payApplicationService;
-
-    @Autowired
-    private IPayDeviceService payDeviceService;
-
-    @Autowired
-    private IPayBoxService payBoxService;
-
-    @ApiOperation(value = "vip等级选择列表")
-    @GetMapping(value = "/vip/level/list")
-    @PreAuthorize(permissionKey = "sdk:choiceVipLevel:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = VipLevelChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<VipLevelChoiceVO>> vipLevelChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(VipLevelEnum.values()), VipLevelChoiceVO.class));
-    }
-
-    @ApiOperation(value = "操作系统选择列表")
-    @GetMapping(value = "/os/type/list")
-    @PreAuthorize(permissionKey = "sdk:choiceOsType:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = SystemChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<SystemChoiceVO>> systemChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(OsEnum.values()), SystemChoiceVO.class));
-    }
-
-    @ApiOperation(value = "cp选择列表")
-    @GetMapping(value = "/cp/list")
-    @PreAuthorize(permissionKey = "sdk:choiceCp:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = CpChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<CpChoiceVO>> cpChoiceList() {
-        return new ResultVO<>(cpService.choiceList());
-    }
-
-    @ApiOperation(value = "游戏选择列表")
-    @GetMapping(value = "/game/list")
-    @PreAuthorize(permissionKey = "sdk:gameChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<GameChoiceVO>> gameChoiceList() {
-        return new ResultVO<>(gameService.choiceList());
-    }
-
-    @ApiOperation(value = "游戏应用类型选择列表")
-    @GetMapping(value = "/game/category/list")
-    @PreAuthorize(permissionKey = "sdk:gameCategoryChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameCategoryChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<GameCategoryChoiceVO>> gameCategoryChoiceList() {
-        return ResultVO.ok(gameCategoryService.gameCategoryChoiceList());
-    }
-
-    @ApiOperation(value = "游戏分类标签选择列表")
-    @GetMapping(value = "/game/tags/list")
-    @PreAuthorize(permissionKey = "sdk:gameTagsChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameTagChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<GameTagChoiceVO>> gameTagsChoiceList() {
-        return ResultVO.ok(gameTagService.gameTagsChoiceList());
-    }
-
-    @ApiOperation(value = "注册渠道选择列表")
-    @GetMapping(value = "/promo/channel/list")
-    @PreAuthorize(permissionKey = "sdk:promoChannelChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoChannelChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoChannelChoiceVO>> promoChannelChoiceList() {
-        return new ResultVO<>(promoChannelService.promoChannelChoiceList());
-    }
-
-    @ApiOperation(value = "归因推广账号选择列表")
-    @GetMapping(value = "/promo/account/list")
-    @PreAuthorize(permissionKey = "sdk:promoAccountChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoAccountChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoAccountChoiceVO>> promoAccountChoiceList() {
-        return new ResultVO<>(promoAccountService.promoAccountChoiceList());
-    }
-
-    @ApiOperation(value = "归因投放人员选择列表")
-    @GetMapping(value = "/promo/pitcher/list")
-    @PreAuthorize(permissionKey = "sdk:promoPitcherChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoPitcherChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoPitcherChoiceVO>> promoPitcherChoiceList() {
-        return new ResultVO<>(promoAccountService.promoPitcherChoiceList());
-    }
-
-    @ApiOperation(value = "支付方式选择列表")
-    @GetMapping(value = "/pay/way/list")
-    @PreAuthorize(permissionKey = "sdk:payWayChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayWayChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PayWayChoiceVO>> payWayChoiceList() {
-        return new ResultVO<>(payWayService.payWayChoiceList());
-    }
-
-    @ApiOperation(value = "支付类型选择列表")
-    @GetMapping(value = "/pay/device/list")
-    @PreAuthorize(permissionKey = "sdk:payDeviceChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayDeviceChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PayDeviceChoiceVO>> payDeviceChoiceList() {
-        return new ResultVO<>(payDeviceService.payDeviceChoiceList());
-    }
-
-    @ApiOperation(value = "商户选择列表")
-    @GetMapping(value = "/pay/merchant/list")
-    @PreAuthorize(permissionKey = "sdk:payMerchantChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayMerchantChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PayMerchantChoiceVO>> payMerchantChoiceList() {
-        return ResultVO.ok(payMerchantService.payMerchantChoiceList());
-    }
-
-    @ApiOperation(value = "推广媒体类型选择列表")
-    @GetMapping(value = "/promo/media/type/list")
-    @PreAuthorize(permissionKey = "sdk:promoMediaTypeChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoMediaTypeChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoMediaTypeChoiceVO>> promoMediaTypeChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PromoMediaTypeEnum.values()), PromoMediaTypeChoiceVO.class));
-    }
-
-    @ApiOperation(value = "推广媒体选择列表")
-    @GetMapping(value = "/promo/media/list")
-    @PreAuthorize(permissionKey = "sdk:promoMediaChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoMediaChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoMediaChoiceVO>> promoMediaChoiceList() {
-        return ResultVO.ok(promoMediaService.promoMediaChoiceList());
-    }
-
-    @ApiOperation(value = "推广账号类型选择列表")
-    @GetMapping(value = "/promo/account/type/list")
-    @PreAuthorize(permissionKey = "sdk:promoAccountTypeChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoMediaChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoAccountTypeChoiceVO>> promoAccountTypeChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PromoAccountTypeEnum.values()), PromoAccountTypeChoiceVO.class));
-    }
-
-    @ApiOperation(value = "推广账号联动选择列表")
-    @GetMapping(value = "/promo/account/linkage/list")
-    @PreAuthorize(permissionKey = "sdk:promoAccountLinkageChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoAccountLinkageChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoAccountLinkageChoiceVO>> promoAccountLinkageChoiceList() {
-        return new ResultVO<>(promoAccountService.promoAccountLinkageChoiceList());
-    }
-
-    @ApiOperation(value = "推广媒体版位位置联动选择列表")
-    @GetMapping(value = "/promo/site/linkage/list")
-    @PreAuthorize(permissionKey = "sdk:promoSiteLinkageChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoSiteLinkageChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoSiteLinkageChoiceVO>> promoSiteLinkageChoiceList() {
-        return new ResultVO<>(promoSiteService.promoSiteLinkageChoiceList());
-    }
-
-    @ApiOperation(value = "推广服务商选择列表")
-    @GetMapping(value = "/promo/provider/list")
-    @PreAuthorize(permissionKey = "sdk:promoProviderChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoProviderChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoProviderChoiceVO>> promoProviderChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PromoProviderEnum.values()), PromoProviderChoiceVO.class));
-    }
-
-    @ApiOperation(value = "支付应用类型选择列表")
-    @GetMapping(value = "/application/type/list")
-    @PreAuthorize(permissionKey = "sdk:payApplicationTypeChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = ApplicationTypeChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<ApplicationTypeChoiceVO>> applicationTypeChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PayApplicationTypeEnum.values()), ApplicationTypeChoiceVO.class));
-    }
-
-    @ApiOperation(value = "支付应用选择列表")
-    @GetMapping(value = "/pay/application/list")
-    @PreAuthorize(permissionKey = "sdk:payApplicationChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayApplicationChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PayApplicationChoiceVO>> payApplicationChoiceList() {
-        return new ResultVO<>(payApplicationService.payApplicationChoiceList());
-    }
-
-    @ApiOperation(value = "支付盒子选择列表")
-    @GetMapping(value = "/pay/box/list")
-    @PreAuthorize(permissionKey = "sdk:payBoxChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayBoxChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PayBoxChoiceVO>> payBoxChoiceList() {
-        return ResultVO.ok(payBoxService.payBoxChoiceList());
-    }
-
-    @ApiOperation(value = "策略类型选择列表")
-    @GetMapping(value = "/game/pay/strategy/list")
-    @PreAuthorize(permissionKey = "sdk:gamePayStrategyChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GamePayStrategyChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<GamePayStrategyChoiceVO>> gamePayStrategyChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(GameStrategyTypeEnum.values()), GamePayStrategyChoiceVO.class));
-    }
-}

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

@@ -1,56 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.CpAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.CpListParam;
-import com.zanxiang.game.manage.domain.vo.CpVO;
-import com.zanxiang.game.manage.service.ICpService;
-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 ICpService cpService;
-
-    @ApiOperation(value = "cp新增或者更新")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "sdk:cp:addOrUpdate")
-    @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")
-    @PreAuthorize(permissionKey = "sdk:cp: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")
-    @PreAuthorize(permissionKey = "sdk:cp:delete")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> deleteById(@RequestParam Long id) {
-        return new ResultVO<>(cpService.deleteById(id));
-    }
-}

+ 0 - 54
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GameAppletController.java

@@ -1,54 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.GameAccountUpdateParam;
-import com.zanxiang.game.manage.domain.vo.GameAccountVO;
-import com.zanxiang.game.manage.service.IGameAppletService;
-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-07-08
- * @description : 微信小游戏(小程序)
- */
-@Api(tags = {"微信小游戏(小程序)"})
-@RestController
-@RequestMapping("/game/applet")
-@Slf4j
-public class GameAppletController {
-
-    @Autowired
-    private IGameAppletService gameAppletService;
-
-    @ApiOperation(value = "获取账号信息配置")
-    @GetMapping(value = "/info")
-    @PreAuthorize(permissionKey = "sdk:gameApplet:info")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameAccountVO.class)})
-    public ResultVO<GameAccountVO> getGameAccount(@RequestParam Long id) {
-        return new ResultVO<>(gameAppletService.getGameAccount(id));
-    }
-
-    @ApiOperation(value = "账号信息配置添加或者更新")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "sdk:gameApplet:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> gameAccountAddOrUpdate(@Validated @RequestBody GameAccountUpdateParam param) {
-        return new ResultVO<>(gameAppletService.gameAccountAddOrUpdate(param));
-    }
-
-    @ApiOperation(value = "获取小游戏二维码")
-    @GetMapping(value = "/qr/code")
-    @PreAuthorize(permissionKey = "sdk:gameApplet:qrCode")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = String.class)})
-    public ResultVO<String> getQrCode(@RequestParam Long gameId) {
-        return new ResultVO<>(gameAppletService.getQrCod(gameId));
-    }
-}

+ 0 - 122
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GameController.java

@@ -1,122 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.*;
-import com.zanxiang.game.manage.domain.vo.GameDockVO;
-import com.zanxiang.game.manage.domain.vo.GameInfoVO;
-import com.zanxiang.game.manage.domain.vo.GameListVO;
-import com.zanxiang.game.manage.domain.vo.GameRelationVO;
-import com.zanxiang.game.manage.service.IGameService;
-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-30
- * @description : 游戏管理接口
- */
-@Api(tags = {"游戏管理接口"})
-@RestController
-@RequestMapping("/game")
-@Slf4j
-public class GameController {
-
-    @Autowired
-    private IGameService gameService;
-
-    @ApiOperation(value = "新增游戏")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "sdk:game:add")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameListVO.class)})
-    public ResultVO<Boolean> gameAddOrUpdate(@Validated @RequestBody GameAddParam param) {
-        return new ResultVO<>(gameService.gameAddOrUpdate(param));
-    }
-
-    @ApiOperation(value = "游戏基本信息查询")
-    @GetMapping(value = "/detail/info")
-    @PreAuthorize(permissionKey = "sdk:game:detailInfo")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameInfoVO.class)})
-    public ResultVO<GameInfoVO> getGameInfo(@RequestParam Long id) {
-        return new ResultVO<>(gameService.getGameInfo(id));
-    }
-
-    @ApiOperation(value = "游戏基本信息更新")
-    @PostMapping(value = "/detail/update")
-    @PreAuthorize(permissionKey = "sdk:game:detailUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> gameUpdate(@Validated @RequestBody GameUpdateParam param) {
-        return new ResultVO<>(gameService.updateGameInfo(param));
-    }
-
-    @ApiOperation(value = "游戏对接参数获取展示")
-    @GetMapping(value = "/dock/info")
-    @PreAuthorize(permissionKey = "sdk:game:dockInfo")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDockVO.class)})
-    public ResultVO<GameDockVO> getGameDock(@RequestParam Long id) {
-        return new ResultVO<>(gameService.getGameDock(id));
-    }
-
-    @ApiOperation(value = "游戏对接参数更新更新")
-    @PostMapping(value = "/dock/update")
-    @PreAuthorize(permissionKey = "sdk:game:dockUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> gameDockUpdate(@Validated @RequestBody GameDockParam param) {
-        return new ResultVO<>(gameService.gameDockUpdate(param));
-    }
-
-    @ApiOperation(value = "获取游戏关联信息")
-    @GetMapping(value = "/relation/info")
-    @PreAuthorize(permissionKey = "sdk:game:relationInfo")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameRelationVO.class)})
-    public ResultVO<GameRelationVO> getGameRelation(@RequestParam Long id) {
-        return new ResultVO<>(gameService.getGameRelation(id));
-    }
-
-    @ApiOperation(value = "关联游戏更新")
-    @PostMapping(value = "/relation/update")
-    @PreAuthorize(permissionKey = "sdk:game:relationUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> relationGameUpdate(@Validated @RequestBody RelationGameUpdateParam param) {
-        return new ResultVO<>(gameService.relationGameUpdate(param));
-    }
-
-    @ApiOperation(value = "导量游戏更新")
-    @PostMapping(value = "/guide/update")
-    @PreAuthorize(permissionKey = "sdk:game:guideUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameListVO.class)})
-    public ResultVO<Boolean> guideGameUpdateUpdate(@Validated @RequestBody GuideGameUpdateParam param) {
-        return new ResultVO<>(gameService.guideGameUpdateUpdate(param));
-    }
-
-    @ApiOperation(value = "游戏列表查询")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:game:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameListVO.class)})
-    public ResultVO<IPage<GameListVO>> gameList(@Validated @RequestBody GameListParam param) {
-        return new ResultVO<>(gameService.gameList(param));
-    }
-
-    @ApiOperation(value = "删除游戏")
-    @DeleteMapping(value = "/delete")
-    @PreAuthorize(permissionKey = "sdk:game:delete")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameListVO.class)})
-    public ResultVO<Boolean> deleteById(@RequestParam Long id) {
-        return new ResultVO<>(gameService.deleteById(id));
-    }
-
-    @ApiOperation(value = "游戏状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "sdk:game:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameListVO.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(gameService.statusUpdate(id, status));
-    }
-}

+ 0 - 62
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GamePayStrategyController.java

@@ -1,62 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.GamePayStrategyAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.GamePayStrategyListParam;
-import com.zanxiang.game.manage.domain.vo.GamePayStrategyListVO;
-import com.zanxiang.game.manage.service.IGamePayStrategyService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-25
- * @description : 支付策略管理
- */
-@Api(tags = "支付策略管理")
-@RestController
-@RequestMapping("/game/pay/strategy")
-public class GamePayStrategyController {
-
-    @Autowired
-    private IGamePayStrategyService gamePayStrategyService;
-
-    @ApiOperation(value = "游戏支付策略新增或者更新")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:gamePayStrategy:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody GamePayStrategyAddUpdateParam param) {
-        return new ResultVO<>(gamePayStrategyService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "游戏支付策略列表查询")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:gamePayStrategy:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GamePayStrategyListVO.class)})
-    public ResultVO<IPage<GamePayStrategyListVO>> pageList(@Validated @RequestBody GamePayStrategyListParam param) {
-        return new ResultVO<>(gamePayStrategyService.pageList(param));
-    }
-
-    @ApiOperation(value = "游戏支付策略删除")
-    @DeleteMapping(value = "/delete")
-    @PreAuthorize(permissionKey = "manage:gamePayStrategy:delete")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> deleteById(@RequestParam Long id) {
-        return new ResultVO<>(gamePayStrategyService.deleteById(id));
-    }
-
-    @ApiOperation(value = "游戏支付策略状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:gamePayStrategy:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(gamePayStrategyService.statusUpdate(id, status));
-    }
-}

+ 0 - 62
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GamePayWayController.java

@@ -1,62 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.GamePayWayAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.GamePayWayListParam;
-import com.zanxiang.game.manage.domain.vo.GamePayWayListVO;
-import com.zanxiang.game.manage.service.IGamePayWayService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-25
- * @description : 游戏支付配置管理
- */
-@Api(tags = "支付配置管理")
-@RestController
-@RequestMapping("/game/pay/way")
-public class GamePayWayController {
-
-    @Autowired
-    private IGamePayWayService gamePayWayService;
-
-    @ApiOperation(value = "游戏支付配置新增或者更新")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:gamePayWay:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody GamePayWayAddUpdateParam param) {
-        return new ResultVO<>(gamePayWayService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "游戏支付配置列表查询")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:gamePayWay:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GamePayWayListVO.class)})
-    public ResultVO<IPage<GamePayWayListVO>> pageList(@Validated @RequestBody GamePayWayListParam param) {
-        return new ResultVO<>(gamePayWayService.pageList(param));
-    }
-
-    @ApiOperation(value = "游戏支付配置删除")
-    @DeleteMapping(value = "/delete")
-    @PreAuthorize(permissionKey = "manage:gamePayWay:delete")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> deleteById(@RequestParam Long id) {
-        return new ResultVO<>(gamePayWayService.deleteById(id));
-    }
-
-    @ApiOperation(value = "游戏支付配置状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:gamePayWay:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(gamePayWayService.statusUpdate(id, status));
-    }
-}

+ 0 - 47
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GamePictureController.java

@@ -1,47 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.GamePictureParam;
-import com.zanxiang.game.manage.domain.vo.GamePictureVO;
-import com.zanxiang.game.manage.service.IGamePictureService;
-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-07-12
- * @description : 游戏图片
- */
-@Api(tags = {"游戏图片管理接口"})
-@RestController
-@RequestMapping("/game/picture")
-@Slf4j
-public class GamePictureController {
-
-    @Autowired
-    private IGamePictureService gamePictureService;
-
-    @ApiOperation(value = "获取游戏图片配置")
-    @GetMapping(value = "/info")
-    @PreAuthorize(permissionKey = "sdk:gamePicture:info")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GamePictureVO.class)})
-    public ResultVO<GamePictureVO> getByGameId(@RequestParam Long id) {
-        return new ResultVO<>(gamePictureService.getByGameId(id));
-    }
-
-    @ApiOperation(value = "游戏图片配置添加或者更新")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "sdk:gamePicture:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody GamePictureParam param) {
-        return new ResultVO<>(gamePictureService.addOrUpdate(param));
-    }
-
-}

+ 0 - 56
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/GameTagController.java

@@ -1,56 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.GameTagAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.GameTagListParam;
-import com.zanxiang.game.manage.domain.vo.GameTagVO;
-import com.zanxiang.game.manage.service.IGameTagService;
-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-23
- * @description : 游戏分类标签
- */
-@Api(tags = {"游戏分类标签管理接口"})
-@RestController
-@RequestMapping("/game/tag")
-@Slf4j
-public class GameTagController {
-
-    @Autowired
-    private IGameTagService gameTagService;
-
-    @ApiOperation(value = "查询游戏标签列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:gameTag:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameTagVO.class)})
-    public ResultVO<IPage<GameTagVO>> list(@Validated @RequestBody GameTagListParam param) {
-        return ResultVO.ok(gameTagService.list(param));
-    }
-
-    @ApiOperation(value = "游戏标签分类添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "sdk:gameTag:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody GameTagAddUpdateParam param) {
-        return ResultVO.ok(gameTagService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "游戏标签分类删除")
-    @DeleteMapping(value = "/delete/by/id")
-    @PreAuthorize(permissionKey = "sdk:gameTag:deleteById")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> deleteById(@RequestParam Long id) {
-        return ResultVO.ok(gameTagService.deleteById(id));
-    }
-}

+ 0 - 59
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/OrderController.java

@@ -1,59 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.LogPayCpParam;
-import com.zanxiang.game.manage.domain.params.OrderParam;
-import com.zanxiang.game.manage.domain.vo.LogPayCpVO;
-import com.zanxiang.game.manage.domain.vo.OrderListVO;
-import com.zanxiang.game.manage.service.ILogPayCpService;
-import com.zanxiang.game.manage.service.IOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-07
- * @description : 订单
- */
-@Api(tags = "订单模块接口")
-@RestController
-@RequestMapping("/order")
-public class OrderController {
-
-    @Autowired
-    private IOrderService orderService;
-
-    @Autowired
-    private ILogPayCpService logPayCpService;
-
-    @ApiOperation(value = "订单列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:order:orderList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OrderListVO.class, responseContainer = "list")})
-    public ResultVO<OrderListVO> orderList(@Validated @RequestBody OrderParam param) {
-        return ResultVO.ok(orderService.orderList(param));
-    }
-
-    @ApiOperation(value = "订单回调CP列表")
-    @PostMapping(value = "/cp/call/list")
-    @PreAuthorize(permissionKey = "sdk:order:callCpList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = LogPayCpVO.class, responseContainer = "list")})
-    public ResultVO<IPage<LogPayCpVO>> callCpList(@Validated @RequestBody LogPayCpParam param) {
-        return ResultVO.ok(logPayCpService.callCpList(param));
-    }
-
-    @ApiOperation(value = "订单上报")
-    @PutMapping(value = "/call/back")
-    @PreAuthorize(permissionKey = "sdk:order:callBack")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> callBack(@RequestParam String orderId) {
-        return ResultVO.ok(orderService.callBack(orderId));
-    }
-}

+ 0 - 53
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/OssController.java

@@ -1,53 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.common.enums.FileTypeEnum;
-import com.zanxiang.game.common.exception.BaseException;
-import com.zanxiang.module.oss.pojo.OssUploadCallback;
-import com.zanxiang.module.oss.pojo.dto.OssUploadDTO;
-import com.zanxiang.module.oss.service.IOssService;
-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.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-12
- * @description : oss相关接口
- */
-@Api(tags = {"oss相关接口管理"})
-@RestController
-@RequestMapping("/oss")
-@Slf4j
-public class OssController {
-
-    @Autowired
-    private IOssService ossService;
-
-    @ApiOperation(value = "文件上传oss")
-    @GetMapping(value = "/form/upload")
-    @PreAuthorize(permissionKey = "sdk:oss:formUpload")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Map.class)})
-    public ResultVO<Map<String, String>> formUpload(@RequestParam String fileType, @RequestParam String type) {
-        FileTypeEnum fileTypeEnum = FileTypeEnum.getByFileType(fileType);
-        if (fileTypeEnum == null) {
-            throw new BaseException("错误的文件类型");
-        }
-        return new ResultVO<>(ossService.formUpload(fileTypeEnum.getFilePath(), type));
-    }
-
-    @ApiOperation(value = "oss回传接口")
-    @PostMapping("/callback")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OssUploadCallback.class)})
-    public ResultVO<OssUploadCallback> ossCallback(@RequestBody OssUploadDTO dto) {
-        return ResultVO.ok(ossService.callback(dto));
-    }
-
-}

+ 0 - 71
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PayApplicationController.java

@@ -1,71 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.PayApplicationAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.PayApplicationListParam;
-import com.zanxiang.game.manage.domain.vo.PayApplicationVO;
-import com.zanxiang.game.manage.service.IPayApplicationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-25
- * @description : 应用管理
- */
-@Api(tags = "应用管理")
-@RestController
-@RequestMapping("/pay/application")
-public class PayApplicationController {
-
-    @Autowired
-    private IPayApplicationService payApplicationService;
-
-    @ApiOperation(value = "应用新增或者更新")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:payApplication:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PayApplicationAddUpdateParam param) {
-        return new ResultVO<>(payApplicationService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "应用列表查询")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:payApplication:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayApplicationVO.class)})
-    public ResultVO<IPage<PayApplicationVO>> list(@Validated @RequestBody PayApplicationListParam param) {
-        return new ResultVO<>(payApplicationService.pageList(param));
-    }
-
-    @ApiOperation(value = "应用删除")
-    @DeleteMapping(value = "/delete")
-    @PreAuthorize(permissionKey = "manage:payApplication:delete")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> deleteById(@RequestParam Long id) {
-        return new ResultVO<>(payApplicationService.deleteById(id));
-    }
-
-    @ApiOperation(value = "应用状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:payApplication:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(payApplicationService.statusUpdate(id, status));
-    }
-
-    @ApiOperation(value = "获取小程序二维码")
-    @GetMapping(value = "/qr/code")
-    @PreAuthorize(permissionKey = "manage:payApplication:qrCode")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = String.class)})
-    public ResultVO<String> getQrCode(@RequestParam Long id) {
-        return new ResultVO<>(payApplicationService.getQrCode(id));
-    }
-
-}

+ 0 - 62
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PayBoxController.java

@@ -1,62 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.PayBoxAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.PayBoxListParam;
-import com.zanxiang.game.manage.domain.vo.PayBoxListVO;
-import com.zanxiang.game.manage.service.IPayBoxService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-25
- * @description : 支付盒子管理
- */
-@Api(tags = "支付盒子管理")
-@RestController
-@RequestMapping("/pay/box")
-public class PayBoxController {
-
-    @Autowired
-    private IPayBoxService payBoxService;
-
-    @ApiOperation(value = "支付盒子新增或者更新")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:payBox:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PayBoxAddUpdateParam param) {
-        return new ResultVO<>(payBoxService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "支付盒子列表查询")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:payBox:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayBoxListVO.class)})
-    public ResultVO<IPage<PayBoxListVO>> list(@Validated @RequestBody PayBoxListParam param) {
-        return new ResultVO<>(payBoxService.pageList(param));
-    }
-
-    @ApiOperation(value = "支付盒子删除")
-    @DeleteMapping(value = "/delete")
-    @PreAuthorize(permissionKey = "manage:payBox:delete")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> deleteById(@RequestParam Long id) {
-        return new ResultVO<>(payBoxService.deleteById(id));
-    }
-
-    @ApiOperation(value = "支付盒子状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:payBox:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(payBoxService.statusUpdate(id, status));
-    }
-}

+ 0 - 70
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PayMerchantController.java

@@ -1,70 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.PayMerchantAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.PayMerchantListParam;
-import com.zanxiang.game.manage.domain.vo.PayMerchantListVO;
-import com.zanxiang.game.manage.service.IPayMerchantService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-25
- * @description : 商户管理
- */
-@Api(tags = "商户号管理")
-@RestController
-@RequestMapping("/pay/merchant")
-public class PayMerchantController {
-
-    @Autowired
-    private IPayMerchantService payMerchantService;
-
-    @ApiOperation(value = "商户添加或者更新")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:payMerchant:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> list(@Validated @RequestBody PayMerchantAddUpdateParam param) {
-        return new ResultVO<>(payMerchantService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "商户列表查询")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:payMerchant:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayMerchantListVO.class)})
-    public ResultVO<IPage<PayMerchantListVO>> list(@Validated @RequestBody PayMerchantListParam param) {
-        return new ResultVO<>(payMerchantService.pageList(param));
-    }
-
-    @ApiOperation(value = "商户删除")
-    @DeleteMapping(value = "/delete")
-    @PreAuthorize(permissionKey = "manage:payMerchant:delete")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> deleteById(@RequestParam Long id) {
-        return new ResultVO<>(payMerchantService.deleteById(id));
-    }
-
-    @ApiOperation(value = "商户状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:payMerchant:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(payMerchantService.statusUpdate(id, status));
-    }
-
-    @ApiOperation(value = "商户密钥变更")
-    @PatchMapping(value = "/secret/key/update")
-    @PreAuthorize(permissionKey = "manage:payMerchant:secretKeyUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> secretKeyUpdate(@RequestParam Long id, @RequestParam String secretKey) {
-        return new ResultVO<>(payMerchantService.secretKeyUpdate(id, secretKey));
-    }
-}

+ 0 - 63
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PromoAccountController.java

@@ -1,63 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.PromoAccountAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.PromoAccountAssignParam;
-import com.zanxiang.game.manage.domain.params.PromoAccountListParam;
-import com.zanxiang.game.manage.domain.vo.PromoAccountListVO;
-import com.zanxiang.game.manage.service.IPromoAccountService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广账号
- */
-@Api(tags = "推广账号接口")
-@RestController
-@RequestMapping("/promo/account")
-public class PromoAccountController {
-
-    @Autowired
-    private IPromoAccountService promoAccountService;
-
-    @ApiOperation(value = "查询推广账号列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:promoAccount:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoAccountListVO.class)})
-    public ResultVO<IPage<PromoAccountListVO>> list(@Validated @RequestBody PromoAccountListParam param) {
-        return ResultVO.ok(promoAccountService.list(param));
-    }
-
-    @ApiOperation(value = "推广账号添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:promoAccount:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PromoAccountAddUpdateParam param) {
-        return ResultVO.ok(promoAccountService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "推广账号状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:promoAccount:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(promoAccountService.statusUpdate(id, status));
-    }
-
-    @ApiOperation(value = "推广账号指派")
-    @PostMapping(value = "/assign")
-    @PreAuthorize(permissionKey = "manage:accountAssign:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> accountAssign(@Validated @RequestBody PromoAccountAssignParam param) {
-        return ResultVO.ok(promoAccountService.accountAssign(param));
-    }
-}

+ 0 - 54
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PromoChannelController.java

@@ -1,54 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.PromoChannelAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.PromoChannelListParam;
-import com.zanxiang.game.manage.domain.vo.PromoChannelListVO;
-import com.zanxiang.game.manage.service.IPromoChannelService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-23
- * @description : 推广渠道
- */
-@Api(tags = "推广渠道接口")
-@RestController
-@RequestMapping("/promo/channel")
-public class PromoChannelController {
-
-    @Autowired
-    private IPromoChannelService promoChannelService;
-
-    @ApiOperation(value = "查询推广渠道列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:promoChannel:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoChannelListVO.class)})
-    public ResultVO<IPage<PromoChannelListVO>> list(@Validated @RequestBody PromoChannelListParam param) {
-        return ResultVO.ok(promoChannelService.list(param));
-    }
-
-    @ApiOperation(value = "推广渠道添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:promoChannel:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PromoChannelAddUpdateParam param) {
-        return ResultVO.ok(promoChannelService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "推广渠道状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:promoChannel:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(promoChannelService.statusUpdate(id, status));
-    }
-}

+ 0 - 54
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PromoMediaController.java

@@ -1,54 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.PromoMediaAddUpdateParam;
-import com.zanxiang.game.manage.domain.params.PromoMediaListParam;
-import com.zanxiang.game.manage.domain.vo.PromoMediaListVO;
-import com.zanxiang.game.manage.service.IPromoMediaService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广媒体
- */
-@Api(tags = "推广媒体接口")
-@RestController
-@RequestMapping("/promo/media")
-public class PromoMediaController {
-
-    @Autowired
-    private IPromoMediaService promoMediaService;
-
-    @ApiOperation(value = "查询推广媒体列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:promoMedia:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoMediaListVO.class)})
-    public ResultVO<IPage<PromoMediaListVO>> list(@Validated @RequestBody PromoMediaListParam param) {
-        return ResultVO.ok(promoMediaService.list(param));
-    }
-
-    @ApiOperation(value = "推广媒体添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:promoMedia:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PromoMediaAddUpdateParam param) {
-        return ResultVO.ok(promoMediaService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "推广媒体状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:promoMedia:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(promoMediaService.statusUpdate(id, status));
-    }
-}

+ 0 - 54
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/PromoSiteController.java

@@ -1,54 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.PromoSiteAddOrUpdateParam;
-import com.zanxiang.game.manage.domain.params.PromoSiteListParam;
-import com.zanxiang.game.manage.domain.vo.PromoSiteListVO;
-import com.zanxiang.game.manage.service.IPromoSiteService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广版位
- */
-@Api(tags = "推广版位接口")
-@RestController
-@RequestMapping("/promo/site")
-public class PromoSiteController {
-
-    @Autowired
-    private IPromoSiteService promoSiteService;
-
-    @ApiOperation(value = "查询推广媒体版位列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:promoSite:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoSiteListVO.class)})
-    public ResultVO<IPage<PromoSiteListVO>> list(@Validated @RequestBody PromoSiteListParam param) {
-        return ResultVO.ok(promoSiteService.list(param));
-    }
-
-    @ApiOperation(value = "推广媒体版位添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:promoSite:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PromoSiteAddOrUpdateParam param) {
-        return ResultVO.ok(promoSiteService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "推广媒体版位状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:promoSite:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return new ResultVO<>(promoSiteService.statusUpdate(id, status));
-    }
-}

+ 0 - 79
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserBanController.java

@@ -1,79 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.*;
-import com.zanxiang.game.manage.domain.vo.IpBanVO;
-import com.zanxiang.game.manage.domain.vo.UserBanVO;
-import com.zanxiang.game.manage.service.IIpBanService;
-import com.zanxiang.game.manage.service.IUserBanService;
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-28
- * @description : 封禁管理接口
- */
-@Api(tags = {"封禁管理接口"})
-@RestController
-@RequestMapping("/ban")
-@Slf4j
-public class UserBanController {
-
-    @Autowired
-    private IIpBanService ipBanService;
-
-    @Autowired
-    private IUserBanService userBanService;
-
-    @ApiOperation(value = "查询ip封禁列表")
-    @PostMapping(value = "/ip/list")
-    @PreAuthorize(permissionKey = "sdk:ipBan:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = IpBanVO.class)})
-    public ResultVO<IPage<IpBanVO>> list(@Validated @RequestBody IpBanListParam param) {
-        return new ResultVO<>(ipBanService.list(param));
-    }
-
-    @ApiOperation(value = "添加封禁ip")
-    @PostMapping(value = "/ip/add")
-    @PreAuthorize(permissionKey = "sdk:ipBan:add")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addIp(@Validated @RequestBody IpBanAddParam param) {
-        return new ResultVO<>(ipBanService.addIp(param));
-    }
-
-    @ApiOperation(value = "ip封禁或者解封")
-    @PostMapping(value = "/ip/update")
-    @PreAuthorize(permissionKey = "sdk:ipBan:update")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> ipBanOrRemove(@Validated @RequestBody IpBanUpdateParam param) {
-        return new ResultVO<>(ipBanService.ipBanOrRemove(param));
-    }
-
-    @ApiOperation(value = "查询玩家封禁列表")
-    @PostMapping(value = "/user/list")
-    @PreAuthorize(permissionKey = "sdk:userBan:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserBanVO.class)})
-    public ResultVO<IPage<UserBanVO>> list(@Validated @RequestBody UserBanListParam param) {
-        return new ResultVO<>(userBanService.list(param));
-    }
-
-    @ApiOperation(value = "玩家封禁添加或者更新")
-    @PostMapping(value = "/user/add/or/update")
-    @PreAuthorize(permissionKey = "sdk:userBan:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody UserBanUpdateParam param) {
-        return new ResultVO<>(userBanService.addOrUpdate(param));
-    }
-}

+ 0 - 42
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserCardController.java

@@ -1,42 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.UserNameAuthListParam;
-import com.zanxiang.game.manage.domain.vo.UserCardVO;
-import com.zanxiang.game.manage.service.IUserCardService;
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-02
- * @description : 用户实名
- */
-@Api(tags = {"用户实名认证管理"})
-@RestController
-@RequestMapping("/user/card")
-@Slf4j
-public class UserCardController {
-
-    @Autowired
-    private IUserCardService userCardService;
-
-    @ApiOperation(value = "玩家实名认证列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:userCard:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserCardVO.class)})
-    public ResultVO<IPage<UserCardVO>> authList(@Validated @RequestBody UserNameAuthListParam param) {
-        return ResultVO.ok(userCardService.getUserCardList(param));
-    }
-}

+ 0 - 96
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserController.java

@@ -1,96 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.UserListParam;
-import com.zanxiang.game.manage.domain.params.UserLoginLogParam;
-import com.zanxiang.game.manage.domain.params.UserOrderListParam;
-import com.zanxiang.game.manage.domain.params.UserUpdateParam;
-import com.zanxiang.game.manage.domain.vo.*;
-import com.zanxiang.game.manage.service.IOrderService;
-import com.zanxiang.game.manage.service.IUserAddressService;
-import com.zanxiang.game.manage.service.IUserLoginLogService;
-import com.zanxiang.game.manage.service.IUserService;
-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-29
- * @description : 玩家管理接口
- */
-@Api(tags = {"玩家管理接口"})
-@RestController
-@RequestMapping("/user")
-@Slf4j
-public class UserController {
-
-    @Autowired
-    private IUserService userService;
-
-    @Autowired
-    private IUserAddressService userAddressService;
-
-    @Autowired
-    private IUserLoginLogService userLoginLogService;
-
-    @Autowired
-    private IOrderService orderService;
-
-    @ApiOperation(value = "玩家列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:user:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserListVO.class)})
-    public ResultVO<IPage<UserListVO>> list(@Validated @RequestBody UserListParam param) {
-        return ResultVO.ok(userService.list(param));
-    }
-
-    @ApiOperation(value = "玩家信息编辑")
-    @PostMapping(value = "/update")
-    @PreAuthorize(permissionKey = "sdk:user:update")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> userUpdate(@Validated @RequestBody UserUpdateParam param) {
-        return ResultVO.ok(userService.userUpdate(param));
-    }
-
-    @ApiOperation(value = "玩家详细信息")
-    @GetMapping(value = "/info")
-    @PreAuthorize(permissionKey = "sdk:user:info")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserVO.class)})
-    public ResultVO<UserVO> getUserInfo(@RequestParam Long id) {
-        return ResultVO.ok(userService.getUserInfo(id));
-    }
-
-    @ApiOperation(value = "玩家登录记录列表")
-    @PostMapping(value = "/login/list")
-    @PreAuthorize(permissionKey = "sdk:user:loginList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserRoleLoginVO.class)})
-    public ResultVO<IPage<UserRoleLoginVO>> loginList(@RequestBody UserLoginLogParam param) {
-        return ResultVO.ok(userLoginLogService.loginList(param));
-    }
-
-    @ApiOperation(value = "玩家下单记录列表")
-    @PostMapping(value = "/order/list")
-    @PreAuthorize(permissionKey = "sdk:user:orderList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserOrderListVO.class)})
-    public ResultVO<IPage<UserOrderListVO>> orderList(@Validated @RequestBody UserOrderListParam param) {
-        return ResultVO.ok(orderService.orderList(param));
-    }
-
-    @ApiOperation(value = "玩家收货地址列表")
-    @GetMapping(value = "/address/list")
-    @PreAuthorize(permissionKey = "sdk:user:addressList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserAddressVO.class, responseContainer = "list")})
-    public ResultVO<List<UserAddressVO>> list(@RequestParam Long userId) {
-        return ResultVO.ok(userAddressService.list(userId));
-    }
-}

+ 0 - 42
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserGameController.java

@@ -1,42 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.GameUserListParam;
-import com.zanxiang.game.manage.domain.vo.GameUserListVO;
-import com.zanxiang.game.manage.service.IGameUserService;
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-03
- * @description : 玩家游戏
- */
-@Api(tags = {"玩家管理接口"})
-@RestController
-@RequestMapping("/user")
-@Slf4j
-public class UserGameController {
-
-    @Autowired
-    private IGameUserService gameUserService;
-
-    @ApiOperation(value = "玩家游戏列表")
-    @PostMapping(value = "/game/list")
-    @PreAuthorize(permissionKey = "sdk:user:gameList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserListVO.class)})
-    public ResultVO<IPage<GameUserListVO>> gameUserList(@Validated @RequestBody GameUserListParam param) {
-        return ResultVO.ok(gameUserService.gameUserList(param));
-    }
-}

+ 0 - 50
game-module/game-manage/src/main/java/com/zanxiang/game/manage/controller/UserRoleController.java

@@ -1,50 +0,0 @@
-package com.zanxiang.game.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.common.domain.ResultVO;
-import com.zanxiang.game.manage.domain.params.GameUserRoleListParam;
-import com.zanxiang.game.manage.domain.vo.GameUserRoleListVO;
-import com.zanxiang.game.manage.domain.vo.GameUserRoleVO;
-import com.zanxiang.game.manage.service.IGameUserRoleService;
-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-11-03
- * @description : 玩家角色
- */
-@Api(tags = {"玩家角色"})
-@RestController
-@RequestMapping("/user")
-@Slf4j
-public class UserRoleController {
-
-    @Autowired
-    private IGameUserRoleService gameUserRoleService;
-
-    @ApiOperation(value = "用户游戏角色")
-    @GetMapping(value = "/game/role/list")
-    @PreAuthorize(permissionKey = "sdk:user:gameRoleList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserRoleVO.class, responseContainer = "list")})
-    public ResultVO<List<GameUserRoleVO>> roleList(@RequestParam Long userId) {
-        return ResultVO.ok(gameUserRoleService.roleList(userId));
-    }
-
-    @ApiOperation(value = "玩家游戏角色列表")
-    @PostMapping(value = "/role/list")
-    @PreAuthorize(permissionKey = "sdk:user:roleList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserRoleListVO.class)})
-    public ResultVO<IPage<GameUserRoleListVO>> roleList(@Validated @RequestBody GameUserRoleListParam param) {
-        return ResultVO.ok(gameUserRoleService.list(param));
-    }
-}

+ 0 - 57
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/CpDTO.java

@@ -1,57 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : cp信息
- */
-@Data
-public class CpDTO {
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * cp名称
-     */
-    private String cpName;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 联系人
-     */
-    private String linkMan;
-
-    /**
-     * 手机号
-     */
-    private String mobile;
-
-    /**
-     * 对接状态
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 渠道
-     */
-    private Long channel;
-
-    /**
-     * 1 删除  0 正常
-     */
-    private Integer isDelete;
-}

+ 0 - 97
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameAppletDTO.java

@@ -1,97 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2023-02-14
- * @description : 游戏小程序信息
- */
-@Data
-public class GameAppletDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 游戏id
-     */
-    private Long gameId;
-
-    /**
-     * 小程序appId
-     */
-    private String appId;
-
-    /**
-     * 小程序原始id
-     */
-    private String ghId;
-
-    /**
-     * 小程序名称
-     */
-    private String appName;
-
-    /**
-     * 小程序密钥
-     */
-    private String appSecret;
-
-    /**
-     * 米大师应用id
-     */
-    private String miPayAppId;
-
-    /**
-     * 米大师应用密钥
-     */
-    private String miPayAppKey;
-
-    /**
-     * 米大师应用沙箱密钥
-     */
-    private String miPayAppKeyDev;
-
-    /**
-     * 消息推送token
-     */
-    private String msgPushToken;
-
-    /**
-     * 消息推送加密密钥
-     */
-    private String msgPushAesKey;
-
-    /**
-     * 公司主体信息
-     */
-    private String company;
-
-    /**
-     * 登录账号
-     */
-    private String account;
-
-    /**
-     * 登录密码
-     */
-    private String password;
-
-    /**
-     * 管理员
-     */
-    private String manager;
-
-    /**
-     * 管理员微信
-     */
-    private String managerVx;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

+ 0 - 44
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameCategoryDTO.java

@@ -1,44 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : 游戏分类
- */
-@Data
-public class GameCategoryDTO {
-
-    /**
-     * 游戏分类ID
-     */
-    private Long id;
-
-    /**
-     * 游戏分类key
-     */
-    private String key;
-
-    /**
-     * 标签名称
-     */
-    private String name;
-
-    /**
-     * 1 删除  0 正常
-     */
-    private Integer isDelete;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

+ 0 - 179
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameDTO.java

@@ -1,179 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-01
- * @description : 游戏信息
- */
-@Data
-public class GameDTO {
-
-    /**
-     * 游戏ID
-     */
-    private Long id;
-
-    /**
-     * CP ID
-     */
-    private Long cpId;
-
-    /**
-     * 游戏名称
-     */
-    private String name;
-
-    /**
-     * appkey
-     */
-    private String appKey;
-
-    /**
-     * 游戏标签
-     */
-    private Long tags;
-
-    /**
-     * 游戏类型
-     */
-    private Long category;
-
-    /**
-     * 游戏分类id, 多个
-     */
-    private String classify;
-
-    /**
-     * 游戏分类父id, 多个
-     */
-    private String classifyParent;
-
-    /**
-     * 网页游戏图标,200*200
-     */
-    private String icon;
-
-    /**
-     * CP回调路径
-     */
-    private String cpPaybackUrl;
-
-    /**
-     * 从属游戏
-     */
-    private Long parentId;
-
-    /**
-     * 包名
-     */
-    private String packageName;
-
-    /**
-     * 上线状态1 接入中, 2 可上线, 3 已下线
-     */
-    private Integer status;
-
-    /**
-     * 1在线游戏 2 单机
-     */
-    private Boolean isOnline;
-
-    /**
-     * 1 不是SDK游戏  2 是SDK游戏
-     */
-    private Boolean isSdk;
-
-    /**
-     * 游戏宣传语
-     */
-    private String publicity;
-
-    /**
-     * 语言
-     */
-    private String language;
-
-    /**
-     * 游戏描述
-     */
-    private String description;
-
-    /**
-     * 游戏宣传图 JSON格式
-     */
-    private String image;
-
-    /**
-     * 苹果应用ID
-     */
-    private String appleId;
-
-    /**
-     * 是否需要实名认证,1:关闭实名认证,2:强制实名认证  3:开启实名认证
-     */
-    private Integer needAuth;
-
-    /**
-     * 扩展 JSON格式
-     */
-    private String extInfo;
-
-    /**
-     * 上线时间
-     */
-    private LocalDateTime onlineTime;
-
-    /**
-     * 1 删除  0 正常
-     */
-    private Integer isDelete;
-
-    /**
-     * 删除时间
-     */
-    private LocalDateTime deleteTime;
-
-    /**
-     * 分成比例
-     */
-    private Double shareScale;
-
-    /**
-     * 关联H5游戏id
-     */
-    private Long h5GameId;
-
-    /**
-     * 导量游戏id
-     */
-    private Long guideGameId;
-
-    /**
-     * 游戏地址
-     */
-    private String gameUrl;
-
-    /**
-     * 游戏版本
-     */
-    private String version;
-
-    /**
-     * 下载次数
-     */
-    private Long downloadCount;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

+ 0 - 85
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GamePayWayDTO.java

@@ -1,85 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2023-02-09
- * @description : 游戏支付方式
- */
-@Data
-public class GamePayWayDTO {
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 游戏id
-     */
-    private Long gameId;
-
-    /**
-     * 支付渠道id
-     */
-    private Long payWayId;
-
-    /**
-     * 支付方式id
-     */
-    private Long payDeviceId;
-
-    /**
-     * 支付名称
-     */
-    private String payName;
-
-    /**
-     * 支付盒子id
-     */
-    private Long payBoxId;
-
-    /**
-     * 应用appId
-     */
-    private String appId;
-
-    /**
-     * 应用名称
-     */
-    private String appName;
-
-    /**
-     * 商户号
-     */
-    private String merchantNo;
-
-    /**
-     * 客服消息卡片图片地址
-     */
-    private String thumbUrl;
-
-    /**
-     * 状态 1 不可用 0 可用
-     */
-    private Integer status;
-
-    /**
-     * 是否已删除 1 已删除 0 正常
-     */
-    private Integer isDelete;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-}

+ 0 - 69
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameTagDTO.java

@@ -1,69 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-16
- * @description : 游戏分类标签
- */
-@Data
-public class GameTagDTO {
-
-    /**
-     * 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;
-}

+ 0 - 115
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/GameUserRoleDTO.java

@@ -1,115 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-05
- * @description : 玩家角色
- */
-@Data
-public class GameUserRoleDTO {
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 玩家用户id
-     */
-    private Long userId;
-
-    /**
-     * 游戏用户id, 对应game_user主键id
-     */
-    private Long gameUserId;
-
-    /**
-     * 游戏ID
-     */
-    private Long gameId;
-
-    /**
-     * 游戏服务器id,默认为0
-     */
-    private String serverId;
-
-    /**
-     * 所在服务器名称
-     */
-    private String serverName;
-
-    /**
-     * 角色id
-     */
-    private String roleId;
-
-    /**
-     * 角色名称
-     */
-    private String roleName;
-
-    /**
-     * 角色等级
-     */
-    private Long roleLevel;
-
-    /**
-     * 角色VIP
-     */
-    private Long roleVipLevel;
-
-    /**
-     * 玩家角色战力
-     */
-    private Long rolePower;
-
-    /**
-     * 平台币余额
-     */
-    private BigDecimal platformCoin;
-
-    /**
-     * 充值金额
-     */
-    private BigDecimal rechargeMoney;
-
-    /**
-     * 充值次数
-     */
-    private Integer rechargeCount;
-
-    /**
-     * 最近充值时间
-     */
-    private LocalDateTime lastRechargeTime;
-
-    /**
-     * 扩展信息
-     */
-    private String ext;
-
-    /**
-     * 操作系统
-     */
-    private String os;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 角色最后登录时间
-     */
-    private LocalDateTime lastLoginTime;
-}

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

@@ -1,93 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-/**
- * 注释游戏应用表
- *
- * @author xufeng
- * @date 2022-06-20 15:16
- */
-@Data
-public class PayApplicationDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 应用appId
-     */
-    private String appId;
-
-    /**
-     * 应用原始id
-     */
-    private String ghId;
-
-    /**
-     * 应用名称
-     */
-    private String appName;
-
-    /**
-     * 类型,1 : 小程序, 2 : 公众号,3 : 支付宝应用
-     */
-    private Integer type;
-
-    /**
-     * 应用密钥
-     */
-    private String appSecret;
-
-    /**
-     * 应用跳转路径
-     */
-    private String path;
-
-    /**
-     * 小程序收款商户
-     */
-    private String merchantNo;
-
-    /**
-     * 应用主体
-     */
-    private String company;
-
-    /**
-     * 登录账号
-     */
-    private String account;
-
-    /**
-     * 登录密码
-     */
-    private String password;
-
-    /**
-     * 管理员
-     */
-    private String manager;
-
-    /**
-     * 管理员微信
-     */
-    private String managerVx;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 应用头像
-     */
-    private String headImg;
-
-    /**
-     * 应用二维码
-     */
-    private String qrCode;
-}

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

@@ -1,47 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 支付盒子
- *
- * @author xufeng
- * @date 2022-06-22 15:26
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class PayBoxDTO {
-
-    /**
-     * 主键id
-     */
-    private Integer id;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 应用id
-     */
-    private String appId;
-
-    /**
-     * 商户号(多个逗号分割)
-     */
-    private String merchantNos;
-
-    /**
-     * 商城小程序类型 1、商城百货 2、商城美妆 3、商城内容
-     */
-    private Integer storeType;
-
-    /**
-     * 描述
-     */
-    private String remark;
-}

+ 0 - 27
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PayDeviceDTO.java

@@ -1,27 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2023-02-09
- * @description : 支付方式
- */
-@Data
-public class PayDeviceDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 支付方式
-     */
-    private String payDeviceKey;
-
-    /**
-     * 名称
-     */
-    private String payDeviceName;
-}

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

@@ -1,121 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 注释游戏支付商户配置表
- *
- * @author xufeng
- * @date 2022-06-16 18:56
- */
-@Data
-public class PayMerchantDTO {
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 商户号
-     */
-    private String merchantNo;
-
-    /**
-     * 商户名称
-     */
-    private String merchantName;
-
-    /**
-     * 支付渠道id
-     */
-    private Long payWayId;
-
-    /**
-     * 支付渠道名称
-     */
-    private String payWayName;
-
-    /**
-     * 商户号登录账号
-     */
-    private String account;
-
-    /**
-     * 商户号登录密码
-     */
-    private String password;
-
-    /**
-     * 管理员
-     */
-    private String manager;
-
-    /**
-     * 绑定手机号
-     */
-    private String mobile;
-
-    /**
-     * 绑定邮箱
-     */
-    private String email;
-
-    /**
-     * 支付配置
-     */
-    private String payConfig;
-
-    /**
-     * 最大支付额度锁 0 正常 1 锁定
-     */
-    private Integer maxPayLock;
-
-    /**
-     * 最大支付额度
-     */
-    private BigDecimal maxPayAmount;
-
-    /**
-     * 总支付金额
-     */
-    private BigDecimal totalPayAmount;
-
-    /**
-     * 月已用支付额度
-     */
-    private BigDecimal mouthPayAmount;
-
-    /**
-     * 月更新日期
-     */
-    private LocalDateTime mouthUpdateDate;
-
-    /**
-     * 周已用额度
-     */
-    private BigDecimal weakerPayAmount;
-
-    /**
-     * 周更新日期
-     */
-    private LocalDateTime weakerUpdateDate;
-
-    /**
-     * 日已用额度
-     */
-    private BigDecimal dayPayAmount;
-
-    /**
-     * 日更新日期
-     */
-    private LocalDateTime dayUpdateDate;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

+ 0 - 27
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PayWayDTO.java

@@ -1,27 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2023-02-09
- * @description : 支付方式
- */
-@Data
-public class PayWayDTO {
-
-    /**
-     * 支付方式
-     */
-    private Long id;
-
-    /**
-     * 支付渠道标识
-     */
-    private String payWayKey;
-
-    /**
-     * 支付渠道名称
-     */
-    private String payWayName;
-}

+ 0 - 72
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PromoAccountDTO.java

@@ -1,72 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : 推广账号
- */
-@Data
-public class PromoAccountDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广账号id
-     */
-    private String account;
-
-    /**
-     * 推广账号名称
-     */
-    private String name;
-
-    /**
-     * 投手项目组
-     */
-    private String pitcherGroupId;
-
-    /**
-     * 投手项目组名称
-     */
-    private String pitcherGroupName;
-
-    /**
-     * 投手id
-     */
-    private String pitcherId;
-
-    /**
-     * 投手名称
-     */
-    private String pitcherName;
-
-    /**
-     * 推广媒体id
-     */
-    private Long mediaId;
-
-    /**
-     * 推广媒体名称
-     */
-    private String mediaName;
-
-    /**
-     * 推广账号类型
-     */
-    private Integer accountType;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-}

+ 0 - 62
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PromoChannelDTO.java

@@ -1,62 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : 推广渠道
- */
-@Data
-public class PromoChannelDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广账号主键id
-     */
-    private Long accountId;
-
-    /**
-     * 推广媒体id
-     */
-    private Long mediaId;
-
-    /**
-     * 推广媒体名称
-     */
-    private String mediaName;
-
-    /**
-     * 服务商
-     */
-    private String provider;
-
-    /**
-     * 游戏id
-     */
-    private Long gameId;
-
-    /**
-     * 二维码
-     */
-    private String code;
-
-    /**
-     * 推广路径
-     */
-    private String path;
-
-    /**
-     * 渠道
-     */
-    private String channel;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-}

+ 0 - 64
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PromoMediaDTO.java

@@ -1,64 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广媒体
- */
-@Data
-public class PromoMediaDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广媒体
-     */
-    private String name;
-
-    /**
-     * 推广媒体类型
-     */
-    private String types;
-
-    /**
-     * 地址
-     */
-    private String address;
-
-    /**
-     * 公司
-     */
-    private String company;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 1:删除,0: 正常
-     */
-    private Integer isDelete;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

+ 0 - 32
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/PromoSiteDTO.java

@@ -1,32 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-24
- * @description : 推广版位位置
- */
-@Data
-public class PromoSiteDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广媒体id
-     */
-    private Long mediaId;
-
-    /**
-     * 媒体版位
-     */
-    private String plateSite;
-
-    /**
-     * 媒体位置
-     */
-    private String mediaSite;
-}

+ 0 - 59
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/UserCardDTO.java

@@ -1,59 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-02
- * @description : 用户实名信息
- */
-@Data
-public class UserCardDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 昵称
-     */
-    private String nickname;
-
-    /**
-     * 注册时间
-     */
-    private LocalDateTime regTime;
-
-    /**
-     * 身份证号
-     */
-    private String cardId;
-
-    /**
-     * 真实姓名
-     */
-    private String cardName;
-
-    /**
-     * 生日
-     */
-    private String birthday;
-
-    /**
-     * 性别, 0 : 未知, 1 : 男, 2 : 女
-     */
-    private Integer sex;
-}

+ 0 - 160
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/UserDTO.java

@@ -1,160 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-09
- * @description : 用户信息
- */
-@Data
-public class UserDTO {
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 所属渠道ID
-     */
-    private Long agentId;
-
-    /**
-     * 注册游戏id
-     */
-    private Long gameId;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 昵称
-     */
-    private String nickname;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 绑定邮箱
-     */
-    private String email;
-
-    /**
-     * 绑定手机号码
-     */
-    private String mobile;
-
-    /**
-     * 绑定支付宝账号
-     */
-    private String aliPay;
-
-    /**
-     * 客户端类型, 1 : 安卓app
-     */
-    private Integer deviceType;
-
-    /**
-     * 用户状态, -1 : 为冻结状态, 0 : 为正常状态
-     */
-    private Integer status;
-
-    /**
-     * 头像
-     */
-    private String avatar;
-
-    /**
-     * 充值次数
-     */
-    private Integer rechargeCount;
-
-    /**
-     * 充值金额
-     */
-    private BigDecimal rechargeMoney;
-
-    /**
-     * 最近充值时间
-     */
-    private LocalDateTime lastRechargeTime;
-
-    /**
-     * 平台币余额
-     */
-    private BigDecimal platformCoin;
-
-    /**
-     * 创角数
-     */
-    private Integer roleCount;
-
-    /**
-     * 是否GS
-     */
-    private Boolean isGs;
-
-    /**
-     * 客服id
-     */
-    private Long customerId;
-
-    /**
-     * 拥有角色最高vip等级
-     */
-    private Integer vipMax;
-
-    /**
-     * 是否实名认证,0未实名认证,1成年人,2未成年人
-     */
-    private Integer authentication;
-
-    /**
-     * 注册时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更改时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 客户端操作系统, android, ios, windows, mac
-     */
-    private String deviceSystem;
-
-    /**
-     * 用户设备mac地址
-     */
-    private String mac;
-
-    /**
-     * 设备唯一编号IMEI
-     */
-    private String imei;
-
-    /**
-     * 安卓id, (仅安卓设备才有值)
-     */
-    private String androidId;
-
-    /**
-     * 用户注册ip
-     */
-    private String ip;
-
-    /**
-     * 广告id
-     */
-    private String adId;
-}

+ 0 - 109
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/dto/UserExtDTO.java

@@ -1,109 +0,0 @@
-package com.zanxiang.game.manage.domain.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-01
- * @description : 玩家拓展信息
- */
-@Data
-public class UserExtDTO {
-
-    /**
-     * user_id
-     */
-    private Long userId;
-
-    /**
-     * 注册IP
-     */
-    private String regIp;
-
-    /**
-     * 注册手机号
-     */
-    private String regMobile;
-
-    /**
-     * 注册邮箱
-     */
-    private String regEmail;
-
-    /**
-     * 注册游戏id
-     */
-    private Long regGameId;
-
-    /**
-     * 注册来源
-     */
-    private String regFrom;
-
-    /**
-     * 是否实名认证
-     */
-    private Boolean isAuth;
-
-    /**
-     * 身份证类型 1、身份证
-     */
-    private Integer identifyType;
-
-    /**
-     * 证件号码
-     */
-    private String idCard;
-
-    /**
-     * 真实姓名
-     */
-    private String realName;
-
-    /**
-     * 生日
-     */
-    private String birthday;
-
-    /**
-     * 性别, 0 : 未知, 1 : 男, 2 : 女
-     */
-    private Integer sex;
-
-    /**
-     * 实名认证平台, 1 国家网络防沉迷
-     */
-    private Integer authPlatform;
-
-    /**
-     * 实名认证时间
-     */
-    private LocalDateTime authTime;
-
-    /**
-     * 中宣部PI
-     */
-    private String zxbPi;
-
-    /**
-     * 上次登录时间
-     */
-    private LocalDateTime lastLoginTime;
-
-    /**
-     * 上次登录ip
-     */
-    private String lastLoginIp;
-
-    /**
-     * 注册时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更改时间
-     */
-    private LocalDateTime updateTime;
-}

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

@@ -1,68 +0,0 @@
-package com.zanxiang.game.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;
-}

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

@@ -1,23 +0,0 @@
-package com.zanxiang.game.manage.domain.params;
-
-import com.zanxiang.game.common.base.BasePage;
-import com.zanxiang.game.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;
-}

+ 0 - 67
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/params/GameAccountUpdateParam.java

@@ -1,67 +0,0 @@
-package com.zanxiang.game.manage.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-08
- * @description : 游戏账号信息配置更新
- */
-@Data
-public class GameAccountUpdateParam {
-
-    /**
-     * 主键id
-     */
-    @ApiModelProperty(notes = "主键id, 不传则是新增, 传则是更新")
-    private Long id;
-
-    /**
-     * 游戏id
-     */
-    @ApiModelProperty(notes = "游戏id")
-    private Long gameId;
-
-    /**
-     * 小程序appId
-     */
-    @ApiModelProperty(notes = "小程序appId")
-    private String appId;
-
-    /**
-     * 小程序原始id
-     */
-    @ApiModelProperty(notes = "小程序原始id")
-    private String ghId;
-
-    /**
-     * 登录账号
-     */
-    @ApiModelProperty(notes = "登录账号")
-    private String account;
-
-    /**
-     * 登录密码
-     */
-    @ApiModelProperty(notes = "登录密码")
-    private String password;
-
-    /**
-     * 管理员微信
-     */
-    @ApiModelProperty(notes = "管理员微信")
-    private String adminVx;
-
-    /**
-     * 公司主体信息
-     */
-    @ApiModelProperty(notes = "公司主体信息")
-    private String company;
-
-    /**
-     * 小程序密钥
-     */
-    @ApiModelProperty(notes = "小程序密钥")
-    private String appSecret;
-}

+ 0 - 84
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/params/GameAddParam.java

@@ -1,84 +0,0 @@
-package com.zanxiang.game.manage.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-07
- * @description : 添加游戏参数
- */
-@Data
-public class GameAddParam {
-
-    /**
-     * 主键id, 传值为更新, 不传值为新增
-     */
-    @ApiModelProperty(notes = "cpId")
-    private Long id;
-
-    /**
-     * cpId
-     */
-    @NotNull(message = "cpId不可为空")
-    @ApiModelProperty(notes = "cpId")
-    private Long cpId;
-
-    /**
-     * 游戏名称
-     */
-    @NotBlank(message = "游戏名称不可为空")
-    @ApiModelProperty(notes = "游戏名称")
-    private String name;
-
-    /**
-     * 是主父游戏
-     */
-    @ApiModelProperty(notes = "是否主游戏")
-    private Boolean isParentGame;
-
-    /**
-     * 分成比例
-     */
-    @NotNull(message = "分成比例不可为空")
-    @ApiModelProperty(notes = "分成比例")
-    private Double shareScale;
-
-    /**
-     * 游戏分类, 多选
-     */
-    @NotEmpty(message = "游戏分类不可为空")
-    @ApiModelProperty(notes = "游戏分类, 可多选, 至少选一个")
-    private List<Long> classifyList;
-
-    /**
-     * 游戏应用类型
-     */
-    @NotNull(message = "游戏应用类型不可为空")
-    @ApiModelProperty(notes = "游戏应用类型")
-    private Long category;
-
-    /**
-     * 父游戏id
-     */
-    @ApiModelProperty(notes = "父游戏id")
-    private Long parentGameId;
-
-    /**
-     * CP回调地址
-     */
-    @ApiModelProperty(notes = "CP回调地址")
-    private String cpPaybackUrl;
-
-    /**
-     * 游戏地址
-     */
-    @ApiModelProperty(notes = "游戏地址")
-    private String gameUrl;
-
-}

+ 0 - 40
game-module/game-manage/src/main/java/com/zanxiang/game/manage/domain/params/GameDockParam.java

@@ -1,40 +0,0 @@
-package com.zanxiang.game.manage.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-08
- * @description : 对接参数
- */
-@Data
-public class GameDockParam {
-
-    /**
-     * 游戏id
-     */
-    @NotNull(message = "游戏id不可为空")
-    @ApiModelProperty(notes = "游戏id")
-    private Long id;
-
-    /**
-     * 游戏appId
-     */
-    @ApiModelProperty(notes = "游戏appId")
-    private String appId;
-
-    /**
-     * 密钥secret
-     */
-    @ApiModelProperty(notes = "密钥secret")
-    private String appSecret;
-
-    /**
-     * 游戏key
-     */
-    @ApiModelProperty(notes = "游戏key")
-    private String appKey;
-}

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.