feat : 实体类构造方法去除

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/enums/AccountStatusEnum.java → game-module/game-common/src/main/java/com/zanxiang/common/enums/AccountStatusEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.enums;
+package com.zanxiang.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.enums;
+package com.zanxiang.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/enums/SmsTypeEnum.java → game-module/game-common/src/main/java/com/zanxiang/common/enums/SmsTypeEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.enums;
+package com.zanxiang.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_channel")
 public class Channel {
 

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_cp")
 public class Cp {
 

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_game")
 public class Game {
 

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_game_category")
 public class GameCategory {
 

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -20,6 +17,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_game_pay_way")
 public class GamePayWay {
 

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_game_server")
 public class GameServer {
 

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -20,6 +17,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_game_user")
 public class GameUser {
 

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_game_version")
 public class GameVersion {
 

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

@@ -3,9 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -19,6 +17,8 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@ToString
+@Builder
 @TableName("h_order")
 public class Order {
 
@@ -41,7 +41,6 @@ public class Order {
     /**
      * 充值用户
      */
-//    @NonNull
     private String userId;
 
     /**
@@ -52,13 +51,11 @@ public class Order {
     /**
      * 游戏ID
      */
-//    @NonNull
     private String gameId;
 
     /**
      * 货物总价
      */
-//    @NonNull
     private BigDecimal amount;
 
     /**
@@ -74,13 +71,11 @@ public class Order {
     /**
      * 游戏商品数量
      */
-//    @NonNull
     private Integer productCnt;
 
     /**
      * 游戏商品名称
      */
-//    @NonNull
     private String productName;
 
     /**

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_pay_way")
 public class PayWay {
 

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

@@ -3,13 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zanxiang.sdk.domain.enums.AccountStatusEnum;
-import com.zanxiang.sdk.domain.params.RegisterMobileParam;
-import com.zanxiang.sdk.domain.params.RegisterPasswordParam;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -22,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_user")
 public class User {
 
@@ -110,38 +105,4 @@ public class User {
      * 更改时间
      */
     private LocalDateTime updateTime;
-
-    /**
-     * 用户名密码注册
-     *
-     * @param param    : 注册参数
-     * @param password : 密码
-     */
-    public User(RegisterPasswordParam param, String password) {
-        this.username = param.getUsername();
-        this.password = password;
-        this.deviceId = param.getDeviceId();
-        this.deviceType = param.getDeviceType();
-        this.status = AccountStatusEnum.NORMAL_STATUS.getStatus();
-        this.createTime = LocalDateTime.now();
-        this.updateTime = this.createTime;
-    }
-
-    /**
-     * 用户手机注册
-     *
-     * @param param    : 注册参数
-     * @param password : 密码
-     */
-    public User(RegisterMobileParam param, String password) {
-        this.username = param.getMobile();
-        this.regMobile = param.getMobile();
-        this.mobile = param.getMobile();
-        this.password = password;
-        this.deviceId = param.getDeviceId();
-        this.deviceType = param.getDeviceType();
-        this.status = AccountStatusEnum.NORMAL_STATUS.getStatus();
-        this.createTime = LocalDateTime.now();
-        this.updateTime = this.createTime;
-    }
 }

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

@@ -2,10 +2,7 @@ package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -18,6 +15,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_user_ext")
 public class UserExt {
 

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_user_login_log")
 public class UserLoginLog {
 
@@ -62,21 +60,4 @@ public class UserLoginLog {
      * 登录时间
      */
     private LocalDateTime loginTime;
-
-    /**
-     * 构造方法
-     *
-     * @param loginIp : 用户ip
-     * @param user    : 用户信息
-     * @param gameId  : 游戏id
-     */
-    public UserLoginLog(String loginIp, User user, String gameId) {
-        this.userId = user.getId();
-        this.agentId = user.getAgentId();
-        this.fromDevice = user.getFromDevice();
-        this.deviceId = user.getDeviceId();
-        this.loginIp = loginIp;
-        this.gameId = gameId;
-        this.loginTime = LocalDateTime.now();
-    }
 }

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

@@ -3,10 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +16,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_user_oauth")
 public class UserOauth {
 

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

@@ -3,12 +3,7 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zanxiang.common.enums.ExpireTimeEnum;
-import com.zanxiang.common.utils.DateUtils;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -22,6 +17,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
+@Builder
 @TableName("h_user_token")
 public class UserToken implements Serializable {
 
@@ -62,31 +58,4 @@ public class UserToken implements Serializable {
      * 更新时间
      */
     private LocalDateTime updateTime;
-
-    /**
-     * 构造方法
-     *
-     * @param userId     : 用户id
-     * @param token      : token签名
-     * @param deviceType : 设备类型
-     */
-    public UserToken(Long userId, String token, String deviceType) {
-        this.userId = userId;
-        this.token = token;
-        this.deviceType = deviceType;
-        this.createTime = LocalDateTime.now();
-        this.updateTime = this.createTime;
-        this.expireTime = DateUtils.localDateTimeToSecond(this.createTime) + ExpireTimeEnum.ONE_WEEK.getTime();
-    }
-
-    /**
-     * 更新用户token
-     *
-     * @param token : 新的token
-     */
-    public void updateToken(String token) {
-        this.token = token;
-        this.updateTime = LocalDateTime.now();
-        this.expireTime = DateUtils.localDateTimeToSecond(this.updateTime) + ExpireTimeEnum.ONE_WEEK.getTime();
-    }
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/entity/WordCheck.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/WordCheck.java

@@ -1,4 +1,4 @@
-package com.zanxiang.sdk.domain.entity;
+package com.zanxiang.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/mapper/WordCheckMapper.java → game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/WordCheckMapper.java

@@ -1,7 +1,7 @@
-package com.zanxiang.sdk.mapper;
+package com.zanxiang.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.sdk.domain.entity.WordCheck;
+import com.zanxiang.mybatis.entity.WordCheck;
 
 /**
  * @author : lingfeng

game-module/game-sdk/src/main/resources/mapper/WordCheckMapper.xml → game-module/game-mybatis/src/main/resources/mapper/WordCheckMapper.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zanxiang.sdk.mapper.WordCheckMapper">
+<mapper namespace="com.zanxiang.mybatis.mapper.WordCheckMapper">
 </mapper>

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

@@ -1,25 +1,8 @@
 package com.zanxiang.sdk.common.util;
 
 import com.zanxiang.sdk.domain.bo.WxPayConfigBO;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContexts;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ResourceUtils;
 
-import javax.net.ssl.SSLContext;
-import java.io.File;
-import java.io.FileInputStream;
-import java.security.KeyStore;
-import java.util.Map;
 import java.util.SortedMap;
-import java.util.TreeMap;
 
 /**
  * 相关配置参数

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/bo/PlatformOrderBO.java

@@ -1,7 +1,6 @@
 package com.zanxiang.sdk.domain.bo;
 
 import lombok.Data;
-import org.springframework.lang.NonNull;
 
 import java.math.BigDecimal;
 import java.util.Date;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/constant/RedisPrefixConst.java

@@ -1,9 +0,0 @@
-package com.zanxiang.sdk.domain.constant;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-07
- * @description : redis缓存key通用前缀
- */
-public class RedisPrefixConst {
-}

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

@@ -2,12 +2,9 @@ package com.zanxiang.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.common.domain.ResultVo;
+import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.sdk.domain.dto.UserDTO;
-import com.zanxiang.sdk.domain.entity.User;
 import com.zanxiang.sdk.domain.params.*;
-import com.zanxiang.mybatis.entity.User;
-import com.zanxiang.sdk.domain.params.LoginMobileParam;
-import com.zanxiang.sdk.domain.params.LoginPasswordParam;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -1,8 +1,8 @@
 package com.zanxiang.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.sdk.domain.dto.UserTokenDTO;
 import com.zanxiang.mybatis.entity.UserToken;
+import com.zanxiang.sdk.domain.dto.UserTokenDTO;
 
 /**
  * @author : lingfeng

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

@@ -1,7 +1,7 @@
 package com.zanxiang.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.sdk.domain.entity.WordCheck;
+import com.zanxiang.mybatis.entity.WordCheck;
 
 /**
  * @author : lingfeng

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

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.enums.OrderStateEnum;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.sdk.domain.bo.PlatformOrderBO;
-import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
 import com.zanxiang.mybatis.entity.Order;
 import com.zanxiang.mybatis.mapper.OrderMapper;
+import com.zanxiang.sdk.domain.bo.PlatformOrderBO;
+import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
 import com.zanxiang.sdk.service.PlatformOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.extension.ParameterResolutionException;

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

@@ -7,7 +7,7 @@ import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.sdk.common.constant.RedisKeyConstant;
 import com.zanxiang.sdk.common.util.RedisUtils;
 import com.zanxiang.sdk.domain.dto.UserDTO;
-import com.zanxiang.sdk.domain.enums.SmsTypeEnum;
+import com.zanxiang.common.enums.SmsTypeEnum;
 import com.zanxiang.sdk.domain.params.SmsSendParam;
 import com.zanxiang.sdk.service.ISmsService;
 import com.zanxiang.sdk.service.IUserService;

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

@@ -8,6 +8,8 @@ import com.zanxiang.sdk.service.IUserLoginLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * @author : lingfeng
  * @time : 2022-06-13
@@ -25,7 +27,16 @@ public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, Use
      */
     @Override
     public void addUserLoginLog(String realIp, User user, String gameId) {
-        UserLoginLog userLoginLog = new UserLoginLog(realIp, user, gameId);
+        //创建对象
+        UserLoginLog userLoginLog = UserLoginLog.builder()
+                .userId(user.getId())
+                .agentId(user.getAgentId())
+                .fromDevice(user.getFromDevice())
+                .deviceId(user.getDeviceId())
+                .loginIp(realIp)
+                .gameId(gameId)
+                .loginTime(LocalDateTime.now())
+                .build();
         super.save(userLoginLog);
     }
 }

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

@@ -10,18 +10,13 @@ import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.utils.IpUtils;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.sdk.domain.dto.UserDTO;
 import com.zanxiang.mybatis.entity.User;
-import com.zanxiang.sdk.domain.enums.AccountStatusEnum;
-import com.zanxiang.sdk.domain.enums.CmfSaltEnum;
+import com.zanxiang.mybatis.mapper.UserMapper;
+import com.zanxiang.sdk.domain.dto.UserDTO;
+import com.zanxiang.common.enums.AccountStatusEnum;
+import com.zanxiang.common.enums.CmfSaltEnum;
 import com.zanxiang.sdk.domain.params.*;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
-import com.zanxiang.mybatis.mapper.UserMapper;
-import com.zanxiang.sdk.service.ISmsService;
-import com.zanxiang.sdk.service.IUserLoginLogService;
-import com.zanxiang.sdk.service.IUserService;
-import com.zanxiang.sdk.service.IUserTokenService;
-import com.zanxiang.sdk.mapper.UserMapper;
 import com.zanxiang.sdk.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -72,7 +67,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return new ResultVo<>(checkRegisterEnum);
         }
         //创建用户信息
-        User user = new User(registerPasswordParam, this.cmfPassword(password));
+        User user = User.builder()
+                .username(registerPasswordParam.getUsername())
+                .password(this.cmfPassword(password))
+                .deviceId(registerPasswordParam.getDeviceId())
+                .deviceType(registerPasswordParam.getDeviceType())
+                .status(AccountStatusEnum.NORMAL_STATUS.getStatus())
+                .createTime(LocalDateTime.now())
+                .updateTime(LocalDateTime.now())
+                .build();
         super.save(user);
         //登录的ip
         String realIp = IpUtils.getRealIp(request);
@@ -113,7 +116,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return new ResultVo<>(passwordCheckEnum);
         }
         //创建用户信息
-        User user = new User(registerMobileParam, this.cmfPassword(password));
+        User user = User.builder()
+                .username(mobile)
+                .regMobile(mobile)
+                .mobile(mobile)
+                .password(this.cmfPassword(password))
+                .deviceId(registerMobileParam.getDeviceId())
+                .deviceType(registerMobileParam.getDeviceType())
+                .status(AccountStatusEnum.NORMAL_STATUS.getStatus())
+                .createTime(LocalDateTime.now())
+                .updateTime(LocalDateTime.now())
+                .build();
         super.save(user);
         //获取token
         String userToken = userTokenService.getUserToken(user.getId(), user.getDeviceType());

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

@@ -6,19 +6,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.enums.ExpireTimeEnum;
 import com.zanxiang.common.exception.BaseException;
-import com.zanxiang.sdk.common.util.RedisUtils;
 import com.zanxiang.common.text.UUID;
+import com.zanxiang.common.utils.DateUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.sdk.common.constant.RedisKeyConstant;
-import com.zanxiang.sdk.domain.dto.UserTokenDTO;
 import com.zanxiang.mybatis.entity.UserToken;
 import com.zanxiang.mybatis.mapper.UserTokenMapper;
+import com.zanxiang.sdk.common.constant.RedisKeyConstant;
+import com.zanxiang.sdk.common.util.RedisUtils;
+import com.zanxiang.sdk.domain.dto.UserTokenDTO;
 import com.zanxiang.sdk.service.IUserTokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.security.NoSuchAlgorithmException;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -112,11 +114,20 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
                 .eq(UserToken::getDeviceType, deviceType));
         //不存在token数据, 直接创建
         if (userToken == null) {
-            userToken = new UserToken(userId, token, deviceType);
+            userToken = UserToken.builder()
+                    .userId(userId)
+                    .token(token)
+                    .deviceType(deviceType)
+                    .createTime(LocalDateTime.now())
+                    .updateTime(LocalDateTime.now())
+                    .expireTime(DateUtils.localDateTimeToSecond(LocalDateTime.now()) + ExpireTimeEnum.ONE_WEEK.getTime())
+                    .build();
             super.save(userToken);
         } else {
-            //梗系数据库
-            userToken.updateToken(token);
+            //更新数据库
+            userToken.setToken(token);
+            userToken.setUpdateTime(LocalDateTime.now());
+            userToken.setExpireTime(DateUtils.localDateTimeToSecond(LocalDateTime.now()) + ExpireTimeEnum.ONE_WEEK.getTime());
             super.updateById(userToken);
         }
         //设置用户缓存

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

@@ -3,8 +3,8 @@ package com.zanxiang.sdk.service.Impl;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.sdk.domain.entity.WordCheck;
-import com.zanxiang.sdk.mapper.WordCheckMapper;
+import com.zanxiang.mybatis.entity.WordCheck;
+import com.zanxiang.mybatis.mapper.WordCheckMapper;
 import com.zanxiang.sdk.service.IWordCheckService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -3,10 +3,10 @@ package com.zanxiang.sdk.service.Impl.pay;
 import com.zanxiang.common.domain.ResultMap;
 import com.zanxiang.common.enums.PayWayEnum;
 import com.zanxiang.common.exception.BaseException;
+import com.zanxiang.mybatis.entity.GamePayWay;
 import com.zanxiang.sdk.domain.bo.ProductPayAttachParamBO;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
-import com.zanxiang.mybatis.entity.GamePayWay;
 import com.zanxiang.sdk.service.GamePayWayService;
 import com.zanxiang.sdk.service.OrderPayService;
 import com.zanxiang.sdk.service.PlatformOrderService;

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

@@ -5,12 +5,12 @@ import com.zanxiang.common.domain.ResultMap;
 import com.zanxiang.common.enums.OrderStateEnum;
 import com.zanxiang.common.enums.ResEnum;
 import com.zanxiang.common.utils.RandomStringUtil;
+import com.zanxiang.mybatis.entity.GamePayWay;
 import com.zanxiang.sdk.common.util.*;
 import com.zanxiang.sdk.domain.bo.PlatformOrderBO;
 import com.zanxiang.sdk.domain.bo.ProductPayAttachParamBO;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
 import com.zanxiang.sdk.domain.bo.WxPayConfigBO;
-import com.zanxiang.mybatis.entity.GamePayWay;
 import com.zanxiang.sdk.service.GamePayWayService;
 import com.zanxiang.sdk.service.OrderPayService;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,9 +1,9 @@
 package com.zanxiang.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.mybatis.entity.Order;
 import com.zanxiang.sdk.domain.bo.PlatformOrderBO;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
-import com.zanxiang.mybatis.entity.Order;
 
 /**
  * 平台订单逻辑开发