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

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/controller/api/OceanengineCallbackApi.java

@@ -32,13 +32,13 @@ public class OceanengineCallbackApi {
     // &ua=__UA__&geo=__GEO__&ts=__TS__&callbackParam=__CALLBACK_PARAM__&callbackUrl=__CALLBACK_URL__&model=__MODEL__&unionSite=__UNION_SITE__&caid=__CAID__&productid=__PRODUCTID__&outerid=__OUTERID__
     @GetMapping("/app/callBack")
     public ResultVO<Boolean> appCallback(GameOceanengineAppCallbackDTO dto) {
-        log.info("头条-APP监测链接：{}", JsonUtil.toString(dto));
+        log.info("头条APP监测链接：{}", JsonUtil.toString(dto));
         return ResultVO.ok(gameOceanengineAppCallbackService.callback(dto));
     }
 
     @GetMapping("/miniGame/callback")
     public ResultVO<Boolean> callback(GameOceanengineCallbackDTO dto) {
-        log.info("头条-微信小游戏监测链接：{}", JsonUtil.toString(dto));
+        log.info("头条微信小游戏监测链接：{}", JsonUtil.toString(dto));
         return ResultVO.ok(gameOceanengineCallbackService.callback(dto));
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/api/TencentCallbackApi.java

@@ -35,13 +35,19 @@ public class TencentCallbackApi {
     // &encryptedPositionId=__ENCRYPTED_POSITION_ID__&ipv6=__IPV6__&hashOaid=__HASH_OAID__&&caid=__QAID_CAA__&ipMd5=__IP_MD5__&ipv6Md5=__IPV6_MD5__
     @GetMapping("/app/callback")
     public ResultVO<Boolean> appCallback(GameTencentAppCallbackDTO dto) {
-        log.info("腾讯-APP 监测链接：{}", JsonUtil.toString(dto));
+        log.info("腾讯APP监测链接：{}", JsonUtil.toString(dto));
         return ResultVO.ok(gameTencentAppCallbackService.callback(dto));
     }
 
+    // https://api.zanxiangwl.com/gameBack/api/tencentCallback/miniGame/callback
+    // ?clickId=__CLICK_ID__&clickTime=__CLICK_TIME__&adgroupId=__ADGROUP_ID__&dynamicCreativeId=__DYNAMIC_CREATIVE_ID__
+    // &marketingAssetId=__MARKETING_ASSET_ID__&materialPackageId=__MATERIAL_PACKAGE_ID__&adPlatformType=__AD_PLATFORM_TYPE__
+    // &accountId=__ACCOUNT_ID__&agencyId=__AGENCY_ID__&clickSkuId=__CLICK_SKU_ID__&deviceOsType=__DEVICE_OS_TYPE__
+    // &processTime=__PROCESS_TIME__&requestId=__REQUEST_ID__&impressionId=__IMPRESSION_ID__&ip=__IP__&userAgent=__USER_AGENT__
+    // &callback=__CALLBACK__&encryptedPositionId=__ENCRYPTED_POSITION_ID__&ipv6=__IPV6__&ipMd5=__IP_MD5__&ipv6Md5=__IPV6_MD5__
     @GetMapping("/miniGame/callback")
     public ResultVO<Boolean> miniGameCallback(GameTencentCallbackDTO dto) {
-        log.info("腾讯-小游戏 监测链接：{}", JsonUtil.toString(dto));
+        log.info("腾讯小游戏监测链接：{}", JsonUtil.toString(dto));
         return ResultVO.ok(gameTencentMiniGameCallbackService.callback(dto));
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineCallback.java

@@ -14,7 +14,7 @@ import java.time.LocalDate;
 /**
  * @author : lingfeng
  * @time : 2025-01-10
- * @description : 头条游戏 APP 监测链接回传数据(文档：https://open.oceanengine.com/labels/7/docs/1696710655781900)
+ * @description : 头条游戏 小游戏 监测链接回传数据(文档：https://open.oceanengine.com/labels/7/docs/1696710655781900)
  */
 @Data
 @NoArgsConstructor

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentMiniGameCallback.java

@@ -14,7 +14,7 @@ import java.time.LocalDate;
 /**
  * @author : lingfeng
  * @time : 2025-01-10
- * @description : 腾讯游戏 APP 监测链接回传数据(文档：https://datanexus.qq.com/doc/develop/guider/interface/conversion/ad_track_click#5-%E5%AD%97%E6%AE%B5%E5%88%97%E8%A1%A8)
+ * @description : 腾讯游戏 微信小游戏 监测链接回传数据(文档：https://datanexus.qq.com/doc/develop/guider/interface/conversion/ad_track_click#5-%E5%AD%97%E6%AE%B5%E5%88%97%E8%A1%A8)
  */
 @Data
 @NoArgsConstructor

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/task/CallbackClearTask.java

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zanxiang.game.back.base.ServerInfo;
 import com.zanxiang.game.back.serve.config.NacosDynamicParamConfig;
 import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineAppCallback;
+import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineCallback;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppCallback;
+import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameCallback;
 import com.zanxiang.game.back.serve.service.IGameOceanengineAppCallbackService;
+import com.zanxiang.game.back.serve.service.IGameOceanengineCallbackService;
 import com.zanxiang.game.back.serve.service.IGameTencentAppCallbackService;
-import com.zanxiang.module.redis.service.IDistributedLockComponent;
+import com.zanxiang.game.back.serve.service.IGameTencentMiniGameCallbackService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -18,17 +21,24 @@ import java.time.LocalDate;
 @Slf4j
 @Component
 public class CallbackClearTask {
+
     private static final String CLEAR_KEY = ServerInfo.SERVER_NAME + ":CALLBACK_DATA_CLEAR";
 
     @Autowired
     private NacosDynamicParamConfig nacosDynamicParamConfig;
-    @Autowired
-    private IDistributedLockComponent distributedLockComponent;
+
     @Autowired
     private IGameOceanengineAppCallbackService gameOceanengineAppCallbackService;
+
     @Autowired
     private IGameTencentAppCallbackService gameTencentAppCallbackService;
 
+    @Autowired
+    private IGameTencentMiniGameCallbackService gameTencentMiniGameCallbackService;
+
+    @Autowired
+    private IGameOceanengineCallbackService gameOceanengineCallbackService;
+
     /**
      * 每天凌晨 2点清理一次 15天前的监测链接数据
      */
@@ -36,6 +46,7 @@ public class CallbackClearTask {
     public void execute() {
         log.error("开始清理监测链接的日志");
         try {
+            //头条-APP
             gameOceanengineAppCallbackService.remove(new LambdaQueryWrapper<GameOceanengineAppCallback>()
                     .lt(GameOceanengineAppCallback::getDay, LocalDate.now().minusDays(nacosDynamicParamConfig.getCallbackClearDay()))
             );
@@ -43,11 +54,28 @@ public class CallbackClearTask {
             log.error(e.getMessage(), e);
         }
         try {
+            //腾讯-APP
             gameTencentAppCallbackService.remove(new LambdaQueryWrapper<GameTencentAppCallback>()
                     .lt(GameTencentAppCallback::getDay, LocalDate.now().minusDays(nacosDynamicParamConfig.getCallbackClearDay()))
             );
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
+        try {
+            //头条-微信小游戏
+            gameOceanengineCallbackService.remove(new LambdaQueryWrapper<GameOceanengineCallback>()
+                    .lt(GameOceanengineCallback::getDay, LocalDate.now().minusDays(nacosDynamicParamConfig.getCallbackClearDay()))
+            );
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        try {
+            //腾讯-微信小游戏
+            gameTencentMiniGameCallbackService.remove(new LambdaQueryWrapper<GameTencentMiniGameCallback>()
+                    .lt(GameTencentMiniGameCallback::getDay, LocalDate.now().minusDays(nacosDynamicParamConfig.getCallbackClearDay()))
+            );
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
     }
 }