1

src/main/java/com/adx/tencent/httpapi/TrackingController.java

@@ -265,9 +265,9 @@ public class TrackingController {
         if (placement.getBidFloor() > 0) imp.put("bidFloor", placement.getBidFloor());
 
         Map<String, Object> device = new LinkedHashMap<>();
-        // 仅 dev/test 环境允许通过 ip 参数覆盖（本地测试用）
-        String ip = allowIpOverride ? params.get("ip") : null;
-        device.put("ip", (ip != null && !ip.isBlank()) ? ip : clientIp(request));
+        // S2S架构：腾讯服务器回调，真实用户IP通过参数传递，优先使用参数中的IP
+        String paramIp = params.get("ip");
+        device.put("ip", (paramIp != null && !paramIp.isBlank()) ? paramIp : clientIp(request));
         // 优先使用真实设备UA，无则使用默认UA
         String ua = firstParam(params, "ua", "user_agent", "useragent");
         device.put("ua", (ua != null && !ua.isBlank()) ? ua : AdxClient.BAIDU_USER_AGENT);
@@ -319,11 +319,11 @@ public class TrackingController {
         putUid(uid, "did", firstParam(p, "did", "imei"));
         putUid(uid, "didMd5", firstParam(p, "did_md5", "didMd5", "imei_md5", "imeiMd5"));
         putUid(uid, "dpid", firstParam(p, "dpid", "android_id", "androidId"));
-        putUid(uid, "dpidMd5", firstParam(p, "dpid_md5", "dpidMd5", "android_id_md5", "androidIdMd5"));
+        putUid(uid, "dpidMd5", firstParam(p, "dpid_md5", "dpidMd5", "android_id_md5", "androidIdMd5", "hash_android_id"));
         putUid(uid, "idfa", p.get("idfa"));
         putUid(uid, "idfaMd5", firstParam(p, "idfa_md5", "idfaMd5"));
         putUid(uid, "oaid", p.get("oaid"));
-        putUid(uid, "oaidMd5", firstParam(p, "oaid_md5", "oaidMd5"));
+        putUid(uid, "oaidMd5", firstParam(p, "oaid_md5", "oaidMd5", "hash_oaid"));
         return uid;
     }