Merge remote-tracking branch 'origin/package' into package

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/tencent/pojo/dto/TencentOrderDTO.java

@@ -64,5 +64,13 @@ public class TencentOrderDTO implements Serializable {
      */
     private String wechatAppId;
 
+    /**
+     * 支付状态，0 : 预下单, 1 : 待支付，2 : 支付成功，-1 : 已取消
+     */
+    private Integer orderStatus;
 
+    /**
+     * 支付时间
+     */
+    private LocalDateTime payTime;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/TencnetBackController.java → game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/BackPolicyController.java

@@ -1,6 +1,7 @@
 package com.zanxiang.game.back.serve.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyListDTO;
 import com.zanxiang.game.back.serve.pojo.vo.GameBackPolicyVO;
@@ -15,29 +16,33 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/game/back")
-@Api("腾讯回传")
-public class TencnetBackController {
+@Api("回传策略")
+public class BackPolicyController {
     @Autowired
     private IGameBackPolicyService gameBackPolicyService;
 
+    @PreAuthorize(permissionKey = "gameBack:policy:create")
     @PostMapping("/policy/create")
     @ApiOperation(value = "创建回传策略")
     public ResultVO<Boolean> createPolicy(@RequestBody GameBackPolicyDTO dto) {
         return ResultVO.ok(gameBackPolicyService.createPolicy(dto));
     }
 
+    @PreAuthorize(permissionKey = "gameBack:policy:update")
     @PostMapping("/policy/update")
     @ApiOperation(value = "修改回传策略")
     public ResultVO<Boolean> updatePolicy(@RequestBody GameBackPolicyDTO dto) {
         return ResultVO.ok(gameBackPolicyService.updatePolicy(dto));
     }
 
+    @PreAuthorize(permissionKey = "gameBack:policy:delete")
     @PostMapping("/policy/delete/{ids}")
     @ApiOperation(value = "删除回传策略")
     public ResultVO<Boolean> deletePolicy(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(gameBackPolicyService.deletePolicy(ids));
     }
 
+    @PreAuthorize(permissionKey = "gameBack:policy:list")
     @PostMapping("/policy/list")
     @ApiOperation(value = "回传策略列表")
     public ResultVO<IPage<GameBackPolicyVO>> policyList(@RequestBody GameBackPolicyListDTO dto) {

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentOrder.java

@@ -81,5 +81,13 @@ public class GameTencentOrder implements Serializable {
      */
     private Integer isBack;
 
+    /**
+     * 支付状态，0 : 预下单, 1 : 待支付，2 : 支付成功，-1 : 已取消
+     */
+    private Integer orderStatus;
 
+    /**
+     * 支付时间
+     */
+    private LocalDateTime payTime;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameBackPolicyServiceImpl.java

@@ -2,6 +2,7 @@ package com.zanxiang.game.back.serve.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
 import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAppIdRpcDTO;
 import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionRpcDTO;
@@ -11,17 +12,16 @@ import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.back.base.tencent.pojo.dto.TencentOrderDTO;
 import com.zanxiang.game.back.base.tencent.pojo.dto.TencentUserDTO;
+import com.zanxiang.game.back.serve.dao.mapper.GameBackPolicyMapper;
 import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameBackPolicyListDTO;
 import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
-import com.zanxiang.game.back.serve.dao.mapper.GameBackPolicyMapper;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentBackLog;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentUser;
 import com.zanxiang.game.back.serve.pojo.enums.ActionTypeEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameBackPolicyVO;
 import com.zanxiang.game.back.serve.service.IGameBackPolicyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.back.serve.service.IGameTencentBackLogService;
 import com.zanxiang.game.back.serve.service.IGameTencentOrderService;
 import com.zanxiang.game.back.serve.service.IGameTencentUserService;
@@ -34,10 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Random;
 
 /**
  * <p>
@@ -62,13 +60,20 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
     private IUserActionSetRpc userActionSetRpc;
     @DubboReference(providedBy = ErpServer.SERVER_DUBBO_NAME)
     private ISysUserRpc sysUserRpc;
+    /**
+     * 支付状态，0 : 预下单, 1 : 待支付，2 : 支付成功，-1 : 已取消
+     */
+    private static final Integer COMPLETE_ORDER = 0;
+    private static final Integer PURCHASE = 2;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean tencentOrderBack(TencentOrderDTO dto) {
         GameTencentOrder gameTencentOrder = gameTencentOrderService.getOne(new LambdaQueryWrapper<GameTencentOrder>()
                 .eq(GameTencentOrder::getWechatAppId, dto.getWechatAppId())
-                .eq(GameTencentOrder::getOrderId, dto.getOrderId()));
+                .eq(GameTencentOrder::getOrderId, dto.getOrderId())
+                .eq(GameTencentOrder::getOrderStatus,dto.getOrderStatus()));
+
         //订单保存
         if (null == gameTencentOrder){
             gameTencentOrder = GameTencentOrder.builder()
@@ -80,15 +85,27 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                     .registerTime(dto.getRegisterTime())
                     .wechatAppId(dto.getWechatAppId())
                     .wechatOpenid(dto.getWechatOpenid())
+                    .orderStatus(dto.getOrderStatus())
+                    .payTime(dto.getPayTime())
                     .isBack(0)
                     .build();
             gameTencentOrderService.save(gameTencentOrder);
         }
+        if (!dto.getOrderStatus().equals(COMPLETE_ORDER) && !dto.getOrderStatus().equals(PURCHASE)) {
+            return true;
+        }
+
+        String actionType;
+        if (dto.getOrderStatus().equals(PURCHASE)){
+            actionType = ActionTypeEnum.PURCHASE.getActionType();
+        }else {
+            actionType = ActionTypeEnum.COMPLETE_ORDER.getActionType();
+        }
         DataReportOfAppIdRpcDTO dataReportOfAppIdRpcDTO = DataReportOfAppIdRpcDTO.builder()
                 .appId(dto.getWechatAppId())
                 .action(UserActionRpcDTO.builder()
                         .actionTime(dto.getRechargeTime())
-                        .actionType(ActionTypeEnum.PURCHASE.getActionType())
+                        .actionType(actionType)
                         .userId(UserActionRpcDTO.UserIdRpcDTO.builder()
                                 .wechatAppId(dto.getWechatAppId())
                                 .wechatOpenid(dto.getWechatOpenid())
@@ -99,9 +116,9 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
         GameTencentBackLog gameTencentBackLog = GameTencentBackLog.builder()
                 .gameId(dto.getGameId())
                 .adAccountId(dto.getAdAccountId())
-                .actionTime(dto.getRechargeTime())
+                .actionTime(dto.getOrderStatus().equals(PURCHASE) ? dto.getPayTime() : dto.getRechargeTime())
                 .createTime(LocalDateTime.now())
-                .actionType(ActionTypeEnum.PURCHASE.getActionType())
+                .actionType(actionType)
                 .orderId(dto.getOrderId())
                 .wechatAppId(dto.getWechatAppId())
                 .wechatOpenid(dto.getWechatOpenid())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/utils/BackPolicyUtil.java

@@ -34,7 +34,7 @@ public class BackPolicyUtil {
         // 生成一个0到1之间的随机数
         double randomValue = random.nextDouble();
         // 如果随机数小于成功概率，则返回true，否则返回false
-        return successProbability.compareTo(BigDecimal.valueOf(randomValue)) > 0;
+        return successProbability.compareTo(BigDecimal.valueOf(randomValue)) >= 0;
     }
 
     /**

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/constant/Constants.java

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

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

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

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

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

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/exception/ParamNullException.java

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

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/exception/PreAuthorizeException.java

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

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/handler/GlobalExceptionHandler.java

@@ -1,101 +0,0 @@
-package com.zanxiang.game.module.base.handler;
-
-import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
-import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.exception.CustomException;
-import com.zanxiang.game.module.base.exception.ParamNullException;
-import com.zanxiang.game.module.base.exception.PreAuthorizeException;
-import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.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("没有权限，请联系管理员授权");
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/bean/BeanUtils.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/BeanUtils.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.utils.bean;
+package com.zanxiang.game.module.base.utils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/http/AjaxResult.java

@@ -1,139 +0,0 @@
-package com.zanxiang.game.module.base.utils.http;
-
-import com.zanxiang.game.module.base.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);
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/http/HttpStatus.java

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

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

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

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

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.manage.controller;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
 import com.zanxiang.game.module.base.enums.*;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.vo.*;
 import com.zanxiang.game.module.manage.service.*;
 import io.swagger.annotations.Api;

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

@@ -45,6 +45,7 @@ public class OssController {
 
     @ApiOperation(value = "oss回传接口")
     @PostMapping("/callback")
+    @PreAuthorize(permissionKey = "sdk:oss:callback")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OssUploadCallback.class)})
     public ResultVO<OssUploadCallback> ossCallback(@RequestBody OssUploadDTO dto) {
         return ResultVO.ok(ossService.callback(dto));

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

@@ -1,42 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.UserNameAuthListParam;
-import com.zanxiang.game.module.manage.domain.vo.UserCardVO;
-import com.zanxiang.game.module.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));
-    }
-}

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

@@ -3,15 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.UserListParam;
-import com.zanxiang.game.module.manage.domain.params.UserLoginLogParam;
-import com.zanxiang.game.module.manage.domain.params.UserOrderListParam;
-import com.zanxiang.game.module.manage.domain.params.UserUpdateParam;
+import com.zanxiang.game.module.manage.domain.params.*;
 import com.zanxiang.game.module.manage.domain.vo.*;
-import com.zanxiang.game.module.manage.service.IOrderService;
-import com.zanxiang.game.module.manage.service.IUserAddressService;
-import com.zanxiang.game.module.manage.service.IUserLoginLogService;
-import com.zanxiang.game.module.manage.service.IUserService;
+import com.zanxiang.game.module.manage.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -46,6 +40,15 @@ public class UserController {
     @Autowired
     private IOrderService orderService;
 
+    @Autowired
+    private IGameUserService gameUserService;
+
+    @Autowired
+    private IGameUserRoleService gameUserRoleService;
+
+    @Autowired
+    private IUserCardService userCardService;
+
     @ApiOperation(value = "玩家列表")
     @PostMapping(value = "/list")
     @PreAuthorize(permissionKey = "sdk:user:list")
@@ -93,4 +96,36 @@ public class UserController {
     public ResultVO<List<UserAddressVO>> list(@RequestParam Long userId) {
         return ResultVO.ok(userAddressService.list(userId));
     }
+
+    @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));
+    }
+
+    @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));
+    }
+
+    @ApiOperation(value = "玩家实名认证列表")
+    @PostMapping(value = "/card/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));
+    }
 }

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

@@ -1,42 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GameUserListParam;
-import com.zanxiang.game.module.manage.domain.vo.GameUserListVO;
-import com.zanxiang.game.module.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));
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GameUserRoleListParam;
-import com.zanxiang.game.module.manage.domain.vo.GameUserRoleListVO;
-import com.zanxiang.game.module.manage.domain.vo.GameUserRoleVO;
-import com.zanxiang.game.module.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));
-    }
-}

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

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.exception.BaseException;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.CpDTO;
 import com.zanxiang.game.module.manage.domain.params.CpAddUpdateParam;
 import com.zanxiang.game.module.manage.domain.params.CpListParam;

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

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.GameAppletDTO;
 import com.zanxiang.game.module.manage.domain.dto.GameDTO;
 import com.zanxiang.game.module.manage.domain.params.GameAccountUpdateParam;

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.domain.vo.GameCategoryChoiceVO;
 import com.zanxiang.game.module.manage.service.IGameCategoryService;

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

@@ -8,7 +8,7 @@ import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.GameStrategyTypeEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.domain.dto.GameDTO;
 import com.zanxiang.game.module.manage.domain.dto.PayMerchantDTO;

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

@@ -9,8 +9,8 @@ import com.zanxiang.game.module.base.enums.PayDeviceEnum;
 import com.zanxiang.game.module.base.enums.PayWayEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.*;
 import com.zanxiang.game.module.manage.domain.params.GamePayWayAddUpdateParam;
 import com.zanxiang.game.module.manage.domain.params.GamePayWayListParam;

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.enums.GameCategoryEnum;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.domain.dto.GameDTO;
 import com.zanxiang.game.module.manage.domain.params.GamePictureParam;

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.enums.GameStatusEnum;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.domain.dto.GameDTO;
 import com.zanxiang.game.module.manage.domain.dto.GameTagDTO;

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

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.base.exception.BaseException;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.GameTagDTO;
 import com.zanxiang.game.module.manage.domain.params.GameTagAddUpdateParam;
 import com.zanxiang.game.module.manage.domain.params.GameTagListParam;

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

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.*;
 import com.zanxiang.game.module.manage.domain.params.GameUserRoleListParam;
 import com.zanxiang.game.module.manage.domain.vo.GameUserRoleListVO;

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

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.*;
 import com.zanxiang.game.module.manage.domain.params.GameUserListParam;
 import com.zanxiang.game.module.manage.domain.vo.GameUserListVO;

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

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.base.enums.BanStatusEnum;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.params.IpBanAddParam;
 import com.zanxiang.game.module.manage.domain.params.IpBanListParam;
 import com.zanxiang.game.module.manage.domain.params.IpBanUpdateParam;

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

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.params.LogPayCpParam;
 import com.zanxiang.game.module.manage.domain.vo.LogPayCpVO;
 import com.zanxiang.game.module.manage.service.ILogPayCpService;

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

@@ -13,7 +13,7 @@ import com.zanxiang.advertising.oceanengine.track.base.pojo.vo.AppReportLogRpcVO
 import com.zanxiang.game.module.base.enums.CallBackEnum;
 import com.zanxiang.game.module.base.enums.PayWayEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.*;
 import com.zanxiang.game.module.manage.domain.params.OrderParam;
 import com.zanxiang.game.module.manage.domain.params.UserOrderListParam;

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

@@ -8,7 +8,7 @@ import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.PayApplicationTypeEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.PayApplicationDTO;
 import com.zanxiang.game.module.manage.domain.params.PayApplicationAddUpdateParam;
 import com.zanxiang.game.module.manage.domain.params.PayApplicationListParam;

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

@@ -10,8 +10,8 @@ import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.PayApplicationTypeEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.PayApplicationDTO;
 import com.zanxiang.game.module.manage.domain.dto.PayBoxDTO;
 import com.zanxiang.game.module.manage.domain.dto.PayMerchantDTO;

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

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.PayDeviceDTO;
 import com.zanxiang.game.module.manage.domain.vo.PayDeviceChoiceVO;
 import com.zanxiang.game.module.manage.service.IPayDeviceService;

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

@@ -9,7 +9,7 @@ import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.PayWayEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.PayMerchantDTO;
 import com.zanxiang.game.module.manage.domain.dto.PayWayDTO;
 import com.zanxiang.game.module.manage.domain.params.PayMerchantAddUpdateParam;

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

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.PayWayDTO;
 import com.zanxiang.game.module.manage.domain.vo.PayWayChoiceVO;
 import com.zanxiang.game.module.manage.service.IPayWayService;

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

@@ -10,7 +10,7 @@ import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.PromoAccountTypeEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.PromoAccountDTO;
 import com.zanxiang.game.module.manage.domain.dto.PromoMediaDTO;
 import com.zanxiang.game.module.manage.domain.params.PromoAccountAddUpdateParam;

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

@@ -12,7 +12,7 @@ import com.zanxiang.game.module.base.enums.PromoAccountTypeEnum;
 import com.zanxiang.game.module.base.enums.PromoProviderEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.text.UUID;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.*;
 import com.zanxiang.game.module.manage.domain.params.PromoChannelAddUpdateParam;
 import com.zanxiang.game.module.manage.domain.params.PromoChannelListParam;

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

@@ -10,7 +10,7 @@ import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.PromoMediaTypeEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.PromoMediaDTO;
 import com.zanxiang.game.module.manage.domain.params.PromoMediaAddUpdateParam;
 import com.zanxiang.game.module.manage.domain.params.PromoMediaListParam;

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.PromoMediaDTO;
 import com.zanxiang.game.module.manage.domain.dto.PromoSiteDTO;
 import com.zanxiang.game.module.manage.domain.params.PromoSiteAddOrUpdateParam;

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

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.vo.UserAddressVO;
 import com.zanxiang.game.module.manage.service.IUserAddressService;
 import com.zanxiang.game.module.mybatis.entity.UserAddress;

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

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.base.enums.BanStatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.UserDTO;
 import com.zanxiang.game.module.manage.domain.params.UserBanListParam;
 import com.zanxiang.game.module.manage.domain.params.UserBanUpdateParam;

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

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.domain.dto.GameDTO;
 import com.zanxiang.game.module.manage.domain.dto.GameUserRoleDTO;

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

@@ -7,11 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.constant.Constants;
 import com.zanxiang.game.module.base.exception.BaseException;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.MD5Util;
 import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.manage.domain.dto.*;
 import com.zanxiang.game.module.manage.domain.params.UserListParam;
 import com.zanxiang.game.module.manage.domain.params.UserUpdateParam;
@@ -192,8 +191,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     private String cmfPassword(String password) {
         String passwordSalt = password + "ZX_PASSWORD_SALT";
-        String charsetName = Constants.UTF8;
-        return "###" + MD5Util.MD5Encode(MD5Util.MD5Encode(passwordSalt, charsetName), charsetName);
+        return "###" + MD5Util.MD5Encode(MD5Util.MD5Encode(passwordSalt, "UTF-8"), "UTF-8");
     }
 
     @Override

game-module/game-module-manage/src/main/resources/META-INF/spring.factories

@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.zanxiang.game.module.base.handler.GlobalExceptionHandler

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

@@ -18,7 +18,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功opQ ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功_0002 ( ´･･)ﾉ(._.`) \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

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

@@ -45,7 +45,8 @@ public class LoginController {
     @ApiOperation(value = "CP登录凭证验证")
     @GetMapping("/token/check")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Long.class)})
-    public ResultVO userTokenCheck(@RequestParam String appId, @RequestParam Long userId, @RequestParam String token, @RequestParam String sign) {
+    public ResultVO userTokenCheck(@RequestParam String appId, @RequestParam Long userId, @RequestParam String token,
+                                   @RequestParam String sign) {
         return userTokenService.cpTokenCheck(appId, userId, token, sign);
     }
 

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/BaseHttpSSLSocketFactory.java → game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/factory/BaseHttpSSLSocketFactory.java

@@ -12,7 +12,7 @@
  * xshu       2014-05-28     SSLSocket 链接工具类(用于https)
  * =============================================================================
  */
-package com.zanxiang.game.module.base.utils;
+package com.zanxiang.game.module.sdk.factory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,13 +92,16 @@ public class BaseHttpSSLSocketFactory extends SSLSocketFactory {
         public MyX509TrustManager() {
         }
 
+        @Override
         public X509Certificate[] getAcceptedIssuers() {
             return null;
         }
 
+        @Override
         public void checkClientTrusted(X509Certificate[] chain, String authType) {
         }
 
+        @Override
         public void checkServerTrusted(X509Certificate[] chain, String authType) {
         }
     }
@@ -107,6 +110,7 @@ public class BaseHttpSSLSocketFactory extends SSLSocketFactory {
      * 解决由于服务器证书问题导致HTTPS无法访问的情况 PS:HTTPS hostname wrong: should be <localhost>
      */
     public static class TrustAnyHostnameVerifier implements HostnameVerifier {
+        @Override
         public boolean verify(String hostname, SSLSession session) {
             // 直接返回true
             return true;

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.StatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.mybatis.entity.GamePayWay;
 import com.zanxiang.game.module.mybatis.mapper.GamePayWayMapper;
 import com.zanxiang.game.module.sdk.domain.dto.GamePayWayDTO;

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

@@ -26,7 +26,6 @@ import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -85,24 +84,9 @@ public class LoginServiceImpl implements IRegisterLoginService {
     @Autowired
     private IUserShareService userShareService;
 
-    /**
-     * QQ开发者应用id
-     */
-    @Value("${auth.qq-appId}")
-    private String qqAppId;
-
-    /**
-     * 微信开发者应用id
-     */
-    @Value("${auth.vx-appId}")
-    private String vxAppId;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResultVO<UserLoginVO> loginWxCode(LoginVxCodeParam param, UserData userData) {
-
-        log.error("小程序登录, param : {}, userData : {}", JsonUtil.toString(param), JsonUtil.toString(userData));
-
         //验证登录ip是否封禁
         if (ipBanService.checkIpBan(userData.getIp())) {
             return ResultVO.fail(HttpStatusEnum.IP_HALT.getMsg());
@@ -110,10 +94,14 @@ public class LoginServiceImpl implements IRegisterLoginService {
         //查询微信小游戏信息
         GameAppletDTO gameAppletDTO = gameAppletService.getByGameId(userData.getGameId());
         //获取用户微信小游戏的openId
-        Map<String, String> resultMap = wxApiService.getAppletOpenId(param.getCode(), gameAppletDTO.getAppId(), gameAppletDTO.getAppSecret());
+        Map<String, String> resultMap = wxApiService.getAppletOpenId(param.getCode(), gameAppletDTO.getAppId(),
+                gameAppletDTO.getAppSecret());
         String openId = resultMap.get("openid");
         String sessionKey = resultMap.get("session_key");
-        log.error("登录用户 resultMap : {}", JsonUtil.toString(resultMap));
+
+        log.error("登录用户, param : {}, userData : {}, resultMap : {}", JsonUtil.toString(param),
+                JsonUtil.toString(userData), JsonUtil.toString(resultMap));
+
         //根据openId查询用户
         User user = userService.getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getGameId, userData.getGameId()).eq(User::getOpenId, openId));
@@ -141,37 +129,26 @@ public class LoginServiceImpl implements IRegisterLoginService {
             fromUserId = userDTO.getId();
         }
         //构造用户信息
-        user = User.builder()
-                .agentId(agentId)
-                .gameId(userData.getGameId())
-                .username(openId)
-                .nickname(RegisterUtil.randomNickName(openId))
-                .openId(openId)
-                .sessionKey(sessionKey)
-                .deviceType(userData.getDeviceType())
-                .status(BanStatusEnum.NORMAL_STATUS.getStatus())
-                .authentication(0)
-                .createTime(LocalDateTime.now())
-                .updateTime(LocalDateTime.now())
-                .deviceSystem(userData.getDeviceSystem())
-                .mac(userData.getMac())
-                .imei(userData.getImei())
-                .androidId(userData.getAndroidId())
-                .ip(userData.getIp())
-                .build();
+        user = transform(userData, agentId, openId);
+        user.setOpenId(openId);
+        user.setSessionKey(sessionKey);
+        //创建用户信息
         userService.save(user);
         gameUserService.createGameUser(user);
         callBackService.userCallBack(user);
-        if (fromUserId != null) {
-            UserShare userShare = UserShare.builder()
-                    .gameId(userData.getGameId())
-                    .fromUserId(fromUserId)
-                    .toUserId(user.getId())
-                    .createTime(LocalDateTime.now())
-                    .updateTime(LocalDateTime.now())
-                    .build();
-            userShareService.save(userShare);
+        //返回登录信息
+        if (fromUserId == null) {
+            return ResultVO.ok(this.createUserLoginVO(user, userData));
         }
+        //记录分享信息
+        UserShare userShare = UserShare.builder()
+                .gameId(userData.getGameId())
+                .fromUserId(fromUserId)
+                .toUserId(user.getId())
+                .createTime(LocalDateTime.now())
+                .updateTime(LocalDateTime.now())
+                .build();
+        userShareService.save(userShare);
         //返回登录信息
         return ResultVO.ok(this.createUserLoginVO(user, userData));
     }
@@ -217,30 +194,15 @@ public class LoginServiceImpl implements IRegisterLoginService {
                 return ResultVO.fail(checkRegisterEnum.getMsg());
             }
             //创建用户信息
-            user = User.builder()
-                    .agentId(promoChannelService.getAgentIdByChannel(userData.getChannel()))
-                    .gameId(userData.getGameId())
-                    .username(username)
-                    .nickname(RegisterUtil.randomNickName(username))
-                    .password(RegisterUtil.cmfPassword(password))
-                    .deviceType(userData.getDeviceType())
-                    .status(BanStatusEnum.NORMAL_STATUS.getStatus())
-                    .authentication(0)
-                    .createTime(LocalDateTime.now())
-                    .updateTime(LocalDateTime.now())
-                    .deviceSystem(userData.getDeviceSystem())
-                    .mac(userData.getMac())
-                    .imei(userData.getImei())
-                    .androidId(userData.getAndroidId())
-                    .ip(userData.getIp())
-                    .build();
+            Long agentId = promoChannelService.getAgentIdByChannel(userData.getChannel());
+            user = transform(userData, agentId, username);
+            user.setPassword(password);
             userService.save(user);
             gameUserService.createGameUser(user);
             callBackService.userCallBack(user);
         }
         //返回登录信息
         return ResultVO.ok(this.createUserLoginVO(user, userData));
-
     }
 
     @Override
@@ -262,23 +224,9 @@ public class LoginServiceImpl implements IRegisterLoginService {
                 .eq(User::getGameId, userData.getGameId()).eq(User::getMobile, mobile));
         //用户信息不存在, 直接注册
         if (user == null) {
-            user = User.builder()
-                    .agentId(promoChannelService.getAgentIdByChannel(userData.getChannel()))
-                    .gameId(userData.getGameId())
-                    .username(mobile)
-                    .nickname(RegisterUtil.randomNickName(mobile))
-                    .mobile(mobile)
-                    .deviceType(userData.getDeviceType())
-                    .status(BanStatusEnum.NORMAL_STATUS.getStatus())
-                    .authentication(0)
-                    .createTime(LocalDateTime.now())
-                    .updateTime(LocalDateTime.now())
-                    .deviceSystem(userData.getDeviceSystem())
-                    .mac(userData.getMac())
-                    .imei(userData.getImei())
-                    .androidId(userData.getAndroidId())
-                    .ip(userData.getIp())
-                    .build();
+            Long agentId = promoChannelService.getAgentIdByChannel(userData.getChannel());
+            user = transform(userData, agentId, mobile);
+            user.setMobile(mobile);
             userService.save(user);
             gameUserService.createGameUser(user);
             callBackService.userCallBack(user);
@@ -290,7 +238,6 @@ public class LoginServiceImpl implements IRegisterLoginService {
         }
         //返回登录信息
         return ResultVO.ok(this.createUserLoginVO(user, userData));
-
     }
 
     private UserLoginVO createUserLoginVO(User user, UserData userData) {
@@ -352,4 +299,24 @@ public class LoginServiceImpl implements IRegisterLoginService {
         //密码验证
         return RegisterUtil.checkPassword(password);
     }
+
+    private User transform(UserData userData, Long agentId, String userName) {
+        //构造用户信息
+        return User.builder()
+                .agentId(agentId)
+                .gameId(userData.getGameId())
+                .username(userName)
+                .nickname(RegisterUtil.randomNickName(userName))
+                .deviceType(userData.getDeviceType())
+                .status(BanStatusEnum.NORMAL_STATUS.getStatus())
+                .authentication(0)
+                .createTime(LocalDateTime.now())
+                .updateTime(LocalDateTime.now())
+                .deviceSystem(userData.getDeviceSystem())
+                .mac(userData.getMac())
+                .imei(userData.getImei())
+                .androidId(userData.getAndroidId())
+                .ip(userData.getIp())
+                .build();
+    }
 }

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

@@ -5,7 +5,6 @@ import com.zanxiang.game.module.base.enums.DeviceTypeEnum;
 import com.zanxiang.game.module.base.enums.OrderStateEnum;
 import com.zanxiang.game.module.base.enums.PayDeviceEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.SpringUtils;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.mybatis.entity.OrderPayParam;
 import com.zanxiang.game.module.sdk.domain.bo.ProductPayParamBO;
@@ -17,6 +16,7 @@ import com.zanxiang.game.module.sdk.domain.vo.PayParamVO;
 import com.zanxiang.game.module.sdk.enums.PayTypeEnum;
 import com.zanxiang.game.module.sdk.service.*;
 import com.zanxiang.game.module.sdk.service.pay.PayBaseService;
+import com.zanxiang.game.module.sdk.util.SpringUtils;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.web.util.IpUtil;
 import lombok.extern.slf4j.Slf4j;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.enums.CallBackEnum;
 import com.zanxiang.game.module.base.enums.OrderStateEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.mybatis.mapper.OrderMapper;
 import com.zanxiang.game.module.sdk.domain.dto.GamePayWayDTO;

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

@@ -2,7 +2,6 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.constant.Constants;
 import com.zanxiang.game.module.base.enums.HttpStatusEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
 import com.zanxiang.game.module.mybatis.entity.PayApplication;
@@ -72,6 +71,8 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
 
     private static final String SIGN_TYPE = "MD5";
 
+    private static final String SUCCESS = "success";
+
     @Value("${payConfig.wxPay.appletNotifyUrl}")
     private String notifyUrl;
 
@@ -254,7 +255,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
             String result = HttpUtil.postData(WxPayConstants.UNIFIED_ORDER_URL, XmlUtil.mapToXml(paramData));
             Map<String, String> successMap = XmlUtil.xmlToMap(result);
             //成功, 返回结果
-            if (Constants.SUCCESS.equalsIgnoreCase(successMap.get("return_code"))
+            if (SUCCESS.equalsIgnoreCase(successMap.get("return_code"))
                     && successMap.get("return_code").equals(successMap.get("result_code"))) {
                 return successMap;
             }
@@ -313,7 +314,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
             // 返回状态码
             String returnCode = successMap.get("return_code");
             //成功, 返回结果
-            if (Constants.SUCCESS.equalsIgnoreCase(returnCode) && returnCode.equals(resultCode)) {
+            if (SUCCESS.equalsIgnoreCase(returnCode) && returnCode.equals(resultCode)) {
                 log.error("微信支付关闭订单成功, out_trade_no：{}", paramMap.get("out_trade_no"));
                 return;
             }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.mybatis.entity.PayMerchant;
 import com.zanxiang.game.module.mybatis.mapper.PayMerchantMapper;
 import com.zanxiang.game.module.sdk.domain.dto.PayMerchantDTO;

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zanxiang.game.module.base.enums.CpStatusEnum;
 import com.zanxiang.game.module.base.enums.OrderStateEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.DateUtils;
 import com.zanxiang.game.module.base.utils.StringUtils;
 import com.zanxiang.game.module.base.utils.URIUtil;
 import com.zanxiang.game.module.mybatis.entity.*;
@@ -14,6 +13,7 @@ import com.zanxiang.game.module.sdk.domain.dto.PayMerchantDTO;
 import com.zanxiang.game.module.sdk.domain.dto.PlatformOrderDTO;
 import com.zanxiang.game.module.sdk.domain.result.PushCpResult;
 import com.zanxiang.game.module.sdk.service.*;
+import com.zanxiang.game.module.sdk.util.DateUtils;
 import com.zanxiang.game.module.sdk.util.SignUtil;
 import com.zanxiang.module.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.enums.HttpStatusEnum;
 import com.zanxiang.game.module.base.enums.SmsTypeEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserCard;

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

@@ -2,14 +2,12 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.constant.Constants;
 import com.zanxiang.game.module.base.enums.BanStatusEnum;
 import com.zanxiang.game.module.base.enums.ExpireTimeEnum;
 import com.zanxiang.game.module.base.exception.BaseException;
 import com.zanxiang.game.module.base.text.UUID;
-import com.zanxiang.game.module.base.utils.DateUtils;
+import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.base.utils.MD5Util;
-import com.zanxiang.game.module.base.utils.bean.BeanUtils;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserToken;
@@ -22,6 +20,7 @@ import com.zanxiang.game.module.sdk.service.IGameExtService;
 import com.zanxiang.game.module.sdk.service.IIpBanService;
 import com.zanxiang.game.module.sdk.service.IUserService;
 import com.zanxiang.game.module.sdk.service.IUserTokenService;
+import com.zanxiang.game.module.sdk.util.DateUtils;
 import com.zanxiang.game.module.sdk.util.RedisUtil;
 import com.zanxiang.game.module.sdk.util.SignUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -198,9 +197,8 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
     private String createToken(Long userId, Integer deviceType) {
         //生成随机数
         String random = userId + deviceType + UUID.randomUUID().toString() + System.currentTimeMillis();
-        String charsetName = Constants.UTF8;
         //创建token
-        return MD5Util.MD5Encode(MD5Util.MD5Encode(random, charsetName), charsetName);
+        return MD5Util.MD5Encode(MD5Util.MD5Encode(random, "UTF-8"), "UTF-8");
     }
 
     private String getUserTokenKey(Long userId, Integer deviceType) {

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

@@ -8,7 +8,6 @@ import com.alipay.easysdk.payment.common.models.AlipayTradeQueryResponse;
 import com.alipay.easysdk.payment.page.models.AlipayTradePagePayResponse;
 import com.alipay.easysdk.payment.wap.models.AlipayTradeWapPayResponse;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.zanxiang.game.module.base.constant.Constants;
 import com.zanxiang.game.module.base.enums.HttpStatusEnum;
 import com.zanxiang.game.module.base.enums.OrderStateEnum;
 import com.zanxiang.game.module.base.enums.OsEnum;
@@ -64,6 +63,11 @@ public class AliPayService extends PayBaseService {
      */
     private static final String TRADE_STATUS_CLOSED = "TRADE_CLOSED";
 
+    /**
+     * UTF-8 字符集
+     */
+    private static final String UTF8 = "UTF-8";
+
     /**
      * 订单超时自动关闭时间
      */
@@ -258,8 +262,8 @@ public class AliPayService extends PayBaseService {
         String deepLinkAndroid = "alipays://platformapi/startApp?appId=20000125&orderSuffix=";
         String deepLinkIos = "alipay://alipayclient/?";
         Map<String, String> deepLinkParamMap = this.deepLinkParamMap(mobileClientUrl);
-        deepLinkAndroid += URIUtil.encodeURIComponent(deepLinkParamMap.get("dataString"), Constants.UTF8);
-        deepLinkIos += URIUtil.encodeURIComponent(JsonUtil.toString(deepLinkParamMap), Constants.UTF8);
+        deepLinkAndroid += URIUtil.encodeURIComponent(deepLinkParamMap.get("dataString"), UTF8);
+        deepLinkIos += URIUtil.encodeURIComponent(JsonUtil.toString(deepLinkParamMap), UTF8);
         return Objects.equals(deviceSystem, OsEnum.SYSTEM_ANDROID.getOs()) ? deepLinkAndroid : deepLinkIos;
     }
 

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

@@ -1,7 +1,6 @@
 package com.zanxiang.game.module.sdk.service.pay;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.zanxiang.game.module.base.constant.Constants;
 import com.zanxiang.game.module.base.enums.DeleteEnum;
 import com.zanxiang.game.module.base.enums.HttpStatusEnum;
 import com.zanxiang.game.module.base.enums.OrderStateEnum;
@@ -66,6 +65,11 @@ public class WxPayService extends PayBaseService {
      */
     private static final String WX_PAY_JSAPI = "JSAPI";
 
+    /**
+     * 成功
+     */
+    private static final String SUCCESS = "success";
+
     /**
      * 服务器域名
      */
@@ -164,7 +168,7 @@ public class WxPayService extends PayBaseService {
         log.info("微信支付成功回调");
         // 处理业务开始
         Map<String, String> xmlMap = new HashMap<>();
-        if (Constants.SUCCESS.equalsIgnoreCase(packageParams.get("result_code"))) {
+        if (SUCCESS.equalsIgnoreCase(packageParams.get("result_code"))) {
             String orderNo = packageParams.get("out_trade_no");
             String totalFee = String.valueOf(Float.parseFloat(packageParams.get("total_fee")) / 100);
             log.info("微信订单号回调成功, orderId : {}", orderNo);
@@ -297,7 +301,7 @@ public class WxPayService extends PayBaseService {
             // 结果状态码
             String resultCode = successMap.get("result_code");
             //成功, 返回结果
-            if (Constants.SUCCESS.equalsIgnoreCase(returnCode) && returnCode.equals(resultCode)) {
+            if (SUCCESS.equalsIgnoreCase(returnCode) && returnCode.equals(resultCode)) {
                 return;
             }
             log.error("微信支付关闭订单失败, paramData：{}, successMap : {}", JsonUtil.toString(paramData), JsonUtil.toString(successMap));
@@ -336,7 +340,7 @@ public class WxPayService extends PayBaseService {
             // 结果状态码
             String resultCode = successMap.get("result_code");
             //成功, 返回结果
-            if (Constants.SUCCESS.equalsIgnoreCase(returnCode) && returnCode.equals(resultCode)) {
+            if (SUCCESS.equalsIgnoreCase(returnCode) && returnCode.equals(resultCode)) {
                 return successMap;
             }
             //下单失败

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/task/OrderExpireTask.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zanxiang.game.module.base.enums.ExpireTimeEnum;
 import com.zanxiang.game.module.base.enums.OrderStateEnum;
-import com.zanxiang.game.module.base.utils.SpringUtils;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.sdk.constant.RedisKeyConstant;
 import com.zanxiang.game.module.sdk.domain.dto.PlatformOrderDTO;
@@ -13,6 +12,7 @@ import com.zanxiang.game.module.sdk.service.IOrderService;
 import com.zanxiang.game.module.sdk.service.IPayApplicationService;
 import com.zanxiang.game.module.sdk.service.pay.PayBaseService;
 import com.zanxiang.game.module.sdk.util.RedisUtil;
+import com.zanxiang.game.module.sdk.util.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;

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

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.utils;
+package com.zanxiang.game.module.sdk.util;
 
 import com.zanxiang.module.util.DateUtil;
 

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

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.sdk.util;
 
-import com.zanxiang.game.module.base.utils.BaseHttpSSLSocketFactory;
+import com.zanxiang.game.module.sdk.factory.BaseHttpSSLSocketFactory;
 
 import javax.net.ssl.*;
 import java.io.BufferedReader;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/SpringUtils.java → game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/util/SpringUtils.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.utils;
+package com.zanxiang.game.module.sdk.util;
 
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;

game-module/game-module-sdk/src/main/resources/META-INF/spring.factories

@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.zanxiang.game.module.base.handler.GlobalExceptionHandler,\
-  com.zanxiang.game.module.base.utils.SpringUtils,\
-  com.zanxiang.game.module.sdk.listener.OrderPaySuccessListener