Merge remote-tracking branch 'origin/main'

src/main/java/com/lwby/marketing/notify/media/gdt/NovelGDTNotify.java

@@ -11,9 +11,11 @@ import com.lwby.marketing.notify.media.gdt.dto.UserId;
 import com.lwby.marketing.vo.ClientInfo;
 import com.lwby.marketing.vo.DeliveryDeviceInfo;
 import com.lwby.marketing.vo.NovelAction;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.Collections;
 
+@Slf4j
 public class NovelGDTNotify extends MobileNotify {
 
     public boolean android(NovelAction na){
@@ -41,9 +43,12 @@ public class NovelGDTNotify extends MobileNotify {
 
         String userAction = JSONObject.toJSONString(dto);
         try {
-            String result = HttpUtil.post(sb.toString(), userAction);
-            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
-            return resultCode == 0;
+            //TODO;测试不执行
+//            String result = HttpUtil.post(sb.toString(), userAction);
+//            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
+//            return resultCode == 0;
+            log.info("Callback info:{}",userAction);
+            return true;
         } catch (Exception e) {
             return false;
         }

src/main/java/com/lwby/marketing/notify/media/jrtt/NovelJRTTNotify.java

@@ -8,7 +8,9 @@ import com.lwby.marketing.notify.media.jrtt.dto.JrttAttributeRequest;
 import com.lwby.marketing.vo.ClientInfo;
 import com.lwby.marketing.vo.DeliveryDeviceInfo;
 import com.lwby.marketing.vo.NovelAction;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class NovelJRTTNotify extends MobileNotify {
     public static final String ATTRIBUTE_URL = "https://analytics.oceanengine.com/api/v2/conversion";
 
@@ -33,9 +35,12 @@ public class NovelJRTTNotify extends MobileNotify {
 
         String userJson = JSONObject.toJSONString(request);
         try {
-            String result = HttpUtil.post(ATTRIBUTE_URL, userJson);
-            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
-            return resultCode == 0;
+            //TODO;测试不执行
+//            String result = HttpUtil.post(ATTRIBUTE_URL, userJson);
+//            Integer resultCode = (Integer) JSON.parseObject(result).get("code");
+//            return resultCode == 0;
+            log.info("Callback info:{}",userJson);
+            return true;
         } catch (Exception e) {
             return false;
         }