1

src/main/java/com/adx/tencent/baidu/ConversionClient.java

@@ -3,6 +3,8 @@ package com.adx.tencent.baidu;
 import com.adx.tencent.baidu.model.ConversionQuery;
 import com.adx.tencent.baidu.model.ConversionResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -25,6 +27,7 @@ import java.util.Map;
 public class ConversionClient {
 
     private static final String PAYMENT_PATH = "/media/order-stimulate/payment";
+    private static final Logger log = LoggerFactory.getLogger(ConversionClient.class);
 
     private final String baseUrl;
     private final String customerName;
@@ -87,6 +90,9 @@ public class ConversionClient {
                 .build();
 
         HttpResponse<byte[]> response = httpClient.send(request, HttpResponse.BodyHandlers.ofByteArray());
+/*        log.info("[BaiduConversion] queryPayments response: status={}, body={}",
+                response.statusCode(),
+                new String(response.body(), java.nio.charset.StandardCharsets.UTF_8));*/
         if (response.statusCode() < 200 || response.statusCode() >= 300) {
             throw new IOException("Baidu conversion HTTP status: " + response.statusCode());
         }

src/main/java/com/adx/tencent/config/AppProperties.java

@@ -79,7 +79,7 @@ public class AppProperties {
     private Duration conversionSyncInterval = Duration.ofSeconds(300);
     private int conversionSyncDateOffsetDays = 0;
     private int conversionSyncPageSize = 1;
-    private List<Integer> conversionSyncActs = List.of(1, 2, 3, 4, 5, 6, 8);
+    private List<Integer> conversionSyncActs = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 2001);
 
     // Callback Retry
     private boolean callbackRetryEnabled = false;
@@ -101,159 +101,419 @@ public class AppProperties {
 
     // ───── getters / setters ─────
 
-    public String getPort() { return port; }
-    public void setPort(String port) { this.port = port; }
+    public String getPort() {
+        return port;
+    }
+
+    public void setPort(String port) {
+        this.port = port;
+    }
+
+    public String getBaiduAdxEndpoint() {
+        return baiduAdxEndpoint;
+    }
+
+    public void setBaiduAdxEndpoint(String v) {
+        this.baiduAdxEndpoint = v;
+    }
+
+    public String getBaiduConversionBaseUrl() {
+        return baiduConversionBaseUrl;
+    }
+
+    public void setBaiduConversionBaseUrl(String v) {
+        this.baiduConversionBaseUrl = v;
+    }
+
+    public String getBaiduCustomerName() {
+        return baiduCustomerName;
+    }
+
+    public void setBaiduCustomerName(String v) {
+        this.baiduCustomerName = v;
+    }
+
+    public String getBaiduSecret() {
+        return baiduSecret;
+    }
+
+    public void setBaiduSecret(String v) {
+        this.baiduSecret = v;
+    }
+
+    public String getBaiduAuctionPriceEncryption() {
+        return baiduAuctionPriceEncryption;
+    }
+
+    public void setBaiduAuctionPriceEncryption(String v) {
+        this.baiduAuctionPriceEncryption = v;
+    }
+
+    public String getBaiduAuctionPriceEKey() {
+        return baiduAuctionPriceEKey;
+    }
+
+    public void setBaiduAuctionPriceEKey(String v) {
+        this.baiduAuctionPriceEKey = v;
+    }
+
+    public String getBaiduAuctionPriceIKey() {
+        return baiduAuctionPriceIKey;
+    }
+
+    public void setBaiduAuctionPriceIKey(String v) {
+        this.baiduAuctionPriceIKey = v;
+    }
+
+    public long getBaiduMediaId() {
+        return baiduMediaId;
+    }
+
+    public void setBaiduMediaId(long v) {
+        this.baiduMediaId = v;
+    }
+
+    public String getBaiduAppId() {
+        return baiduAppId;
+    }
+
+    public void setBaiduAppId(String v) {
+        this.baiduAppId = v;
+    }
+
+    public String getBaiduTagId() {
+        return baiduTagId;
+    }
+
+    public void setBaiduTagId(String v) {
+        this.baiduTagId = v;
+    }
+
+    public String getBaiduAndroidAppId() {
+        return baiduAndroidAppId;
+    }
+
+    public void setBaiduAndroidAppId(String v) {
+        this.baiduAndroidAppId = v;
+    }
+
+    public List<String> getBaiduAndroidTagIds() {
+        return baiduAndroidTagIds;
+    }
+
+    public void setBaiduAndroidTagIds(List<String> v) {
+        this.baiduAndroidTagIds = v;
+    }
+
+    public String getBaiduIosAppId() {
+        return baiduIosAppId;
+    }
+
+    public void setBaiduIosAppId(String v) {
+        this.baiduIosAppId = v;
+    }
+
+    public List<String> getBaiduIosTagIds() {
+        return baiduIosTagIds;
+    }
+
+    public void setBaiduIosTagIds(List<String> v) {
+        this.baiduIosTagIds = v;
+    }
+
+    public long getBaiduBidFloor() {
+        return baiduBidFloor;
+    }
+
+    public void setBaiduBidFloor(long v) {
+        this.baiduBidFloor = v;
+    }
+
+    public int getBaiduActionType() {
+        return baiduActionType;
+    }
+
+    public void setBaiduActionType(int v) {
+        this.baiduActionType = v;
+    }
+
+    public String getTencentApiBaseUrl() {
+        return tencentApiBaseUrl;
+    }
+
+    public void setTencentApiBaseUrl(String v) {
+        this.tencentApiBaseUrl = v;
+    }
+
+    public String getTencentAccessToken() {
+        return tencentAccessToken;
+    }
+
+    public void setTencentAccessToken(String v) {
+        this.tencentAccessToken = v;
+    }
+
+    public String getTencentAccessTokenRedisKey() {
+        return tencentAccessTokenRedisKey;
+    }
+
+    public void setTencentAccessTokenRedisKey(String v) {
+        this.tencentAccessTokenRedisKey = v;
+    }
+
+    public long getTencentAccountId() {
+        return tencentAccountId;
+    }
+
+    public void setTencentAccountId(long v) {
+        this.tencentAccountId = v;
+    }
 
-    public String getBaiduAdxEndpoint() { return baiduAdxEndpoint; }
-    public void setBaiduAdxEndpoint(String v) { this.baiduAdxEndpoint = v; }
+    public long getTencentAndroidUserActionSetId() {
+        return tencentAndroidUserActionSetId;
+    }
+
+    public void setTencentAndroidUserActionSetId(long v) {
+        this.tencentAndroidUserActionSetId = v;
+    }
+
+    public long getTencentIosUserActionSetId() {
+        return tencentIosUserActionSetId;
+    }
 
-    public String getBaiduConversionBaseUrl() { return baiduConversionBaseUrl; }
-    public void setBaiduConversionBaseUrl(String v) { this.baiduConversionBaseUrl = v; }
+    public void setTencentIosUserActionSetId(long v) {
+        this.tencentIosUserActionSetId = v;
+    }
 
-    public String getBaiduCustomerName() { return baiduCustomerName; }
-    public void setBaiduCustomerName(String v) { this.baiduCustomerName = v; }
+    public Map<Integer, String> getTencentActMap() {
+        return tencentActMap;
+    }
 
-    public String getBaiduSecret() { return baiduSecret; }
-    public void setBaiduSecret(String v) { this.baiduSecret = v; }
+    public void setTencentActMap(Map<Integer, String> v) {
+        this.tencentActMap = v;
+    }
 
-    public String getBaiduAuctionPriceEncryption() { return baiduAuctionPriceEncryption; }
-    public void setBaiduAuctionPriceEncryption(String v) { this.baiduAuctionPriceEncryption = v; }
+    public String getRedisAddr() {
+        return redisAddr;
+    }
 
-    public String getBaiduAuctionPriceEKey() { return baiduAuctionPriceEKey; }
-    public void setBaiduAuctionPriceEKey(String v) { this.baiduAuctionPriceEKey = v; }
+    public void setRedisAddr(String v) {
+        this.redisAddr = v;
+    }
 
-    public String getBaiduAuctionPriceIKey() { return baiduAuctionPriceIKey; }
-    public void setBaiduAuctionPriceIKey(String v) { this.baiduAuctionPriceIKey = v; }
+    public String getRedisUsername() {
+        return redisUsername;
+    }
 
-    public long getBaiduMediaId() { return baiduMediaId; }
-    public void setBaiduMediaId(long v) { this.baiduMediaId = v; }
+    public void setRedisUsername(String v) {
+        this.redisUsername = v;
+    }
 
-    public String getBaiduAppId() { return baiduAppId; }
-    public void setBaiduAppId(String v) { this.baiduAppId = v; }
+    public String getRedisPassword() {
+        return redisPassword;
+    }
 
-    public String getBaiduTagId() { return baiduTagId; }
-    public void setBaiduTagId(String v) { this.baiduTagId = v; }
+    public void setRedisPassword(String v) {
+        this.redisPassword = v;
+    }
 
-    public String getBaiduAndroidAppId() { return baiduAndroidAppId; }
-    public void setBaiduAndroidAppId(String v) { this.baiduAndroidAppId = v; }
+    public int getRedisDb() {
+        return redisDb;
+    }
 
-    public List<String> getBaiduAndroidTagIds() { return baiduAndroidTagIds; }
-    public void setBaiduAndroidTagIds(List<String> v) { this.baiduAndroidTagIds = v; }
+    public void setRedisDb(int v) {
+        this.redisDb = v;
+    }
+
+    public String getRedisStream() {
+        return redisStream;
+    }
+
+    public void setRedisStream(String v) {
+        this.redisStream = v;
+    }
+
+    public long getRedisStreamMaxLen() {
+        return redisStreamMaxLen;
+    }
+
+    public void setRedisStreamMaxLen(long v) {
+        this.redisStreamMaxLen = v;
+    }
+
+    public Duration getBidTtl() {
+        return bidTtl;
+    }
+
+    public void setBidTtl(Duration v) {
+        this.bidTtl = v;
+    }
+
+    public String getTidbUrl() {
+        return tidbUrl;
+    }
+
+    public void setTidbUrl(String v) {
+        this.tidbUrl = v;
+    }
+
+    public String getTidbUsername() {
+        return tidbUsername;
+    }
 
-    public String getBaiduIosAppId() { return baiduIosAppId; }
-    public void setBaiduIosAppId(String v) { this.baiduIosAppId = v; }
+    public void setTidbUsername(String v) {
+        this.tidbUsername = v;
+    }
 
-    public List<String> getBaiduIosTagIds() { return baiduIosTagIds; }
-    public void setBaiduIosTagIds(List<String> v) { this.baiduIosTagIds = v; }
+    public String getTidbPassword() {
+        return tidbPassword;
+    }
 
-    public long getBaiduBidFloor() { return baiduBidFloor; }
-    public void setBaiduBidFloor(long v) { this.baiduBidFloor = v; }
+    public void setTidbPassword(String v) {
+        this.tidbPassword = v;
+    }
 
-    public int getBaiduActionType() { return baiduActionType; }
-    public void setBaiduActionType(int v) { this.baiduActionType = v; }
+    public Duration getTaskLockTtl() {
+        return taskLockTtl;
+    }
 
-    public String getTencentApiBaseUrl() { return tencentApiBaseUrl; }
-    public void setTencentApiBaseUrl(String v) { this.tencentApiBaseUrl = v; }
+    public void setTaskLockTtl(Duration v) {
+        this.taskLockTtl = v;
+    }
 
-    public String getTencentAccessToken() { return tencentAccessToken; }
-    public void setTencentAccessToken(String v) { this.tencentAccessToken = v; }
+    public Duration getTaskLockRenewInterval() {
+        return taskLockRenewInterval;
+    }
 
-    public String getTencentAccessTokenRedisKey() { return tencentAccessTokenRedisKey; }
-    public void setTencentAccessTokenRedisKey(String v) { this.tencentAccessTokenRedisKey = v; }
+    public void setTaskLockRenewInterval(Duration v) {
+        this.taskLockRenewInterval = v;
+    }
 
-    public long getTencentAccountId() { return tencentAccountId; }
-    public void setTencentAccountId(long v) { this.tencentAccountId = v; }
+    public Duration getTaskLockRetryInterval() {
+        return taskLockRetryInterval;
+    }
 
-    public long getTencentAndroidUserActionSetId() { return tencentAndroidUserActionSetId; }
-    public void setTencentAndroidUserActionSetId(long v) { this.tencentAndroidUserActionSetId = v; }
+    public void setTaskLockRetryInterval(Duration v) {
+        this.taskLockRetryInterval = v;
+    }
 
-    public long getTencentIosUserActionSetId() { return tencentIosUserActionSetId; }
-    public void setTencentIosUserActionSetId(long v) { this.tencentIosUserActionSetId = v; }
+    public boolean isSkipLeaderElection() {
+        return skipLeaderElection;
+    }
 
-    public Map<Integer, String> getTencentActMap() { return tencentActMap; }
-    public void setTencentActMap(Map<Integer, String> v) { this.tencentActMap = v; }
+    public void setSkipLeaderElection(boolean v) {
+        this.skipLeaderElection = v;
+    }
 
-    public String getRedisAddr() { return redisAddr; }
-    public void setRedisAddr(String v) { this.redisAddr = v; }
+    public String getWorkerGroup() {
+        return workerGroup;
+    }
 
-    public String getRedisUsername() { return redisUsername; }
-    public void setRedisUsername(String v) { this.redisUsername = v; }
+    public void setWorkerGroup(String v) {
+        this.workerGroup = v;
+    }
 
-    public String getRedisPassword() { return redisPassword; }
-    public void setRedisPassword(String v) { this.redisPassword = v; }
+    public String getWorkerConsumer() {
+        return workerConsumer;
+    }
 
-    public int getRedisDb() { return redisDb; }
-    public void setRedisDb(int v) { this.redisDb = v; }
+    public void setWorkerConsumer(String v) {
+        this.workerConsumer = v;
+    }
 
-    public String getRedisStream() { return redisStream; }
-    public void setRedisStream(String v) { this.redisStream = v; }
+    public int getWorkerBatch() {
+        return workerBatch;
+    }
 
-    public long getRedisStreamMaxLen() { return redisStreamMaxLen; }
-    public void setRedisStreamMaxLen(long v) { this.redisStreamMaxLen = v; }
+    public void setWorkerBatch(int v) {
+        this.workerBatch = v;
+    }
 
-    public Duration getBidTtl() { return bidTtl; }
-    public void setBidTtl(Duration v) { this.bidTtl = v; }
+    public boolean isConversionSyncEnabled() {
+        return conversionSyncEnabled;
+    }
 
-    public String getTidbUrl() { return tidbUrl; }
-    public void setTidbUrl(String v) { this.tidbUrl = v; }
+    public void setConversionSyncEnabled(boolean v) {
+        this.conversionSyncEnabled = v;
+    }
 
-    public String getTidbUsername() { return tidbUsername; }
-    public void setTidbUsername(String v) { this.tidbUsername = v; }
+    public Duration getConversionSyncInterval() {
+        return conversionSyncInterval;
+    }
 
-    public String getTidbPassword() { return tidbPassword; }
-    public void setTidbPassword(String v) { this.tidbPassword = v; }
+    public void setConversionSyncInterval(Duration v) {
+        this.conversionSyncInterval = v;
+    }
 
-    public Duration getTaskLockTtl() { return taskLockTtl; }
-    public void setTaskLockTtl(Duration v) { this.taskLockTtl = v; }
+    public int getConversionSyncDateOffsetDays() {
+        return conversionSyncDateOffsetDays;
+    }
 
-    public Duration getTaskLockRenewInterval() { return taskLockRenewInterval; }
-    public void setTaskLockRenewInterval(Duration v) { this.taskLockRenewInterval = v; }
+    public void setConversionSyncDateOffsetDays(int v) {
+        this.conversionSyncDateOffsetDays = v;
+    }
 
-    public Duration getTaskLockRetryInterval() { return taskLockRetryInterval; }
-    public void setTaskLockRetryInterval(Duration v) { this.taskLockRetryInterval = v; }
+    public int getConversionSyncPageSize() {
+        return conversionSyncPageSize;
+    }
 
-    public boolean isSkipLeaderElection() { return skipLeaderElection; }
-    public void setSkipLeaderElection(boolean v) { this.skipLeaderElection = v; }
+    public void setConversionSyncPageSize(int v) {
+        this.conversionSyncPageSize = v;
+    }
 
-    public String getWorkerGroup() { return workerGroup; }
-    public void setWorkerGroup(String v) { this.workerGroup = v; }
+    public List<Integer> getConversionSyncActs() {
+        return conversionSyncActs;
+    }
 
-    public String getWorkerConsumer() { return workerConsumer; }
-    public void setWorkerConsumer(String v) { this.workerConsumer = v; }
+    public void setConversionSyncActs(List<Integer> v) {
+        this.conversionSyncActs = v;
+    }
 
-    public int getWorkerBatch() { return workerBatch; }
-    public void setWorkerBatch(int v) { this.workerBatch = v; }
+    public boolean isCallbackRetryEnabled() {
+        return callbackRetryEnabled;
+    }
 
-    public boolean isConversionSyncEnabled() { return conversionSyncEnabled; }
-    public void setConversionSyncEnabled(boolean v) { this.conversionSyncEnabled = v; }
+    public void setCallbackRetryEnabled(boolean v) {
+        this.callbackRetryEnabled = v;
+    }
 
-    public Duration getConversionSyncInterval() { return conversionSyncInterval; }
-    public void setConversionSyncInterval(Duration v) { this.conversionSyncInterval = v; }
+    public Duration getCallbackRetryInterval() {
+        return callbackRetryInterval;
+    }
 
-    public int getConversionSyncDateOffsetDays() { return conversionSyncDateOffsetDays; }
-    public void setConversionSyncDateOffsetDays(int v) { this.conversionSyncDateOffsetDays = v; }
+    public void setCallbackRetryInterval(Duration v) {
+        this.callbackRetryInterval = v;
+    }
 
-    public int getConversionSyncPageSize() { return conversionSyncPageSize; }
-    public void setConversionSyncPageSize(int v) { this.conversionSyncPageSize = v; }
+    public int getCallbackRetryLimit() {
+        return callbackRetryLimit;
+    }
 
-    public List<Integer> getConversionSyncActs() { return conversionSyncActs; }
-    public void setConversionSyncActs(List<Integer> v) { this.conversionSyncActs = v; }
+    public void setCallbackRetryLimit(int v) {
+        this.callbackRetryLimit = v;
+    }
 
-    public boolean isCallbackRetryEnabled() { return callbackRetryEnabled; }
-    public void setCallbackRetryEnabled(boolean v) { this.callbackRetryEnabled = v; }
+    public boolean isTagEventSyncEnabled() {
+        return tagEventSyncEnabled;
+    }
 
-    public Duration getCallbackRetryInterval() { return callbackRetryInterval; }
-    public void setCallbackRetryInterval(Duration v) { this.callbackRetryInterval = v; }
+    public void setTagEventSyncEnabled(boolean v) {
+        this.tagEventSyncEnabled = v;
+    }
 
-    public int getCallbackRetryLimit() { return callbackRetryLimit; }
-    public void setCallbackRetryLimit(int v) { this.callbackRetryLimit = v; }
+    public Duration getTagEventSyncInterval() {
+        return tagEventSyncInterval;
+    }
 
-    public boolean isTagEventSyncEnabled() { return tagEventSyncEnabled; }
-    public void setTagEventSyncEnabled(boolean v) { this.tagEventSyncEnabled = v; }
+    public void setTagEventSyncInterval(Duration v) {
+        this.tagEventSyncInterval = v;
+    }
 
-    public Duration getTagEventSyncInterval() { return tagEventSyncInterval; }
-    public void setTagEventSyncInterval(Duration v) { this.tagEventSyncInterval = v; }
+    public String getTagEventSyncRedisPrefix() {
+        return tagEventSyncRedisPrefix;
+    }
 
-    public String getTagEventSyncRedisPrefix() { return tagEventSyncRedisPrefix; }
-    public void setTagEventSyncRedisPrefix(String v) { this.tagEventSyncRedisPrefix = v; }
+    public void setTagEventSyncRedisPrefix(String v) {
+        this.tagEventSyncRedisPrefix = v;
+    }
 }