Merge remote-tracking branch 'origin/package' into package

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/GameBackApplication.java

@@ -18,7 +18,7 @@ public class GameBackApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GameBackApplication.class, args);
-        System.out.println("腾讯广告新增监测链接注册回传(排除已经在游戏里面注册的人) (´･･)ﾉ(._.`)  \n" +
+        System.out.println("腾讯广告新增监测链接注册回传(去除监测链接回传注册) (´･･)ﾉ(._.`)  \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameCallbackServiceImpl.java

@@ -84,12 +84,6 @@ public class GameTencentMiniGameCallbackServiceImpl extends ServiceImpl<GameTenc
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
-        //监测链接执行注册回传
-        try {
-            this.linkCallBack(callback, agent);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
         return true;
     }
 

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameUserServiceImpl.java

@@ -147,13 +147,6 @@ public class GameTencentMiniGameUserServiceImpl extends ServiceImpl<GameTencentM
             //返回注册已回传
             return Tuple2.with(BackStatusEnum.NO, null);
         }
-        //判断回传是否正在执行中
-        String lockKey = com.zanxiang.game.back.base.ServerInfo.SERVER_NAME + ":tencentMiniLinkCallBack:"
-                + userLog.getGameId() + ":" + userLog.getAdAccountId() + ":"
-                + userLog.getWechatAppId() + ":" + userLog.getWechatOpenid();
-        if (!distributedLockComponent.doLock(lockKey, 0L, 1L, TimeUnit.SECONDS)) {
-            return Tuple2.with(BackStatusEnum.NO, null);
-        }
         //回传策略
         GameBackPolicy gameBackPolicy = userLog.getBackPolicyId() == null ? null
                 : gameBackPolicyService.getById(userLog.getBackPolicyId());

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

@@ -25,7 +25,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <角色绑定手机号, 判断是否重复操作01> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <媒体SDK玩家沉默唤起回传排除角色限制> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -15,7 +15,6 @@ import com.zanxiang.game.back.base.rpc.ITencentMiniGameBackRpc;
 import com.zanxiang.game.back.base.rpc.ITtAppBackRpc;
 import com.zanxiang.game.module.base.pojo.enums.AccountTypeEnum;
 import com.zanxiang.game.module.base.pojo.enums.GameCategoryEnum;
-import com.zanxiang.game.module.base.pojo.enums.PayDeviceEnum;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.mybatis.mapper.GameBackLogMediaSdkMapper;
 import com.zanxiang.game.module.sdk.constant.RedisKeyConstant;
@@ -320,7 +319,7 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
                 resultMap.put("callBack", Boolean.TRUE);
                 break;
             case CALL_BACK_RE_ACTIVE:
-                Tuple3<Boolean, Long, String> tuple = this.callBackReActiveCheck(roleId, userId, gameId);
+                Tuple3<Boolean, Long, String> tuple = this.callBackReActiveCheck(userId, gameId);
                 resultMap.put("callBack", tuple.first);
                 resultMap.put("backFlowDay", tuple.second);
                 resultMap.put("backMsg", tuple.third);
@@ -399,12 +398,11 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
         return Tuple2.with(Boolean.TRUE, "执行回传");
     }
 
-    private Tuple3<Boolean, Long, String> callBackReActiveCheck(String roleId, Long userId, Long gameId) {
+    private Tuple3<Boolean, Long, String> callBackReActiveCheck(Long userId, Long gameId) {
         //判断玩家今日是否已经沉默唤起回传
         if (super.count(new LambdaQueryWrapper<GameBackLogMediaSdk>()
                 .eq(GameBackLogMediaSdk::getGameId, gameId)
                 .eq(GameBackLogMediaSdk::getUserId, userId)
-                .eq(GameBackLogMediaSdk::getRoleId, roleId)
                 .eq(GameBackLogMediaSdk::getCallBackTypeEnum, CallBackTypeEnum.CALL_BACK_RE_ACTIVE.getValue())
                 .ge(GameBackLogMediaSdk::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
         ) > 0) {