Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (发码器代码完成提交1100･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (发码器代码完成提交1200･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -23,7 +23,7 @@ import java.util.Map;
  * @description : 发码器外部接口
  */
 @Slf4j
-@Api(tags = {"发码器外部接口"})
+@Api(tags = {"发码器H5接口"})
 @RestController
 @RequestMapping("/api/game/gift/pack")
 public class GameGiftPackApi {
@@ -48,7 +48,7 @@ public class GameGiftPackApi {
     @GetMapping(value = "/game/source/server")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Long.class)})
     public ResultVO<Map<String, String>> getSourceGameServer(@RequestParam Long linkLogId) {
-        return ResultVO.ok(gameGiftPackLinkLogService.getSourceGameServer(linkLogId));
+        return ResultVO.ok(gameGiftPackLinkLogService.getSourceGameServerByLinkLogId(linkLogId));
     }
 
     @ApiOperation(value = "游戏玩家角色验证")

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

@@ -41,11 +41,19 @@ public interface IGameGiftPackLinkLogService extends IService<GameGiftPackLinkLo
      */
     IPage<GameGiftPackLinkLogVO> list(GameGiftPackLinkLogListParam param);
 
+    /**
+     * 根据链接id查询区服信息
+     *
+     * @param linkId : 链接id
+     * @return : 返回游戏区服信息
+     */
+    Map<String, String> getSourceGameServerByLinkId(Long linkId);
+
     /**
      * 获取游戏原始区服信息
      *
      * @param linkLogId : 访问日志id
      * @return : 返回游戏区服信息
      */
-    Map<String, String> getSourceGameServer(Long linkLogId);
+    Map<String, String> getSourceGameServerByLinkLogId(Long linkLogId);
 }

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

@@ -90,11 +90,7 @@ public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCode
         IPage<GameGiftPackCodeLogVO> result = new Page<>(codeLogIPage.getCurrent(), codeLogIPage.getSize(), codeLogIPage.getTotal());
         if (CollectionUtils.isNotEmpty(codeLogIPage.getRecords())) {
             List<GameGiftPackCodeLog> records = codeLogIPage.getRecords();
-            List<String> serverIds = records.stream().map(GameGiftPackCodeLog::getServerId).distinct().collect(Collectors.toList());
-            Map<String, String> gameServerMap = gameServerService.list(new LambdaQueryWrapper<GameServer>()
-                    .eq(GameServer::getIsSourceServer, Boolean.TRUE)
-                    .in(GameServer::getServerId, serverIds)
-            ).stream().collect(Collectors.toMap(GameServer::getServerId, GameServer::getServerName));
+            Map<String, String> gameServerMap = gameGiftPackLinkLogService.getSourceGameServerByLinkId(param.getLinkId());
             result.setRecords(this.toVOBatch(records, gameServerMap));
         }
         return result;

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

@@ -63,11 +63,7 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
         IPage<GameGiftPackLinkLogVO> result = new Page<>(linkLogIPage.getCurrent(), linkLogIPage.getSize(), linkLogIPage.getTotal());
         if (CollectionUtils.isNotEmpty(linkLogIPage.getRecords())) {
             List<GameGiftPackLinkLog> records = linkLogIPage.getRecords();
-            List<String> serverIds = records.stream().map(GameGiftPackLinkLog::getServerId).distinct().collect(Collectors.toList());
-            Map<String, String> gameServerMap = gameServerService.list(new LambdaQueryWrapper<GameServer>()
-                    .in(GameServer::getServerId, serverIds)
-                    .eq(GameServer::getIsSourceServer, Boolean.TRUE)
-            ).stream().collect(Collectors.toMap(GameServer::getServerId, GameServer::getServerName));
+            Map<String, String> gameServerMap = this.getSourceGameServerByLinkId(param.getLinkId());
             result.setRecords(this.toVOBatch(records, gameServerMap));
         }
         return result;
@@ -82,12 +78,24 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
     }
 
     @Override
-    public Map<String, String> getSourceGameServer(Long linkLogId) {
+    public Map<String, String> getSourceGameServerByLinkId(Long linkId) {
+        //查询访问日志
+        GameGiftPackLink giftPackLink = gameGiftPackLinkService.getById(linkId);
+        assert giftPackLink != null : "参数错误, 链接信息不存在";
+        return this.getSourceGameServerByGameId(giftPackLink.getGameId());
+    }
+
+    @Override
+    public Map<String, String> getSourceGameServerByLinkLogId(Long linkLogId) {
         //查询访问日志
         GameGiftPackLinkLog gameGiftPackLinkLog = super.getById(linkLogId);
         assert gameGiftPackLinkLog != null : "参数错误, 链接访问日志信息不存在";
+        return this.getSourceGameServerByGameId(gameGiftPackLinkLog.getGameId());
+    }
+
+    private Map<String, String> getSourceGameServerByGameId(Long gameId) {
         //查询游戏信息
-        GameDTO gameDTO = gameService.getById(gameGiftPackLinkLog.getGameId());
+        GameDTO gameDTO = gameService.getById(gameId);
         assert gameDTO != null : "参数错误, 游戏信息不存在";
         //查询区服信息
         return gameServerService.list(new LambdaQueryWrapper<GameServer>()