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

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAddParam.java

@@ -64,6 +64,24 @@ public class GameAddParam {
     @ApiModelProperty(notes = "游戏应用类型")
     private Long category;
 
+    /**
+     * H5游戏跳转地址
+     */
+    @ApiModelProperty(notes = "H5游戏跳转地址, 游戏类型为H5时必填")
+    private String h5GameUrl;
+
+    /**
+     * H5游戏登录logo图片
+     */
+    @ApiModelProperty(notes = "H5游戏登录logo图片, 游戏类型为H5时必填")
+    private String h5LoginLogo;
+
+    /**
+     * 游戏是否投放
+     */
+    @ApiModelProperty(notes = "游戏是否投放")
+    private Boolean isPut;
+
     /**
      * 父游戏id
      */

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

@@ -116,6 +116,24 @@ public class GameListVO {
     @ApiModelProperty(notes = "支付方式列表")
     private List<GamePayWayVO> gamePayWayList;
 
+    /**
+     * H5游戏跳转地址
+     */
+    @ApiModelProperty(notes = "H5游戏跳转地址")
+    private String h5GameUrl;
+
+    /**
+     * H5游戏登录logo图片
+     */
+    @ApiModelProperty(notes = "H5游戏登录logo图片")
+    private String h5LoginLogo;
+
+    /**
+     * 游戏是否投放
+     */
+    @ApiModelProperty(notes = "游戏是否投放")
+    private Boolean isPut;
+
     /**
      * 游戏备注
      */

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

@@ -55,7 +55,9 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
     @Override
     public boolean addOrUpdate(Game game, GameAppletConfigDTO gameAppletConfigDTO) {
         GameApplet gameApplet = super.getOne(new LambdaQueryWrapper<GameApplet>()
-                .eq(GameApplet::getAppId, gameAppletConfigDTO.getAppId()));
+                .eq(GameApplet::getAppId, gameAppletConfigDTO.getAppId())
+                .eq(GameApplet::getGameId, game.getId())
+        );
         if (gameApplet == null) {
             CreateUserActionSetRpcDTO actionSetRpcDTO = CreateUserActionSetRpcDTO.builder()
                     .appId(gameAppletConfigDTO.getAppId())

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

@@ -74,6 +74,9 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
                     .h5GameId(param.getH5GameId())
                     .guideGameId(param.getGuideGameId())
                     .remark(param.getRemark())
+                    .h5GameUrl(param.getH5GameUrl())
+                    .h5LoginLogo(param.getH5LoginLogo())
+                    .isPut(param.getIsPut())
                     .createTime(LocalDateTime.now())
                     .updateTime(LocalDateTime.now())
                     .build();
@@ -86,6 +89,9 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
             game.setH5GameId(param.getH5GameId());
             game.setGuideGameId(param.getGuideGameId());
             game.setRemark(param.getRemark());
+            game.setH5GameUrl(param.getH5GameUrl());
+            game.setH5LoginLogo(param.getH5LoginLogo());
+            game.setIsPut(param.getIsPut());
             game.setUpdateTime(LocalDateTime.now());
         }
         if (!Objects.equals(param.getIsParentGame(), Boolean.TRUE) && param.getParentGameId() != null) {

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/Game.java

@@ -42,6 +42,21 @@ public class Game implements Serializable {
      */
     private Long category;
 
+    /**
+     * H5游戏跳转地址
+     */
+    private String h5GameUrl;
+
+    /**
+     * H5游戏登录logo图片
+     */
+    private String h5LoginLogo;
+
+    /**
+     * 游戏是否投放
+     */
+    private Boolean isPut;
+
     /**
      * 游戏标签
      */

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/pojo/vo/GameAppletVO.java

@@ -18,9 +18,9 @@ import lombok.NoArgsConstructor;
 public class GameAppletVO {
 
     /**
-     * 微信小游戏appId
+     * 应用appId
      */
-    @ApiModelProperty(notes = "微信小游戏appId")
+    @ApiModelProperty(notes = "应用appId")
     private String appId;
 
     /**

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/pojo/vo/GameInitVO.java

@@ -0,0 +1,43 @@
+package com.zanxiang.game.module.sdk.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-29
+ * @description : 游戏初始化
+ */
+@Data
+public class GameInitVO {
+
+    /**
+     * 游戏名称
+     */
+    @ApiModelProperty(notes = "游戏名称")
+    private String gameName;
+
+    /**
+     * 游戏应用(小游戏/公众号)appId
+     */
+    @ApiModelProperty(notes = "游戏应用(小游戏/公众号)appId")
+    private String appId;
+
+    /**
+     * H5游戏是否使用应用授权登录
+     */
+    @ApiModelProperty(notes = "H5游戏是否使用应用授权登录")
+    private Boolean isPut;
+
+    /**
+     * H5游戏跳转地址
+     */
+    @ApiModelProperty(notes = "H5游戏跳转地址")
+    private String h5GameUrl;
+
+    /**
+     * H5游戏登录logo图片
+     */
+    @ApiModelProperty(notes = "H5游戏跳转地址")
+    private String h5LoginLogo;
+}

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

@@ -98,17 +98,21 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
 
     @Override
     public Boolean userTokenExpireTimeCheck(UserData userData) {
-        //验证ip是否封禁
+        //判断是否存在用户id或者token是否存在
+        if (userData.getUserId() == null || Strings.isBlank(userData.getToken())) {
+            return Boolean.FALSE;
+        }
+        //判断是否ip封禁
         if (ipBanService.checkIpBan(userData.getIp())) {
             return Boolean.FALSE;
         }
         //查询用户信息
-        if (userData.getUserId() != null) {
-            User user = userService.getById(userData.getUserId());
-            //判断账号是否停用
-            if (user != null && Objects.equals(BanStatusEnum.BAN_STATUS.getStatus(), user.getStatus())) {
-                return Boolean.FALSE;
-            }
+        User user = userService.getOne(new LambdaQueryWrapper<User>()
+                .eq(User::getId, userData.getUserId())
+                .eq(User::getGameId, userData.getGameId()));
+        //判断账号是否存在,或者停用
+        if (user == null || Objects.equals(BanStatusEnum.BAN_STATUS.getStatus(), user.getStatus())) {
+            return Boolean.FALSE;
         }
         //token检测
         Long expireTime = userData.getExpireTime();