Browse Source

feat : 代码规整, 规范统一

bilingfeng 2 năm trước cách đây
mục cha
commit
95e5d15caa
29 tập tin đã thay đổi với 101 bổ sung96 xóa
  1. 4 0
      game-module/game-common/src/main/java/com/zanxiang/common/domain/ResultVo.java
  2. 3 3
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/resolver/TokenArgumentResolver.java
  3. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/RedisUtil.java
  4. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/RegisterUtil.java
  5. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/ZxingUtil.java
  6. 2 4
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/OrderController.java
  7. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/PayController.java
  8. 2 2
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/RegisterLoginController.java
  9. 2 2
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/SmsController.java
  10. 4 5
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/UserController.java
  11. 22 22
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/RegisterLoginServiceImpl.java
  12. 13 12
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/SmsServiceImpl.java
  13. 3 2
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserLoginLogServiceImpl.java
  14. 2 2
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserOauthServiceImpl.java
  15. 7 7
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserServiceImpl.java
  16. 14 14
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserTokenServiceImpl.java
  17. 2 2
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/WordCheckServiceImpl.java
  18. 2 2
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/auth/QqApiServiceImpl.java
  19. 2 2
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/auth/VxApiServiceImpl.java
  20. 2 2
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/pay/WxpayServiceImpl.java
  21. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/QqApiService.java
  22. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/RegisterLoginService.java
  23. 2 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/SmsService.java
  24. 2 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserLoginLogService.java
  25. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserOauthService.java
  26. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserService.java
  27. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserTokenService.java
  28. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/VxApiService.java
  29. 1 1
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/WordCheckService.java

+ 4 - 0
game-module/game-common/src/main/java/com/zanxiang/common/domain/ResultVo.java

@@ -92,4 +92,8 @@ public class ResultVo<T> implements Serializable {
     public static <T> ResultVo<T> fail(String msg) {
         return new ResultVo<>(HttpStatusEnum.FAIL.getCode(), msg);
     }
+
+    public static <T> ResultVo<T> ok() {
+        return new ResultVo<>(HttpStatusEnum.SUCCESS.getCode(), HttpStatusEnum.SUCCESS.getMsg());
+    }
 }

+ 3 - 3
game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/resolver/TokenArgumentResolver.java

@@ -8,7 +8,7 @@ import com.zanxiang.sdk.common.annotation.ValidLogin;
 import com.zanxiang.sdk.common.util.DeviceCheckUtil;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;
 import com.zanxiang.sdk.domain.params.UserData;
-import com.zanxiang.sdk.service.IUserTokenService;
+import com.zanxiang.sdk.service.UserTokenService;
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRequest;
 public class TokenArgumentResolver implements HandlerMethodArgumentResolver {
 
     @Resource
-    private IUserTokenService iUserTokenService;
+    private UserTokenService userTokenService;
 
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
@@ -56,7 +56,7 @@ public class TokenArgumentResolver implements HandlerMethodArgumentResolver {
         if (StringUtils.isEmpty(token)) {
             return data;
         }
-        UserTokenDTO tokenInfoByTokenDevice = iUserTokenService.getTokenInfoByTokenDevice(token, deviceType.toString());
+        UserTokenDTO tokenInfoByTokenDevice = userTokenService.getTokenInfoByTokenDevice(token, deviceType.toString());
         if (tokenInfoByTokenDevice == null) {
             return data;
         }

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/RedisUtils.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/RedisUtil.java

@@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Component
 @Slf4j
-public class RedisUtils<T> {
+public class RedisUtil<T> {
 
     @Autowired
     private RedisTemplate redisTemplate;

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/RegisterUtils.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/RegisterUtil.java

@@ -12,7 +12,7 @@ import java.security.NoSuchAlgorithmException;
  * @time : 2022-06-22
  * @description : 用户注册工具类
  */
-public class RegisterUtils {
+public class RegisterUtil {
 
     /**
      * 密码加密盐值

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/ZxingUtils.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/ZxingUtil.java

@@ -15,7 +15,7 @@ import java.util.HashMap;
 /**
  * 二维码
  */
-public class ZxingUtils {
+public class ZxingUtil {
 
     static final String FORMAT = "png";
 

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

@@ -8,16 +8,14 @@ import com.zanxiang.sdk.service.PlatformOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author xufeng
  * @date 2022/6/17 17:07
  */
 @Api(tags = "支付公共入口")
+@CrossOrigin
 @RestController
 @RequestMapping(value = "/order")
 public class OrderController {

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/PayController.java

@@ -8,7 +8,6 @@ import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.sdk.common.annotation.ValidLogin;
 import com.zanxiang.sdk.domain.bo.PlatformOrderBO;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
-import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
 import com.zanxiang.sdk.domain.params.ProductPayParam;
 import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.service.Impl.pay.PayService;
@@ -34,6 +33,7 @@ import java.util.Objects;
  * @date 2022/6/8 14:49
  */
 @Api(tags = "支付公共入口")
+@CrossOrigin
 @RestController
 @RequestMapping(value = "/pay")
 public class PayController {

+ 2 - 2
game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/RegisterLoginController.java

@@ -3,7 +3,7 @@ package com.zanxiang.sdk.controller;
 import com.zanxiang.common.domain.ResultVo;
 import com.zanxiang.sdk.domain.params.*;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
-import com.zanxiang.sdk.service.IRegisterLoginService;
+import com.zanxiang.sdk.service.RegisterLoginService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 public class RegisterLoginController {
 
     @Autowired
-    private IRegisterLoginService registerPassword;
+    private RegisterLoginService registerPassword;
 
     @ApiOperation(value = "用户普通注册")
     @PostMapping("/register/password")

+ 2 - 2
game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/SmsController.java

@@ -4,7 +4,7 @@ import com.zanxiang.common.domain.ResultVo;
 import com.zanxiang.sdk.domain.params.SmsCheckParam;
 import com.zanxiang.sdk.domain.params.SmsSendParam;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
-import com.zanxiang.sdk.service.ISmsService;
+import com.zanxiang.sdk.service.SmsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 public class SmsController {
 
     @Autowired
-    private ISmsService smsService;
+    private SmsService smsService;
 
     @ApiOperation(value = "发送短信")
     @PostMapping("/send/msg")

+ 4 - 5
game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/UserController.java

@@ -1,9 +1,10 @@
 package com.zanxiang.sdk.controller;
 
 import com.zanxiang.common.domain.ResultVo;
-import com.zanxiang.sdk.domain.params.*;
+import com.zanxiang.sdk.domain.params.UpdatePasswordParam;
+import com.zanxiang.sdk.domain.params.UserDetailParam;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
-import com.zanxiang.sdk.service.IUserService;
+import com.zanxiang.sdk.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -12,8 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * @author : lingfeng
  * @time : 2022-06-16
@@ -26,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 public class UserController {
 
     @Autowired
-    private IUserService userService;
+    private UserService userService;
 
     @ApiOperation(value = "用户重置密码")
     @PostMapping("/update/password")

+ 22 - 22
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/RegisterLoginServiceImpl.java

@@ -13,8 +13,8 @@ import com.zanxiang.common.utils.URIUtil;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.sdk.common.constant.ApiUrlConstant;
 import com.zanxiang.sdk.common.constant.RedisKeyConstant;
-import com.zanxiang.sdk.common.util.RedisUtils;
-import com.zanxiang.sdk.common.util.RegisterUtils;
+import com.zanxiang.sdk.common.util.RedisUtil;
+import com.zanxiang.sdk.common.util.RegisterUtil;
 import com.zanxiang.sdk.domain.dto.UserOauthDTO;
 import com.zanxiang.sdk.domain.params.*;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
@@ -39,34 +39,34 @@ import java.util.Objects;
  */
 @Slf4j
 @Service
-public class RegisterLoginServiceImpl implements IRegisterLoginService {
+public class RegisterLoginServiceImpl implements RegisterLoginService {
 
     @Autowired
-    private RedisUtils<String> redisUtils;
+    private RedisUtil<String> redisUtil;
 
     @Autowired
-    private IQqApiService qqApiService;
+    private QqApiService qqApiService;
 
     @Autowired
-    private IVxApiService vxApiService;
+    private VxApiService vxApiService;
 
     @Autowired
-    private IUserOauthService userOauthService;
+    private UserOauthService userOauthService;
 
     @Autowired
-    private IUserTokenService userTokenService;
+    private UserTokenService userTokenService;
 
     @Autowired
-    private IUserLoginLogService userLoginLogService;
+    private UserLoginLogService userLoginLogService;
 
     @Autowired
-    private IUserService userService;
+    private UserService userService;
 
     @Autowired
-    private ISmsService smsService;
+    private SmsService smsService;
 
     @Autowired
-    private IWordCheckService wordCheckService;
+    private WordCheckService wordCheckService;
 
     /**
      * QQ开发者应用id
@@ -131,7 +131,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
         //插入用户登录记录
         userLoginLogService.addUserLoginLog(realIp, user, qqLoginCallbackParam.getGameId());
         //移出state
-        redisUtils.removeOfSet(RedisKeyConstant.AUTH_STATE_KEY, state);
+        redisUtil.removeOfSet(RedisKeyConstant.AUTH_STATE_KEY, state);
         //构造返回
         return new ResultVo<>(new UserLoginVO(userToken));
     }
@@ -189,7 +189,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
         //插入用户登录记录
         userLoginLogService.addUserLoginLog(realIp, user, qqLoginCallbackParam.getGameId());
         //移出state
-        redisUtils.removeOfSet(RedisKeyConstant.AUTH_STATE_KEY, state);
+        redisUtil.removeOfSet(RedisKeyConstant.AUTH_STATE_KEY, state);
         //构造返回
         return new ResultVo<>(new UserLoginVO(userToken));
     }
@@ -215,7 +215,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
         //创建用户信息
         User user = User.builder()
                 .username(registerPasswordParam.getUsername())
-                .password(RegisterUtils.cmfPassword(password))
+                .password(RegisterUtil.cmfPassword(password))
                 .deviceId(registerPasswordParam.getDeviceId())
                 .deviceType(registerPasswordParam.getDeviceType())
                 .status(AccountStatusEnum.NORMAL_STATUS.getStatus())
@@ -257,7 +257,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
             return new ResultVo<>(HttpStatusEnum.PHONE_IS_REG);
         }
         //验证密码是否合规
-        HttpStatusEnum passwordCheckEnum = RegisterUtils.checkPassword(password);
+        HttpStatusEnum passwordCheckEnum = RegisterUtil.checkPassword(password);
         if (!Objects.equals(passwordCheckEnum, HttpStatusEnum.SUCCESS)) {
             return new ResultVo<>(passwordCheckEnum);
         }
@@ -266,7 +266,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
                 .username(mobile)
                 .regMobile(mobile)
                 .mobile(mobile)
-                .password(RegisterUtils.cmfPassword(password))
+                .password(RegisterUtil.cmfPassword(password))
                 .deviceId(registerMobileParam.getDeviceId())
                 .deviceType(registerMobileParam.getDeviceType())
                 .status(AccountStatusEnum.NORMAL_STATUS.getStatus())
@@ -314,7 +314,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
             return new ResultVo<>(HttpStatusEnum.ACCOUNT_HALT);
         }
         //验证密码
-        if (!Objects.equals(RegisterUtils.cmfPassword(password), user.getPassword())) {
+        if (!Objects.equals(RegisterUtil.cmfPassword(password), user.getPassword())) {
             return new ResultVo<>(HttpStatusEnum.USERNAME_OR_PASSWORD_ERR);
         }
         //验证通过, 获取token
@@ -403,7 +403,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
      */
     private HttpStatusEnum checkRegister(String username, String password) {
         //用户名合规检测
-        HttpStatusEnum checkUserNameEnum = RegisterUtils.checkUserName(username);
+        HttpStatusEnum checkUserNameEnum = RegisterUtil.checkUserName(username);
         if (Objects.equals(checkUserNameEnum, HttpStatusEnum.SUCCESS)) {
             return checkUserNameEnum;
         }
@@ -416,7 +416,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
             return HttpStatusEnum.USERNAME_EXISTS;
         }
         //密码验证
-        return RegisterUtils.checkPassword(password);
+        return RegisterUtil.checkPassword(password);
     }
 
     /**
@@ -426,7 +426,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
      */
     private String getState() {
         String state = UUID.randomUUID().toString();
-        redisUtils.addToSet(RedisKeyConstant.AUTH_STATE_KEY, state);
+        redisUtil.addToSet(RedisKeyConstant.AUTH_STATE_KEY, state);
         return state;
     }
 
@@ -436,7 +436,7 @@ public class RegisterLoginServiceImpl implements IRegisterLoginService {
      * @param state : 随机密钥
      */
     private void checkState(String state) {
-        if (!redisUtils.isMemberInSet(RedisKeyConstant.AUTH_STATE_KEY, state)) {
+        if (!redisUtil.isMemberInSet(RedisKeyConstant.AUTH_STATE_KEY, state)) {
             throw new BaseException("State验证失败");
         }
     }

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

@@ -6,13 +6,13 @@ import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.enums.SmsTypeEnum;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.sdk.common.constant.RedisKeyConstant;
-import com.zanxiang.sdk.common.util.RedisUtils;
+import com.zanxiang.sdk.common.util.RedisUtil;
 import com.zanxiang.sdk.domain.dto.UserDTO;
 import com.zanxiang.sdk.domain.params.SmsCheckParam;
 import com.zanxiang.sdk.domain.params.SmsSendParam;
-import com.zanxiang.sdk.service.ISmsService;
-import com.zanxiang.sdk.service.IUserService;
-import com.zanxiang.sdk.service.IUserTokenService;
+import com.zanxiang.sdk.service.SmsService;
+import com.zanxiang.sdk.service.UserService;
+import com.zanxiang.sdk.service.UserTokenService;
 import com.zanxiangnet.module.sms.pojo.SendResult;
 import com.zanxiangnet.module.sms.service.impl.AliSmsService;
 import lombok.extern.slf4j.Slf4j;
@@ -30,24 +30,25 @@ import java.util.Random;
  */
 @Slf4j
 @Service
-public class SmsServiceImpl implements ISmsService {
+public class SmsServiceImpl implements SmsService {
 
     @Autowired
-    private IUserService userService;
+    private UserService userService;
 
     @Autowired
-    private RedisUtils<String> redisUtils;
+    private RedisUtil<String> redisUtil;
 
     @Autowired
     private AliSmsService aliSmsService;
 
     @Autowired
-    private IUserTokenService userTokenService;
+    private UserTokenService userTokenService;
 
     /**
      * 发送短信验证码
      *
      * @param smsSendParam : 获取短信验证码参数
+     * @return : 返回发送结果
      */
     @Override
     public ResultVo<Boolean> smsSend(SmsSendParam smsSendParam) {
@@ -81,7 +82,7 @@ public class SmsServiceImpl implements ISmsService {
             return new ResultVo<>(HttpStatusEnum.CODE_TYPE_ERROR);
         }
         //判断是否已经发送
-        String cache = redisUtils.getCache(this.smsKey(mobile, type));
+        String cache = redisUtil.getCache(this.smsKey(mobile, type));
         if (Strings.isNotBlank(cache)) {
             return new ResultVo<>(HttpStatusEnum.PHONE_HAS_SEND);
         }
@@ -90,7 +91,7 @@ public class SmsServiceImpl implements ISmsService {
         SendResult sendResult = aliSmsService.sendCode(randomCode, mobile);
         //发送成功设置缓存, 时效5分钟
         if (sendResult.isSuccess()) {
-            redisUtils.setCache(this.smsKey(mobile, type), randomCode, ExpireTimeEnum.FIVE_MIN.getTime());
+            redisUtil.setCache(this.smsKey(mobile, type), randomCode, ExpireTimeEnum.FIVE_MIN.getTime());
         }
         return new ResultVo<>(HttpStatusEnum.SUCCESS, Boolean.TRUE);
     }
@@ -141,7 +142,7 @@ public class SmsServiceImpl implements ISmsService {
         }
         //获取缓存中的验证码
         String smsKey = this.smsKey(mobile, type);
-        String cache = redisUtils.getCache(smsKey);
+        String cache = redisUtil.getCache(smsKey);
         //验证码已过期
         if (Strings.isBlank(cache)) {
             return HttpStatusEnum.CODE_IS_EXPIRED;
@@ -151,7 +152,7 @@ public class SmsServiceImpl implements ISmsService {
             return HttpStatusEnum.CODE_ERROR;
         }
         //验证成功, 删除缓存
-        redisUtils.deleteCache(smsKey);
+        redisUtil.deleteCache(smsKey);
         //返回成功
         return HttpStatusEnum.SUCCESS;
     }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.mybatis.entity.UserLoginLog;
 import com.zanxiang.mybatis.mapper.UserLoginLogMapper;
-import com.zanxiang.sdk.service.IUserLoginLogService;
+import com.zanxiang.sdk.service.UserLoginLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -17,11 +17,12 @@ import java.time.LocalDateTime;
  */
 @Slf4j
 @Service
-public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, UserLoginLog> implements IUserLoginLogService {
+public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, UserLoginLog> implements UserLoginLogService {
 
     /**
      * 添加用户登录日志
      *
+     * @param realIp : 用户ip
      * @param user   : 用户信息
      * @param gameId : 游戏id
      */

+ 2 - 2
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserOauthServiceImpl.java

@@ -7,7 +7,7 @@ import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.mybatis.entity.UserOauth;
 import com.zanxiang.mybatis.mapper.UserOauthMapper;
 import com.zanxiang.sdk.domain.dto.UserOauthDTO;
-import com.zanxiang.sdk.service.IUserOauthService;
+import com.zanxiang.sdk.service.UserOauthService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -20,7 +20,7 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class UserOauthServiceImpl extends ServiceImpl<UserOauthMapper, UserOauth> implements IUserOauthService {
+public class UserOauthServiceImpl extends ServiceImpl<UserOauthMapper, UserOauth> implements UserOauthService {
 
     /**
      * 根据openid查询用户授权信息

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

@@ -9,14 +9,14 @@ import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.mybatis.mapper.UserMapper;
-import com.zanxiang.sdk.common.util.RegisterUtils;
+import com.zanxiang.sdk.common.util.RegisterUtil;
 import com.zanxiang.sdk.domain.dto.UserDTO;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;
 import com.zanxiang.sdk.domain.params.UpdatePasswordParam;
 import com.zanxiang.sdk.domain.params.UserDetailParam;
 import com.zanxiang.sdk.domain.vo.UserVO;
-import com.zanxiang.sdk.service.IUserService;
-import com.zanxiang.sdk.service.IUserTokenService;
+import com.zanxiang.sdk.service.UserService;
+import com.zanxiang.sdk.service.UserTokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,10 +32,10 @@ import java.util.Objects;
  */
 @Slf4j
 @Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
 
     @Autowired
-    private IUserTokenService userTokenService;
+    private UserTokenService userTokenService;
 
     /**
      * 用户重置密码
@@ -66,13 +66,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return new ResultVo<>(checkUserTokenEnum);
         }
         //密码校验
-        HttpStatusEnum checkPasswordEnum = RegisterUtils.checkPassword(password);
+        HttpStatusEnum checkPasswordEnum = RegisterUtil.checkPassword(password);
         if (!Objects.equals(checkPasswordEnum, HttpStatusEnum.SUCCESS)) {
             return new ResultVo<>(checkPasswordEnum);
         }
         //修改用户密码
         super.update(new LambdaUpdateWrapper<User>()
-                .set(User::getPassword, RegisterUtils.cmfPassword(password))
+                .set(User::getPassword, RegisterUtil.cmfPassword(password))
                 .set(User::getUpdateTime, LocalDateTime.now())
                 .eq(User::getUsername, username));
         //返回修改成功

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

@@ -13,9 +13,9 @@ import com.zanxiang.common.utils.bean.BeanUtils;
 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.common.util.RedisUtil;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;
-import com.zanxiang.sdk.service.IUserTokenService;
+import com.zanxiang.sdk.service.UserTokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,10 +32,10 @@ import java.util.Objects;
  */
 @Slf4j
 @Service
-public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken> implements IUserTokenService {
+public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken> implements UserTokenService {
 
     @Autowired
-    private RedisUtils<UserToken> redisUtils;
+    private RedisUtil<UserToken> redisUtil;
 
     /**
      * 通过token设备获取token详情
@@ -48,7 +48,7 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
     public UserTokenDTO getTokenInfoByTokenDevice(String token, String deviceType) {
         //查询缓存信息
         String tokenInfoKey = this.getTokenInfoKey(token, deviceType);
-        UserToken userToken = redisUtils.getCache(tokenInfoKey);
+        UserToken userToken = redisUtil.getCache(tokenInfoKey);
         if (userToken != null) {
             return BeanUtils.copy(userToken, UserTokenDTO.class);
         }
@@ -60,10 +60,10 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
             return null;
         }
         //设置token详情缓存
-        redisUtils.setCache(tokenInfoKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
+        redisUtil.setCache(tokenInfoKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
         //设置用户缓存
         String userTokenKey = this.getUserTokenKey(userToken.getUserId(), deviceType);
-        redisUtils.setCache(userTokenKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
+        redisUtil.setCache(userTokenKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
         //返回数据
         return BeanUtils.copy(userToken, UserTokenDTO.class);
     }
@@ -79,7 +79,7 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
     public UserTokenDTO getTokenInfoByUserDevice(Long userId, String deviceType) {
         //查询缓存信息
         String userTokenKey = this.getUserTokenKey(userId, deviceType);
-        UserToken userToken = redisUtils.getCache(userTokenKey);
+        UserToken userToken = redisUtil.getCache(userTokenKey);
         if (userToken != null) {
             return BeanUtils.copy(userToken, UserTokenDTO.class);
         }
@@ -92,9 +92,9 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         }
         //设置token详情缓存
         String tokenInfoKey = this.getTokenInfoKey(userToken.getToken(), deviceType);
-        redisUtils.setCache(tokenInfoKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
+        redisUtil.setCache(tokenInfoKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
         //设置用户缓存
-        redisUtils.setCache(userTokenKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
+        redisUtil.setCache(userTokenKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
         //返回数据
         return BeanUtils.copy(userToken, UserTokenDTO.class);
     }
@@ -151,10 +151,10 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         }
         //设置用户缓存
         String userTokenKey = this.getUserTokenKey(userId, deviceType);
-        redisUtils.setCache(userTokenKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
+        redisUtil.setCache(userTokenKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
         //设置token详情缓存
         String tokenInfoKey = this.getTokenInfoKey(token, deviceType);
-        redisUtils.setCache(tokenInfoKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
+        redisUtil.setCache(tokenInfoKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
         //返回token
         return token;
     }
@@ -176,9 +176,9 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
             super.removeById(userToken.getId());
             //删除缓存
             String userTokenKey = this.getUserTokenKey(userId, userToken.getDeviceType());
-            redisUtils.deleteCache(userTokenKey);
+            redisUtil.deleteCache(userTokenKey);
             String tokenInfoKey = this.getTokenInfoKey(userToken.getToken(), userToken.getDeviceType());
-            redisUtils.deleteCache(tokenInfoKey);
+            redisUtil.deleteCache(tokenInfoKey);
         });
     }
 

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.mybatis.entity.WordCheck;
 import com.zanxiang.mybatis.mapper.WordCheckMapper;
-import com.zanxiang.sdk.service.IWordCheckService;
+import com.zanxiang.sdk.service.WordCheckService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +18,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class WordCheckServiceImpl extends ServiceImpl<WordCheckMapper, WordCheck> implements IWordCheckService {
+public class WordCheckServiceImpl extends ServiceImpl<WordCheckMapper, WordCheck> implements WordCheckService {
 
     /**
      * 查询敏感词

+ 2 - 2
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/auth/QqApiServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpUtil;
 import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.utils.URIUtil;
 import com.zanxiang.sdk.common.constant.ApiUrlConstant;
-import com.zanxiang.sdk.service.IQqApiService;
+import com.zanxiang.sdk.service.QqApiService;
 import com.zanxiangnet.module.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -21,7 +21,7 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class QqApiServiceImpl implements IQqApiService {
+public class QqApiServiceImpl implements QqApiService {
 
     /**
      * QQ开发者应用id

+ 2 - 2
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/auth/VxApiServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpUtil;
 import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.utils.URIUtil;
 import com.zanxiang.sdk.common.constant.ApiUrlConstant;
-import com.zanxiang.sdk.service.IVxApiService;
+import com.zanxiang.sdk.service.VxApiService;
 import com.zanxiangnet.module.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -22,7 +22,7 @@ import java.util.Objects;
  */
 @Slf4j
 @Service
-public class VxApiServiceImpl implements IVxApiService {
+public class VxApiServiceImpl implements VxApiService {
 
     /**
      * 微信开发者应用id

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

@@ -216,7 +216,7 @@ public class WxpayServiceImpl extends PayService implements OrderPayService {
         String imgName = this.outTradeNo + ".png";
         String imgPath = filePath + imgName;
         logger.info("小程序支付调起,请求参数:qrCode:{}, imgPath:{}", qrCode, imgPath);
-        ZxingUtils.createQRCodeImage(qrCode.toString(), imgPath);
+        ZxingUtil.createQRCodeImage(qrCode.toString(), imgPath);
         return ResultMap.ok(imgPath);
     }
 
@@ -285,7 +285,7 @@ public class WxpayServiceImpl extends PayService implements OrderPayService {
                     String urlCode = trade_type.equals("MWEB") ? (String) map.get("mweb_url") : (String) map.get("code_url");
                     String imgName = this.outTradeNo + ".png";
                     String imgPath = filePath + imgName;
-                    ZxingUtils.createQRCodeImage(urlCode, imgPath);
+                    ZxingUtil.createQRCodeImage(urlCode, imgPath);
                     return ResultMap.ok(imgPath);
                 } else {
                     String errCodeDes = (String) map.get("err_code_des");

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IQqApiService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/QqApiService.java

@@ -7,7 +7,7 @@ import java.util.Map;
  * @time : 2022-06-21
  * @description :
  */
-public interface IQqApiService {
+public interface QqApiService {
 
     /**
      * QQ授权获取用户信息

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IRegisterLoginService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/RegisterLoginService.java

@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse;
  * @time : 2022-06-22
  * @description :
  */
-public interface IRegisterLoginService {
+public interface RegisterLoginService {
 
     /**
      * QQ授权登录

+ 2 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/ISmsService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/SmsService.java

@@ -10,12 +10,13 @@ import com.zanxiang.sdk.domain.params.SmsSendParam;
  * @time : 2022-06-13
  * @description :
  */
-public interface ISmsService {
+public interface SmsService {
 
     /**
      * 发送短信验证码
      *
      * @param smsSendParam : 获取短信验证码参数
+     * @return : 返回发送结果
      */
     ResultVo<Boolean> smsSend(SmsSendParam smsSendParam);
 

+ 2 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IUserLoginLogService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserLoginLogService.java

@@ -7,11 +7,12 @@ import com.zanxiang.mybatis.entity.User;
  * @time : 2022-06-13
  * @description :
  */
-public interface IUserLoginLogService {
+public interface UserLoginLogService {
 
     /**
      * 添加用户登录日志
      *
+     * @param realIp : 用户ip
      * @param user   : 用户信息
      * @param gameId : 游戏id
      */

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IUserOauthService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserOauthService.java

@@ -10,7 +10,7 @@ import java.util.Map;
  * @time : 2022-06-21
  * @description : 用户第三方授权信息
  */
-public interface IUserOauthService {
+public interface UserOauthService {
 
     /**
      * 根据openid查询用户授权信息

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IUserService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserService.java

@@ -13,7 +13,7 @@ import com.zanxiang.sdk.domain.vo.UserVO;
  * @time : 2022-06-08
  * @description : 用户信息
  */
-public interface IUserService extends IService<User> {
+public interface UserService extends IService<User> {
 
     /**
      * 用户重置密码

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IUserTokenService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserTokenService.java

@@ -10,7 +10,7 @@ import com.zanxiang.sdk.domain.dto.UserTokenDTO;
  * @time : 2022-06-08
  * @description : 用户token管理
  */
-public interface IUserTokenService extends IService<UserToken> {
+public interface UserTokenService extends IService<UserToken> {
 
     /**
      * 通过token设备获取token详情

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IVxApiService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/VxApiService.java

@@ -7,7 +7,7 @@ import java.util.Map;
  * @time : 2022-06-21
  * @description : 微信授权api
  */
-public interface IVxApiService {
+public interface VxApiService {
 
     /**
      * QQ授权获取用户信息

+ 1 - 1
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IWordCheckService.java → game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/WordCheckService.java

@@ -8,7 +8,7 @@ import com.zanxiang.mybatis.entity.WordCheck;
  * @time : 2022-06-14
  * @description :
  */
-public interface IWordCheckService extends IService<WordCheck> {
+public interface WordCheckService extends IService<WordCheck> {
 
     /**
      * 查询敏感词