feat : 用户接口代码补充提交

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

@@ -54,14 +54,15 @@ public class TokenArgumentResolver implements HandlerMethodArgumentResolver {
         if (request == null) {
             throw new CustomException(HttpStatusEnum.UNKNOWN_ERROR);
         }
+        //签名验证
+        String gameId = this.signCheck(request);
         //是否强制验证登录状态
         boolean b = parameter.hasParameterAnnotation(ValidLogin.class);
         String token = request.getHeader("token");
+        //需要登录, token不存在
         if (b && StringUtils.isEmpty(token)) {
             throw new CustomException(HttpStatusEnum.USER_NO_LOGIN);
         }
-        //签名验证
-        String gameId = this.signCheck(request);
         //请求头处理
         String userAgent = request.getHeader("user-agent");
         Integer deviceType = DeviceCheckUtil.getType(userAgent);
@@ -69,10 +70,8 @@ public class TokenArgumentResolver implements HandlerMethodArgumentResolver {
         data.setDeviceType(deviceType);
         data.setDeviceSystem(DeviceCheckUtil.getDeviceSystem(userAgent));
         data.setGameId(Long.valueOf(gameId));
+        //不需要登录, token不存在
         if (StringUtils.isEmpty(token)) {
-            if (b) {
-                throw new CustomException(HttpStatusEnum.USER_NO_LOGIN);
-            }
             return data;
         }
         UserTokenDTO userTokenDTO = userTokenService.getTokenInfoByTokenDevice(token, deviceType);

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/FindPasswordParam.java

@@ -17,7 +17,6 @@ public class FindPasswordParam {
      * 用户名
      */
     @ApiModelProperty(notes = "用户名")
-    @NotBlank(message = "用户名不可为空")
     private String userName;
 
     /**

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

@@ -66,16 +66,25 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         String code = param.getCode();
         String newPassword = param.getNewPassword();
         //查询用户信息
-        User user = super.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getUsername, userName));
-        if (user == null) {
-            return new ResultVO<>(HttpStatusEnum.USERNAME_NOT_EXISTS);
-        }
-        if (Strings.isBlank(user.getMobile())) {
-            return new ResultVO<>(HttpStatusEnum.ACCOUNT_NOT_BIND_PHONE);
-        }
-        if (Objects.equals(mobile, user.getMobile())) {
-            return new ResultVO<>(HttpStatusEnum.PHONE_NUM_ERROR);
+        User user;
+        if (Strings.isNotBlank(userName)) {
+            user = super.getOne(new LambdaQueryWrapper<User>()
+                    .eq(User::getUsername, userName));
+            if (user == null) {
+                return new ResultVO<>(HttpStatusEnum.USERNAME_NOT_EXISTS);
+            }
+            if (Strings.isBlank(user.getMobile())) {
+                return new ResultVO<>(HttpStatusEnum.ACCOUNT_NOT_BIND_PHONE);
+            }
+            if (Objects.equals(mobile, user.getMobile())) {
+                return new ResultVO<>(HttpStatusEnum.PHONE_NUM_ERROR);
+            }
+        } else {
+            user = super.getOne(new LambdaQueryWrapper<User>()
+                    .eq(User::getMobile, mobile));
+            if (user == null) {
+                return new ResultVO<>(HttpStatusEnum.PHONE_NOT_REG);
+            }
         }
         //验证码校验
         HttpStatusEnum httpStatusEnum = smsService.smsCheck(SmsTypeEnum.SMS_FIND_PWD.getType(), mobile, code);