fix

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

@@ -44,6 +44,7 @@ public class TokenArgumentResolver implements HandlerMethodArgumentResolver {
         if (request == null) {
             throw new CustomException(HttpStatusEnum.UNKNOWN_ERROR);
         }
+        //是否强制验证登录状态
         boolean b = parameter.hasParameterAnnotation(ValidLogin.class);
         String token = request.getHeader("token");
         if (b && StringUtils.isEmpty(token)) {
@@ -54,15 +55,22 @@ public class TokenArgumentResolver implements HandlerMethodArgumentResolver {
         UserData data = new UserData();
         data.setDeviceType(deviceType);
         if (StringUtils.isEmpty(token)) {
+            if (b) {
+                throw new CustomException(HttpStatusEnum.USER_NO_LOGIN);
+            }
             return data;
         }
         UserTokenDTO tokenInfoByTokenDevice = userTokenService.getTokenInfoByTokenDevice(token, deviceType.toString());
         if (tokenInfoByTokenDevice == null) {
+            if (b) {
+                throw new CustomException(HttpStatusEnum.USER_NO_LOGIN);
+            }
             return data;
         }
         if (b && tokenInfoByTokenDevice.getUserId() == null) {
             throw new CustomException(HttpStatusEnum.USER_NO_LOGIN);
         }
-        return BeanUtils.copy(tokenInfoByTokenDevice, UserData.class);
+        data.setUserId(tokenInfoByTokenDevice.getUserId());
+        return data;
     }
 }

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

@@ -23,7 +23,7 @@ public class UserData implements Serializable {
 
 
     /**
-     * 设备类型;mobile,android,iphone,ipad,web,pc,mac,wxapp
+     * 设备类型;
      */
     private Integer deviceType;