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

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服务启动成功 <腾讯媒体sdk调试解决SQL查询问题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

@@ -104,7 +104,7 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
         //线程锁
         String lockKey = this.getLockKey(param, userData.getUserId());
         //上锁
-        if (!distributedLockComponent.doLock(lockKey, 0L, 1L, TimeUnit.MINUTES)) {
+        if (!distributedLockComponent.doLock(lockKey, 0L, 20L, TimeUnit.SECONDS)) {
             log.error("重复请求触发线程锁, 直接返回false, lockKey : {}", lockKey);
             return resultMap;
         }
@@ -114,9 +114,6 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
         } catch (Exception e) {
             log.error("事件回传判断, 出现异常, param : {},  userData : {}, e : {}",
                     JsonUtil.toString(param), JsonUtil.toString(userData), e.getMessage(), e);
-        } finally {
-            //释放线程锁
-            distributedLockComponent.unlock(lockKey);
         }
         //返回结果
         return resultMap;
@@ -172,31 +169,14 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
         ) <= 0) {
             return false;
         }
-
-        log.error("特殊日志001------> " + param.getCallBackTypeEnum().getValue());
-
         //判断沉默唤起回传, 新手引导回传, 是否已经执行, 不重复执行
         if (Objects.equals(param.getCallBackTypeEnum(), CallBackTypeEnum.CALL_BACK_RE_ACTIVE)
                 || Objects.equals(param.getCallBackTypeEnum(), CallBackTypeEnum.CALL_BACK_TUTORIAL_FINISH)) {
-
-            log.error("特殊日志002------> " + user.getId() + "_" + user.getGameId());
-
-            int count = super.count(new LambdaQueryWrapper<GameBackLogMediaSdk>()
-                    .eq(GameBackLogMediaSdk::getGameId, user.getGameId())
-                    .eq(GameBackLogMediaSdk::getUserId, user.getId())
-                    .eq(GameBackLogMediaSdk::getCallBackTypeEnum, param.getCallBackTypeEnum().getValue())
-            );
-            log.error("特殊日志003------> " + count);
-
-
             if (super.count(new LambdaQueryWrapper<GameBackLogMediaSdk>()
                     .eq(GameBackLogMediaSdk::getGameId, user.getGameId())
                     .eq(GameBackLogMediaSdk::getUserId, user.getId())
                     .eq(GameBackLogMediaSdk::getCallBackTypeEnum, param.getCallBackTypeEnum().getValue())
             ) > 0) {
-
-                log.error("特殊日志004------> ");
-
                 return false;
             }
         }