fix : 调试修改

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/config/SwaggerConfig.java

@@ -29,7 +29,7 @@ public class SwaggerConfig {
                 .apiInfo(apiInfo())
                 .select()
                 .apis(RequestHandlerSelectors
-                        .basePackage("com.zanxiang.manage"))
+                        .basePackage("com.zanxiang.game.module.manage"))
                 .paths(PathSelectors.any())
                 .build();
     }

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

@@ -51,7 +51,7 @@ public class UserController {
 
     @ApiOperation(value = "玩家列表")
     @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:user:list")
+//    @PreAuthorize(permissionKey = "sdk:user:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserListVO.class)})
     public ResultVO<IPage<UserListVO>> list(@Validated @RequestBody UserListParam param) {
         return ResultVO.ok(userService.list(param));

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

@@ -18,6 +18,7 @@ import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.Agent;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.mapper.UserMapper;
+import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.exception.BaseException;
@@ -62,12 +63,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public IPage<UserListVO> list(UserListParam param) {
+        log.error("查询用户列表, param : {}", JsonUtil.toString(param));
         //渠道列表
         List<AgentDTO> agentDTOList = agentService.listUserAgent(param.getAccountId(), param.getPitcherId(), param.getChannelId());
         //根据条件, 匹配渠道
         if (CollectionUtils.isEmpty(agentDTOList) && !SecurityUtil.isAdmin()) {
             return new Page<>();
         }
+        log.error("agentDTOList : {}, isAdmin : {}", agentDTOList, SecurityUtil.isAdmin());
         //渠道id列表
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //游戏条件处理

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/config/SwaggerConfig.java

@@ -29,7 +29,7 @@ public class SwaggerConfig {
                 .apiInfo(apiInfo())
                 .select()
                 .apis(RequestHandlerSelectors
-                        .basePackage("com.zanxiang.sdk"))
+                        .basePackage("com.zanxiang.game.module.sdk"))
                 .paths(PathSelectors.any())
                 .build();
     }

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

@@ -24,9 +24,10 @@ public interface IUserLoginLogService {
     /**
      * 创建用户登录日志
      *
-     * @param user 用户
-     * @param type 类型
+     * @param user       用户
+     * @param type       类型
+     * @param deviceType 设备类型
      * @return {@link Boolean}
      */
-    Boolean createUserLoginLog(User user, Integer type);
+    Boolean createUserLoginLog(User user, Integer type, Integer deviceType);
 }

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

@@ -28,7 +28,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
     @Autowired
     private IUserService userService;
 
-    public void userAgentUpdate() {
+    public void userAgentUpdate(Long userId, String channel) {
 
     }
 

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

@@ -57,7 +57,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         //选择服务器
         if (Objects.equals(dataType, DataTypeEnum.TYPE_SELECT_SERVER.getDateType())) {
             User user = userService.getById(userData.getUserId());
-            return userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_IN.getLoginType());
+            return userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_IN.getLoginType(), userData.getDeviceType());
         }
         //创建角色
         if (Objects.equals(dataType, DataTypeEnum.TYPE_CREATE_ROLE.getDateType())) {

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

@@ -252,7 +252,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
         //获取token
         String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType());
         //插入用户登录记录
-        userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_IN.getLoginType());
+        userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_IN.getLoginType(), userData.getDeviceType());
         //查询用户实名信息
         UserCard userCard = userCardService.getOne(new LambdaQueryWrapper<UserCard>().eq(UserCard::getUserId, user.getId()));
         //查询游戏
@@ -279,7 +279,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
     public Boolean loginOut(UserData userData) {
         User user = userService.getById(userData.getUserId());
         //新增用户退出记录
-        return userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_OUT.getLoginType());
+        return userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_OUT.getLoginType(), userData.getDeviceType());
     }
 
     @Override

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserLoginLog;
 import com.zanxiang.game.module.mybatis.mapper.UserLoginLogMapper;
-import com.zanxiang.game.module.sdk.enums.DeviceTypeEnum;
 import com.zanxiang.game.module.sdk.pojo.param.UserData;
 import com.zanxiang.game.module.sdk.service.IUserLoginLogService;
 import lombok.extern.slf4j.Slf4j;
@@ -31,20 +30,20 @@ public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, Use
                 .roleName(roleName)
                 .os(userData.getDeviceSystem())
                 .ip(userData.getIp())
-                .deviceType(DeviceTypeEnum.DEVICE_TYPE_ANDROID.getDeviceType())
+                .deviceType(userData.getDeviceType())
                 .type(type)
                 .createTime(LocalDateTime.now())
                 .build());
     }
 
     @Override
-    public Boolean createUserLoginLog(User user, Integer type) {
+    public Boolean createUserLoginLog(User user, Integer type, Integer deviceType) {
         return super.save(UserLoginLog.builder()
                 .userId(user.getId())
                 .gameId(user.getGameId())
                 .os(user.getDeviceSystem())
                 .ip(user.getIp())
-                .deviceType(DeviceTypeEnum.DEVICE_TYPE_ANDROID.getDeviceType())
+                .deviceType(deviceType)
                 .type(type)
                 .createTime(LocalDateTime.now())
                 .build());