|
@@ -4,9 +4,11 @@ import com.zanxiang.common.enums.HttpStatusEnum;
|
|
import com.zanxiang.common.exception.CustomException;
|
|
import com.zanxiang.common.exception.CustomException;
|
|
import com.zanxiang.common.utils.StringUtils;
|
|
import com.zanxiang.common.utils.StringUtils;
|
|
import com.zanxiang.module.web.util.IpUtil;
|
|
import com.zanxiang.module.web.util.IpUtil;
|
|
|
|
+import com.zanxiang.mybatis.entity.GameExt;
|
|
import com.zanxiang.sdk.annotation.ValidLogin;
|
|
import com.zanxiang.sdk.annotation.ValidLogin;
|
|
import com.zanxiang.sdk.domain.dto.UserTokenDTO;
|
|
import com.zanxiang.sdk.domain.dto.UserTokenDTO;
|
|
import com.zanxiang.sdk.domain.params.UserData;
|
|
import com.zanxiang.sdk.domain.params.UserData;
|
|
|
|
+import com.zanxiang.sdk.service.GameExtService;
|
|
import com.zanxiang.sdk.service.UserTokenService;
|
|
import com.zanxiang.sdk.service.UserTokenService;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.core.MethodParameter;
|
|
import org.springframework.core.MethodParameter;
|
|
@@ -33,6 +35,9 @@ public class ArgumentAdapter implements HandlerMethodArgumentResolver {
|
|
@Resource
|
|
@Resource
|
|
private UserTokenService userTokenService;
|
|
private UserTokenService userTokenService;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private GameExtService gameExtService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean supportsParameter(MethodParameter parameter) {
|
|
public boolean supportsParameter(MethodParameter parameter) {
|
|
return parameter.getParameterType().equals(UserData.class);
|
|
return parameter.getParameterType().equals(UserData.class);
|
|
@@ -53,9 +58,14 @@ public class ArgumentAdapter implements HandlerMethodArgumentResolver {
|
|
}
|
|
}
|
|
//设备类型
|
|
//设备类型
|
|
Integer deviceType = Integer.valueOf(request.getHeader("deviceType"));
|
|
Integer deviceType = Integer.valueOf(request.getHeader("deviceType"));
|
|
|
|
+ //前端传过来的是appId,不是真正的gameId
|
|
|
|
+ GameExt gameExt = gameExtService.getByGameAppId(request.getHeader("gameId"));
|
|
|
|
+ if (gameExt == null) {
|
|
|
|
+ throw new CustomException(HttpStatusEnum.UNKNOWN_ERROR);
|
|
|
|
+ }
|
|
//构造用户信息
|
|
//构造用户信息
|
|
UserData data = UserData.builder()
|
|
UserData data = UserData.builder()
|
|
- .gameId(Long.valueOf(request.getHeader("gameId")))
|
|
|
|
|
|
+ .gameId(gameExt.getGameId())
|
|
.ip(IpUtil.getRealIp(request))
|
|
.ip(IpUtil.getRealIp(request))
|
|
.deviceType(deviceType)
|
|
.deviceType(deviceType)
|
|
.deviceSystem(request.getHeader("os"))
|
|
.deviceSystem(request.getHeader("os"))
|