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

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

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功001 ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -116,7 +116,15 @@ public class ChoiceController {
         return ResultVO.ok(gameTagService.gameTagsChoiceList());
     }
 
-    @ApiOperation(value = "注册渠道-账号选择列表")
+    @ApiOperation(value = "推广渠道选择列表")
+    @GetMapping(value = "/agent/list")
+    @PreAuthorize(permissionKey = "sdk:agentChoice:list")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = AgentChoiceVO.class, responseContainer = "list")})
+    public ResultVO<List<AgentChoiceVO>> agentChoiceList() {
+        return ResultVO.ok(agentService.agentChoiceList());
+    }
+
+    @ApiOperation(value = "推广渠道账号选择列表")
     @GetMapping(value = "/agent/account/list")
     @PreAuthorize(permissionKey = "sdk:agentAccountChoice:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = AgentAccountChoiceVO.class, responseContainer = "list")})

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/AgentAccountChoiceVO.java

@@ -10,16 +10,6 @@ import lombok.Data;
 @Data
 public class AgentAccountChoiceVO {
 
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 渠道名称
-     */
-    private String agentName;
-
     /**
      * 账号类型
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/AgentChoiceVO.java

@@ -0,0 +1,22 @@
+package com.zanxiang.game.module.manage.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-27
+ * @description : 推广渠道
+ */
+@Data
+public class AgentChoiceVO {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 渠道名称
+     */
+    private String agentName;
+}

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

@@ -6,6 +6,7 @@ import com.zanxiang.game.module.manage.pojo.dto.AgentDTO;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
 import com.zanxiang.game.module.manage.pojo.vo.AgentAccountChoiceVO;
+import com.zanxiang.game.module.manage.pojo.vo.AgentChoiceVO;
 import com.zanxiang.game.module.manage.pojo.vo.AgentVO;
 import com.zanxiang.game.module.mybatis.entity.Agent;
 
@@ -66,4 +67,11 @@ public interface IAgentService extends IService<Agent> {
      * @return {@link List}<{@link AgentAccountChoiceVO}>
      */
     List<AgentAccountChoiceVO> agentAccountChoiceList();
+
+    /**
+     * 代理选择列表
+     *
+     * @return {@link List}<{@link AgentChoiceVO}>
+     */
+    List<AgentChoiceVO> agentChoiceList();
 }

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

@@ -20,6 +20,7 @@ import com.zanxiang.game.module.manage.pojo.enums.AccountTypeEnum;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
 import com.zanxiang.game.module.manage.pojo.vo.AgentAccountChoiceVO;
+import com.zanxiang.game.module.manage.pojo.vo.AgentChoiceVO;
 import com.zanxiang.game.module.manage.pojo.vo.AgentVO;
 import com.zanxiang.game.module.manage.pojo.vo.GameInfoVO;
 import com.zanxiang.game.module.manage.service.IAgentService;
@@ -214,4 +215,11 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
                 .eq(!SecurityUtil.isManager(), Agent::getCreateBy, SecurityUtil.getUserId())
         ).stream().map(agent -> BeanUtil.copy(agent, AgentAccountChoiceVO.class)).collect(Collectors.toList());
     }
+
+    @Override
+    public List<AgentChoiceVO> agentChoiceList() {
+        return super.list(new LambdaQueryWrapper<Agent>()
+                .eq(!SecurityUtil.isManager(), Agent::getCreateBy, SecurityUtil.getUserId())
+        ).stream().map(agent -> BeanUtil.copy(agent, AgentChoiceVO.class)).collect(Collectors.toList());
+    }
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功001 ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +