fix : 游戏后台接口整理合并代码提交

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

@@ -45,6 +45,7 @@ public class OssController {
 
     @ApiOperation(value = "oss回传接口")
     @PostMapping("/callback")
+    @PreAuthorize(permissionKey = "sdk:oss:callback")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OssUploadCallback.class)})
     public ResultVO<OssUploadCallback> ossCallback(@RequestBody OssUploadDTO dto) {
         return ResultVO.ok(ossService.callback(dto));

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

@@ -1,42 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.UserNameAuthListParam;
-import com.zanxiang.game.module.manage.domain.vo.UserCardVO;
-import com.zanxiang.game.module.manage.service.IUserCardService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-02
- * @description : 用户实名
- */
-@Api(tags = {"用户实名认证管理"})
-@RestController
-@RequestMapping("/user/card")
-@Slf4j
-public class UserCardController {
-
-    @Autowired
-    private IUserCardService userCardService;
-
-    @ApiOperation(value = "玩家实名认证列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:userCard:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserCardVO.class)})
-    public ResultVO<IPage<UserCardVO>> authList(@Validated @RequestBody UserNameAuthListParam param) {
-        return ResultVO.ok(userCardService.getUserCardList(param));
-    }
-}

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

@@ -3,15 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.UserListParam;
-import com.zanxiang.game.module.manage.domain.params.UserLoginLogParam;
-import com.zanxiang.game.module.manage.domain.params.UserOrderListParam;
-import com.zanxiang.game.module.manage.domain.params.UserUpdateParam;
+import com.zanxiang.game.module.manage.domain.params.*;
 import com.zanxiang.game.module.manage.domain.vo.*;
-import com.zanxiang.game.module.manage.service.IOrderService;
-import com.zanxiang.game.module.manage.service.IUserAddressService;
-import com.zanxiang.game.module.manage.service.IUserLoginLogService;
-import com.zanxiang.game.module.manage.service.IUserService;
+import com.zanxiang.game.module.manage.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -46,6 +40,15 @@ public class UserController {
     @Autowired
     private IOrderService orderService;
 
+    @Autowired
+    private IGameUserService gameUserService;
+
+    @Autowired
+    private IGameUserRoleService gameUserRoleService;
+
+    @Autowired
+    private IUserCardService userCardService;
+
     @ApiOperation(value = "玩家列表")
     @PostMapping(value = "/list")
     @PreAuthorize(permissionKey = "sdk:user:list")
@@ -93,4 +96,36 @@ public class UserController {
     public ResultVO<List<UserAddressVO>> list(@RequestParam Long userId) {
         return ResultVO.ok(userAddressService.list(userId));
     }
+
+    @ApiOperation(value = "玩家游戏列表")
+    @PostMapping(value = "/game/list")
+    @PreAuthorize(permissionKey = "sdk:user:gameList")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserListVO.class)})
+    public ResultVO<IPage<GameUserListVO>> gameUserList(@Validated @RequestBody GameUserListParam param) {
+        return ResultVO.ok(gameUserService.gameUserList(param));
+    }
+
+    @ApiOperation(value = "玩家游戏角色")
+    @GetMapping(value = "/game/role/list")
+    @PreAuthorize(permissionKey = "sdk:user:gameRoleList")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserRoleVO.class, responseContainer = "list")})
+    public ResultVO<List<GameUserRoleVO>> roleList(@RequestParam Long userId) {
+        return ResultVO.ok(gameUserRoleService.roleList(userId));
+    }
+
+    @ApiOperation(value = "玩家游戏角色列表")
+    @PostMapping(value = "/role/list")
+    @PreAuthorize(permissionKey = "sdk:user:roleList")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserRoleListVO.class)})
+    public ResultVO<IPage<GameUserRoleListVO>> roleList(@Validated @RequestBody GameUserRoleListParam param) {
+        return ResultVO.ok(gameUserRoleService.list(param));
+    }
+
+    @ApiOperation(value = "玩家实名认证列表")
+    @PostMapping(value = "/card/list")
+    @PreAuthorize(permissionKey = "sdk:userCard:list")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserCardVO.class)})
+    public ResultVO<IPage<UserCardVO>> authList(@Validated @RequestBody UserNameAuthListParam param) {
+        return ResultVO.ok(userCardService.getUserCardList(param));
+    }
 }

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

@@ -1,42 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GameUserListParam;
-import com.zanxiang.game.module.manage.domain.vo.GameUserListVO;
-import com.zanxiang.game.module.manage.service.IGameUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-03
- * @description : 玩家游戏
- */
-@Api(tags = {"玩家管理接口"})
-@RestController
-@RequestMapping("/user")
-@Slf4j
-public class UserGameController {
-
-    @Autowired
-    private IGameUserService gameUserService;
-
-    @ApiOperation(value = "玩家游戏列表")
-    @PostMapping(value = "/game/list")
-    @PreAuthorize(permissionKey = "sdk:user:gameList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserListVO.class)})
-    public ResultVO<IPage<GameUserListVO>> gameUserList(@Validated @RequestBody GameUserListParam param) {
-        return ResultVO.ok(gameUserService.gameUserList(param));
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GameUserRoleListParam;
-import com.zanxiang.game.module.manage.domain.vo.GameUserRoleListVO;
-import com.zanxiang.game.module.manage.domain.vo.GameUserRoleVO;
-import com.zanxiang.game.module.manage.service.IGameUserRoleService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-03
- * @description : 玩家角色
- */
-@Api(tags = {"玩家角色"})
-@RestController
-@RequestMapping("/user")
-@Slf4j
-public class UserRoleController {
-
-    @Autowired
-    private IGameUserRoleService gameUserRoleService;
-
-    @ApiOperation(value = "用户游戏角色")
-    @GetMapping(value = "/game/role/list")
-    @PreAuthorize(permissionKey = "sdk:user:gameRoleList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserRoleVO.class, responseContainer = "list")})
-    public ResultVO<List<GameUserRoleVO>> roleList(@RequestParam Long userId) {
-        return ResultVO.ok(gameUserRoleService.roleList(userId));
-    }
-
-    @ApiOperation(value = "玩家游戏角色列表")
-    @PostMapping(value = "/role/list")
-    @PreAuthorize(permissionKey = "sdk:user:roleList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameUserRoleListVO.class)})
-    public ResultVO<IPage<GameUserRoleListVO>> roleList(@Validated @RequestBody GameUserRoleListParam param) {
-        return ResultVO.ok(gameUserRoleService.list(param));
-    }
-}