fix : sdk服务代码整理, 去除累赘的工具类封装

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

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

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/AppletStoreEnum.java

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

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/MaxPayLock.java

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

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

@@ -21,14 +21,13 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功_0003 ( ´･･)ﾉ(._.`) \n" +
-                " ______  __     __     \n" +
-                "/_____/\\/__/\\ /__/\\    \n" +
-                "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +
-                "   /: /  \\_\\::_\\:_\\/   \n" +
-                "  /::/___  _\\/__\\_\\_/\\ \n" +
-                " /_:/____/\\\\ \\ \\ \\::\\ \\\n" +
-                " \\_______\\/ \\_\\/  \\__\\/\n");
+        System.out.println("赞象Manage服务启动成功 ( ´･･)ﾉ(._.`) \n" +
+                "___  ___  ___   _   _   ___  _____  _____ \n" +
+                "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
+                "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +
+                "| |\\/| ||  _  || . ` ||  _  | | __ |  __| \n" +
+                "| |  | || | | || |\\  || | | | |_\\ \\| |___ \n" +
+                "\\_|  |_/\\_| |_/\\_| \\_/\\_| |_/\\____/\\____/ \n");
     }
 
 }

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

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.Cp;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CpListParam extends BasePage<Cp> {
+public class CpListParam extends BaseListDTO<Cp> {
 
     /**
      * cp名称

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.Game;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GameListParam extends BasePage<Game> {
+public class GameListParam extends BaseListDTO<Game> {
 
     /**
      * cp名称对应的id

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePayStrategyListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.GamePayStrategy;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import lombok.Data;
  * @description : 游戏策略查询
  */
 @Data
-public class GamePayStrategyListParam extends BasePage<GamePayStrategy> {
+public class GamePayStrategyListParam extends BaseListDTO<GamePayStrategy> {
 
     /**
      * 策略名称

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePayWayListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.GamePayWay;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import lombok.Data;
  * @description : 游戏支付配置表
  */
 @Data
-public class GamePayWayListParam extends BasePage<GamePayWay> {
+public class GamePayWayListParam extends BaseListDTO<GamePayWay> {
 
     /**
      * 游戏id

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameTagListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.GameTag;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GameTagListParam extends BasePage<GameTag> {
+public class GameTagListParam extends BaseListDTO<GameTag> {
 
     /**
      * 标签名称

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameUserListParam.java

@@ -1,11 +1,13 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zanxiang.game.module.mybatis.entity.GameUser;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 
@@ -17,7 +19,7 @@ import java.time.LocalDate;
 @ApiModel
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GameUserListParam extends BasePage<GameUser> {
+public class GameUserListParam extends BaseListDTO<GameUser> {
 
     /**
      * 玩家id
@@ -114,4 +116,20 @@ public class GameUserListParam extends BasePage<GameUser> {
      */
     @ApiModelProperty(notes = "角色vip, 全部 : null或者不传")
     private Integer vipLevel;
+
+    /**
+     * 开始时间
+     */
+    @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;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameUserRoleListParam.java

@@ -1,11 +1,13 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zanxiang.game.module.mybatis.entity.GameUserRole;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 
@@ -17,7 +19,7 @@ import java.time.LocalDate;
 @ApiModel
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GameUserRoleListParam extends BasePage<GameUserRole> {
+public class GameUserRoleListParam extends BaseListDTO<GameUserRole> {
 
     /**
      * 玩家id
@@ -109,5 +111,19 @@ public class GameUserRoleListParam extends BasePage<GameUserRole> {
     @ApiModelProperty(notes = "最近充值结束时间(注册结束时间请使用endDate参数)")
     private LocalDate rechargeEndDate;
 
+    /**
+     * 开始时间
+     */
+    @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;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/IpBanListParam.java

@@ -1,10 +1,14 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zanxiang.game.module.mybatis.entity.IpBan;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 /**
  * @author : lingfeng
@@ -13,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class IpBanListParam extends BasePage<IpBan> {
+public class IpBanListParam extends BaseListDTO<IpBan> {
 
     /**
      * 查询ip
@@ -26,4 +30,20 @@ public class IpBanListParam extends BasePage<IpBan> {
      */
     @ApiModelProperty(notes = "封禁状态")
     private Integer status;
+
+    /**
+     * 开始时间
+     */
+    @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;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/LogPayCpParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,7 +20,7 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class LogPayCpParam extends BasePage<LogPayCp> {
+public class LogPayCpParam extends BaseListDTO<LogPayCp> {
 
     /**
      * 商户订单号

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/OrderParam.java

@@ -1,8 +1,8 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.Order;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +15,7 @@ import java.time.LocalDate;
  * @description : 订单
  */
 @Data
-public class OrderParam extends BasePage<Order> {
+public class OrderParam extends BaseListDTO<Order> {
 
     @ApiModelProperty(notes = "订单ID：订单号")
     private String orderId;
@@ -89,4 +89,20 @@ public class OrderParam extends BasePage<Order> {
 
     @ApiModelProperty(notes = "广告上报状态")
     private Integer callBackStatus;
+
+    /**
+     * 开始时间
+     */
+    @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;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayApplicationListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PayApplication;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class PayApplicationListParam extends BasePage<PayApplication> {
+public class PayApplicationListParam extends BaseListDTO<PayApplication> {
 
     /**
      * 应用名称

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayBoxListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PayBox;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class PayBoxListParam extends BasePage<PayBox> {
+public class PayBoxListParam extends BaseListDTO<PayBox> {
 
     /**
      * 盒子名称

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

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PayMerchant;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class PayMerchantListParam extends BasePage<PayMerchant> {
+public class PayMerchantListParam extends BaseListDTO<PayMerchant> {
 
     /**
      * 商户号
@@ -37,5 +37,4 @@ public class PayMerchantListParam extends BasePage<PayMerchant> {
      */
     @ApiModelProperty(notes = "状态, 0 : 正常, 1 : 不可用")
     private Integer status;
-
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoAccountListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PromoAccount;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import lombok.Data;
  * @description : 推广账号查询参数
  */
 @Data
-public class PromoAccountListParam extends BasePage<PromoAccount> {
+public class PromoAccountListParam extends BaseListDTO<PromoAccount> {
 
     /**
      * 推广媒体id

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoChannelListParam.java

@@ -1,9 +1,13 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zanxiang.game.module.mybatis.entity.PromoChannel;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 /**
  * @author : lingfeng
@@ -11,7 +15,7 @@ import lombok.Data;
  * @description : 推广列表参数
  */
 @Data
-public class PromoChannelListParam extends BasePage<PromoChannel> {
+public class PromoChannelListParam extends BaseListDTO<PromoChannel> {
 
     /**
      * 推广游戏id
@@ -78,4 +82,20 @@ public class PromoChannelListParam extends BasePage<PromoChannel> {
     @ApiModelProperty(notes = "状态, 0 : 可用, 1: 禁用")
     private Integer status;
 
+    /**
+     * 开始时间
+     */
+    @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;
+
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoMediaListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PromoMedia;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class PromoMediaListParam extends BasePage<PromoMedia> {
+public class PromoMediaListParam extends BaseListDTO<PromoMedia> {
 
     /**
      * 推广媒体

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoSiteListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PromoSite;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class PromoSiteListParam extends BasePage<PromoSite> {
+public class PromoSiteListParam extends BaseListDTO<PromoSite> {
 
     /**
      * 推广媒体id

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserBanListParam.java

@@ -1,8 +1,8 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.UserBan;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,7 +17,7 @@ import java.time.LocalDate;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class UserBanListParam extends BasePage<UserBan> {
+public class UserBanListParam extends BaseListDTO<UserBan> {
 
     /**
      * 玩家id
@@ -52,4 +52,20 @@ public class UserBanListParam extends BasePage<UserBan> {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(notes = "注册结束时间")
     private LocalDate regEndTime;
+
+    /**
+     * 开始时间
+     */
+    @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;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserListParam.java

@@ -1,11 +1,13 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zanxiang.game.module.mybatis.entity.User;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 
@@ -17,7 +19,7 @@ import java.time.LocalDate;
 @ApiModel
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class UserListParam extends BasePage<User> {
+public class UserListParam extends BaseListDTO<User> {
 
     /**
      * 玩家id
@@ -157,5 +159,19 @@ public class UserListParam extends BasePage<User> {
     @ApiModelProperty(notes = "是否切量")
     private Boolean isCutCount;
 
+    /**
+     * 开始时间
+     */
+    @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;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserLoginLogParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.UserLoginLog;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class UserLoginLogParam extends BasePage<UserLoginLog> {
+public class UserLoginLogParam extends BaseListDTO<UserLoginLog> {
 
     /**
      * 用户id

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserNameAuthListParam.java

@@ -1,10 +1,14 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zanxiang.game.module.mybatis.entity.UserCard;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 /**
  * @author : lingfeng
@@ -13,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class UserNameAuthListParam extends BasePage<UserCard> {
+public class UserNameAuthListParam extends BaseListDTO<UserCard> {
 
     /**
      * 玩家id
@@ -38,4 +42,20 @@ public class UserNameAuthListParam extends BasePage<UserCard> {
      */
     @ApiModelProperty(notes = "真实姓名")
     private String realName;
+
+    /**
+     * 开始时间
+     */
+    @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;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserOrderListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.Order;
+import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class UserOrderListParam extends BasePage<Order> {
+public class UserOrderListParam extends BaseListDTO<Order> {
 
     /**
      * 用户id

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -8,6 +8,11 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+/**
+ * @author : lingfeng
+ * @time : 2022-11-25
+ * @description : 启动类
+ */
 @Slf4j
 @EnableDiscoveryClient
 @SpringBootApplication
@@ -18,14 +23,13 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功_0003 ( ´･･)ﾉ(._.`) \n" +
-                " ______  __     __     \n" +
-                "/_____/\\/__/\\ /__/\\    \n" +
-                "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +
-                "   /: /  \\_\\::_\\:_\\/   \n" +
-                "  /::/___  _\\/__\\_\\_/\\ \n" +
-                " /_:/____/\\\\ \\ \\ \\::\\ \\\n" +
-                " \\_______\\/ \\_\\/  \\__\\/\n");
+        System.out.println("赞象SDK服务启动成功 ( ´･･)ﾉ(._.`) \n" +
+                " ___________ _   __\n" +
+                "/  ___|  _  \\ | / /\n" +
+                "\\ `--.| | | | |/ / \n" +
+                " `--. \\ | | |    \\ \n" +
+                "/\\__/ / |/ /| |\\  \\\n" +
+                "\\____/|___/ \\_| \\_/\n");
     }
 
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/util/DateUtils.java

@@ -17,8 +17,8 @@ public class DateUtils extends DateUtil {
     /**
      * 验证当前时间是否为当天
      *
-     * @param time
-     * @return
+     * @param time 时间
+     * @return boolean
      */
     public static boolean isToday(LocalDateTime time) {
         LocalDateTime startTime = LocalDateTime.now().with(LocalTime.MIN);
@@ -30,8 +30,8 @@ public class DateUtils extends DateUtil {
     /**
      * 验证当前时间是否为当月
      *
-     * @param time
-     * @return
+     * @param time 时间
+     * @return boolean
      */
     public static boolean isThisMonth(LocalDateTime time) {
         LocalDate localDate = time.toLocalDate();
@@ -43,8 +43,8 @@ public class DateUtils extends DateUtil {
     /**
      * 验证当前时间是否为本周
      *
-     * @param time
-     * @return
+     * @param time 时间
+     * @return boolean
      */
     public static boolean isThisWeek(LocalDateTime time) {
         LocalDateTime now = LocalDateTime.now();