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

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("腾讯广告新增监测链接注册回传(监测链接接口优化-02) (´･･)ﾉ(._.`)  \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

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

@@ -1,7 +1,6 @@
 package com.zanxiang.game.back.serve.controller.api;
 
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentAppCallbackDTO;
-import com.zanxiang.game.back.serve.pojo.dto.GameTencentCallbackDTO;
 import com.zanxiang.game.back.serve.service.IGameTencentAppCallbackService;
 import com.zanxiang.game.back.serve.service.IGameTencentMiniGameCallbackService;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -9,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
@@ -46,7 +46,7 @@ public class TencentCallbackApi {
     // &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(Map<String, Object> paramMap) {
+    public ResultVO<Boolean> miniGameCallback(@RequestParam Map<String, Object> paramMap) {
         return ResultVO.ok(gameTencentMiniGameCallbackService.callback(paramMap));
     }
 }

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

@@ -85,7 +85,7 @@ public class GameTencentMiniGameCallbackServiceImpl extends ServiceImpl<GameTenc
             } else {
                 callback.setAgentKey("-");
                 callback.setGameId(-1L);
-                log.error("腾讯检测链接数据找不到渠道：{}", JsonUtil.toString(callback));
+                log.error("腾讯检测链接数据找不到渠道, callback ：{}, paramMap : {}", JsonUtil.toString(callback), JsonUtil.toString(paramMap));
             }
             callback.setDay(callback.getClickTime() == null || callback.getClickTime() < 1000 ? LocalDate.now() : DateUtil.secondToLocalDate(callback.getClickTime()));
             save(callback);