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

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/enums/GameActionSetEnum.java

@@ -1,56 +0,0 @@
-package com.zanxiang.game.module.manage.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2023-07-05
- * @description : 游戏数据源
- */
-@Getter
-@AllArgsConstructor
-public enum GameActionSetEnum {
-
-    /**
-     * 小游戏
-     */
-    WECHAT_MINI_GAME("WECHAT_MINI_GAME", 1),
-
-    /**
-     * 公众号
-     */
-    WECHAT("WECHAT", 2),
-
-    /**
-     * 小程序
-     */
-    WECHAT_MINI_PROGRAM("WECHAT_MINI_PROGRAM", 3);
-
-    /**
-     * 数据源类型
-     */
-    private String value;
-
-    /**
-     * 游戏应用类型
-     */
-    private int type;
-
-    /**
-     * 获取游戏动作设置
-     *
-     * @param type 类型
-     * @return {@link String}
-     */
-    public static String getGameActionSet(int type) {
-        for (GameActionSetEnum gameActionSetEnum : GameActionSetEnum.values()) {
-            if (Objects.equals(gameActionSetEnum.getType(), type)) {
-                return gameActionSetEnum.getValue();
-            }
-        }
-        return null;
-    }
-}

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

@@ -10,7 +10,6 @@ import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
 import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
 import com.zanxiang.game.module.base.pojo.enums.GameCategoryEnum;
 import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
-import com.zanxiang.game.module.manage.enums.GameActionSetEnum;
 import com.zanxiang.game.module.manage.pojo.dto.GameAppletConfigDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameAppletDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
@@ -63,8 +62,7 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
                 .eq(GameApplet::getGameId, game.getId())
         );
         if (gameApplet == null) {
-            this.createActionSet(game.getCategory(), game.getIsPut(), gameAppletConfigDTO.getAppId(),
-                    game.getName(), gameAppletConfigDTO.getType());
+            this.createActionSet(game.getCategory(), game.getIsPut(), gameAppletConfigDTO.getAppId(), game.getName());
             gameApplet = GameApplet.builder()
                     .gameId(game.getId())
                     .appId(gameAppletConfigDTO.getAppId())
@@ -109,17 +107,12 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
                     JsonUtil.toString(gameDTO), JsonUtil.toString(gameAppletDTO));
             return Boolean.FALSE;
         }
-        return this.createActionSet(gameDTO.getCategory(), gameDTO.getIsPut(), gameAppletDTO.getAppId(),
-                gameDTO.getName(), gameAppletDTO.getType());
+        return this.createActionSet(gameDTO.getCategory(), gameDTO.getIsPut(), gameAppletDTO.getAppId(), gameDTO.getName());
     }
 
-    private Boolean createActionSet(Long gameCategory, Boolean isPut, String appId, String gameName, Integer type) {
+    private Boolean createActionSet(Long gameCategory, Boolean isPut, String appId, String gameName) {
         CreateUserActionSetRpcDTO actionSetRpcDTO = CreateUserActionSetRpcDTO.builder()
-                .appId(appId)
-                .type(GameActionSetEnum.getGameActionSet(type))
-                .name(gameName + "数据源")
-                .wechatAppId(appId)
-                .build();
+                .appId(appId).type("WEB").name(gameName + "Web数据源").build();
         //小游戏和H5的类型才需要创建数据源
         List<Long> categoryList = Arrays.asList(GameCategoryEnum.CATEGORY_WX_APPLET.getId(), GameCategoryEnum.CATEGORY_H5.getId());
         //投放的游戏才需要设置数据源