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

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/rpc/ITencentMiniGameBackRpc.java

@@ -53,5 +53,5 @@ public interface ITencentMiniGameBackRpc {
     /**
      * 根据openId匹配监测链接
      */
-    ResultVO<Map<String, Object>> getCallBackByOpenId(Long gameId, String wechatOpenid);
+    ResultVO<Map<String, String>> getCallBackByOpenId(Long gameId, String wechatOpenid);
 }

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("微信小游戏投腾讯广告新增openId监测链接匹配-01 (´･･)ﾉ(._.`)  \n" +
+        System.out.println("微信小游戏投腾讯广告新增openId监测链接匹配-02 (´･･)ﾉ(._.`)  \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentMiniGameBackRpcImpl.java

@@ -397,8 +397,8 @@ public class TencentMiniGameBackRpcImpl implements ITencentMiniGameBackRpc {
     }
 
     @Override
-    public ResultVO<Map<String, Object>> getCallBackByOpenId(Long gameId, String wechatOpenid) {
-        Map<String, Object> map = null;
+    public ResultVO<Map<String, String>> getCallBackByOpenId(Long gameId, String wechatOpenid) {
+        Map<String, String> map = null;
         try {
             map = gameTencentMiniGameCallbackService.getCallBackByOpenId(gameId, wechatOpenid);
         } catch (Exception e) {

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

@@ -14,5 +14,5 @@ public interface IGameTencentMiniGameCallbackService extends IService<GameTencen
 
     String getCallBackUrl(Long gameId, String wechatOpenid, String clickId, LocalDateTime registerTime, boolean matchTime);
 
-    Map<String, Object> getCallBackByOpenId(Long gameId, String wechatOpenid);
+    Map<String, String> getCallBackByOpenId(Long gameId, String wechatOpenid);
 }

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

@@ -222,7 +222,7 @@ public class GameTencentMiniGameCallbackServiceImpl extends ServiceImpl<GameTenc
     }
 
     @Override
-    public Map<String, Object> getCallBackByOpenId(Long gameId, String wechatOpenid) {
+    public Map<String, String> getCallBackByOpenId(Long gameId, String wechatOpenid) {
         //查询监测链接
         GameTencentMiniGameCallback tencentMiniGameCallback = super.getOne(
                 new LambdaQueryWrapper<GameTencentMiniGameCallback>()
@@ -234,12 +234,12 @@ public class GameTencentMiniGameCallbackServiceImpl extends ServiceImpl<GameTenc
         if (tencentMiniGameCallback == null) {
             return null;
         }
-        Map<String, Object> map = new HashMap<>(5);
-        map.put("id", tencentMiniGameCallback.getId());
-        map.put("gameId", tencentMiniGameCallback.getGameId());
-        map.put("accountId", tencentMiniGameCallback.getAccountId());
+        Map<String, String> map = new HashMap<>(5);
+        map.put("id", tencentMiniGameCallback.getId().toString());
+        map.put("gameId", tencentMiniGameCallback.getGameId().toString());
+        map.put("accountId", tencentMiniGameCallback.getAccountId().toString());
         map.put("agentKey", tencentMiniGameCallback.getAgentKey());
-        map.put("adgroupId", tencentMiniGameCallback.getAdgroupId());
+        map.put("adgroupId", tencentMiniGameCallback.getAdgroupId().toString());
         map.put("impressionId", tencentMiniGameCallback.getImpressionId());
         return map;
     }