Merge branch 'FB' into abroad_dev

netflix-service/src/main/java/com/cyksj/service/order/post/facebook/FacebookUtils.java

@@ -1,35 +0,0 @@
-package com.cyksj.service.order.post.facebook;
-
-import com.facebook.ads.sdk.APIContext;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * @author chan
- * @date 2022/9/21 2:22 PM
- */
-@Component
-@Data
-public class FacebookUtils {
-
-    @Value("${facebook.pixel-id}")
-    private String pixelId;
-
-    @Value("${facebook.conversion-token}")
-    private String conversionToken;
-
-    @Value("${facebook1.pixel-id}")
-    private String subPixelId;
-
-    @Value("${facebook1.conversion-token}")
-    private String subConversionToken;
-
-    public APIContext getFacebookContext() {
-        return new APIContext(conversionToken);
-    }
-
-    public APIContext getFacebookContext(String conversionToken) {
-        return new APIContext(conversionToken);
-    }
-}

netflix-service/src/main/java/com/cyksj/service/order/post/impl/FacebookPostDataService.java

@@ -4,7 +4,6 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.enums.GatewayApiCode;
-import com.cyksj.service.order.post.facebook.FacebookUtils;
 import com.cyksj.mapper.order.OrderDonPostMapper;
 import com.cyksj.service.order.post.AbstractPostDataService;
 import com.cyksj.service.order.post.PostDataFactory;
@@ -28,9 +27,6 @@ import javax.annotation.PostConstruct;
 @Service
 @RequiredArgsConstructor
 public class FacebookPostDataService extends AbstractPostDataService {
-
-    private final FacebookUtils facebookUtils;
-
     private final OrderDonPostMapper orderPostMapper;
 
     @Override
@@ -39,7 +35,7 @@ public class FacebookPostDataService extends AbstractPostDataService {
         String token = "EAANnOWjDZCDIBO5KAs8RM1RQZCsrmkcPYk5fqZAk631CjzZCylLt2LuuFPIlaUht64NM2CYjGvvytHDkaxQisAdw2DkXUnITF0ODaQV7cJopaDZCW6ghnoKQ8CimfZCjJOaKI7ZAGOnXjaAHwqgUdeHSmsRpukaFif9LrvUboT91SJZAGtDhX86ZB4vt83M7VLbpdRgZDZD";
         String piexlId = "635359668701347";
         // 获取会话上下文
-        APIContext apiContext = facebookUtils.getFacebookContext(token);
+        APIContext apiContext = new APIContext(token);
 
         JSONObject jsonObject = JSONUtil.parseObj(callback);