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

@@ -2,6 +2,7 @@ package com.zanxiang.game.back.serve.controller.api;
 
 import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineAppCallbackDTO;
 import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineCallbackDTO;
+import com.zanxiang.game.back.serve.service.GameOceanengineAppCallbackXgltService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineAppCallbackService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineCallbackService;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -9,8 +10,11 @@ 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;
+
 /**
  * 头条监测链接
  */
@@ -25,10 +29,25 @@ public class OceanengineCallbackApi {
     @Autowired
     private IGameOceanengineAppCallbackService gameOceanengineAppCallbackService;
 
-    // https://api.zanxiangwl.com/gameBack/api/oceanengineCallback/callback?promotionid=__PROMOTION_ID__&projectId=__PROJECT_ID__&mid1=__MID1__&mid2=__MID2__&mid3=__MID3__&mid4=__MID4__&mid5=__MID5__&mid6=__MID6__
-    // &aid=__AID__&cid=__CID__&campaignId=__CAMPAIGN_ID__&ctype=__CTYPE__&advertiserId=__ADVERTISER_ID__&csite=__CSITE__&convertId=__CONVERT_ID__&requestId=__REQUEST_ID__&trackId=__TRACK_ID__&sl=__SL__
-    // &imei=__imei__&idfa=__IDFA__&idfaMd5=__IDFA_MD5__&androidid=__ANDROIDID__&oaid=__OAID__&oaidMd5=__OAID_MD5__&os=__OS__&mac=__MAC__&mac1=MAC1&ipv4=__IPV4__&ipv6=__ipv6__&ip=__IP__
-    // &ua=__UA__&geo=__GEO__&ts=__TS__&callbackParam=__CALLBACK_PARAM__&callbackUrl=__CALLBACK_URL__&model=__MODEL__&unionSite=__UNION_SITE__&caid=__CAID__&productid=__PRODUCTID__&outerid=__OUTERID__
+    @Autowired
+    private GameOceanengineAppCallbackXgltService gameOceanengineAppCallbackXgltService;
+
+    // https://api.zanxiangwl.com/gameBack/api/oceanengineCallback/app/xglt/callBack?ts=__TS__&os=__OS__&ua=__UA__
+    // &demandId=__DEMAND_ID__&ip=__IP__&ipv6=__IPV6__&model=__MODEL__&itemId=__ITEM_ID__&mid3=__MID3__
+    // &callbackParam=__CALLBACK_PARAM__&imeiMd5=__IMEI_MD5__&idfaMd5=__IDFA_MD5__&oaidMd5=__OAID_MD5__
+    // &androidIdMd5=__ANDROIDID_MD5__&caidMd5=__CAID_MD5__
+    @GetMapping("/app/xglt/callBack")
+    public ResultVO<Boolean> appXgltCallback(@RequestParam Map<String, Object> paramMap) {
+        return ResultVO.ok(gameOceanengineAppCallbackXgltService.callback(paramMap));
+    }
+
+    // https://api.zanxiangwl.com/gameBack/api/oceanengineCallback/app/callBack?promotionId=__PROMOTION_ID__
+    // &projectId=__PROJECT_ID__&mid1=__MID1__&mid2=__MID2__&mid3=__MID3__&mid4=__MID4__&mid5=__MID5__&mid6=__MID6__
+    // &aid=__AID__&cid=__CID__&campaignId=__CAMPAIGN_ID__&ctype=__CTYPE__&advertiserId=__ADVERTISER_ID__
+    // &csite=__CSITE__&convertId=__CONVERT_ID__&requestId=__REQUEST_ID__&trackId=__TRACK_ID__&sl=__SL__
+    // &idfa=__IDFA__&idfaMd5=__IDFA_MD5__&androidid=__ANDROIDID__&oaid=__OAID__&oaidMd5=__OAID_MD5__&os=__OS__
+    // &mac=__MAC__&mac1=MAC1&ipv4=__IPV4__&ip=__IP__&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) {
         return ResultVO.ok(gameOceanengineAppCallbackService.callback(dto));

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

@@ -1,6 +1,5 @@
 package com.zanxiang.game.back.serve.service.impl;
 
-import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.back.serve.dao.mapper.GameOceanengineAppCallbackXgltMapper;
@@ -13,6 +12,7 @@ import com.zanxiang.game.module.base.rpc.IAgentRpc;
 import com.zanxiang.module.util.DateUtil;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.URIUtil;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;