瀏覽代碼

Merge branch 'V2.0.1' into test

zhaoxian 3 年之前
父節點
當前提交
97c888b7c7

+ 7 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/service/impl/ExternalLinkServiceImpl.java

@@ -5,6 +5,7 @@ import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.HttpUtils;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -16,14 +17,17 @@ import java.math.BigDecimal;
 @Service
 public class ExternalLinkServiceImpl implements ExternalLinkService {
     //修改头条CPABID出价,投放时间
-    private static final String URL_UPDATE_CPABID = "http://118.24.244.213:8808/bytedance-api/advertiser/bytedanceReportController/updateADCpaBid";
+//    private static final String URL_UPDATE_CPABID = "http://139.186.165.84:8808/bytedance-api/advertiser/bytedanceReportController/updateADCpaBid";
     //线上IP  http://118.24.244.213:8808/bytedance-api/advertiser/bytedanceReportController/updateADCpaBid
     //测试IP  http://139.186.165.84:8808/bytedance-api/advertiser/bytedanceReportController/updateADCpaBid
+    @Value("${rule.bytedanceUrl}")
+    private String URL_UPDATE_CPABID;
+
 
     @Override
     public Integer editBytedancePlanCpaBidOrBudget(Long accountId, String adId, BigDecimal cpaBid, String adScheduleTime, Long budget) {
         StringBuffer buf = new StringBuffer();
-        buf.append("?accountId=").append(accountId).append("&adId=").append(adId);
+        buf.append("bytedance-api/advertiser/bytedanceReportController/updateADCpaBid?accountId=").append(accountId).append("&adId=").append(adId);
         if (!Check.isNull(cpaBid)) {
             buf.append("&cpaBid=").append(cpaBid);
         }
@@ -39,7 +43,7 @@ public class ExternalLinkServiceImpl implements ExternalLinkService {
         JSONObject jsonObject = JSONObject.parseObject(result);
         Integer code = jsonObject.getInteger("code");
         if(code!=0){
-            log.error("调用微服务接口,修改头条计划失败,入参={}message={}",buf.toString(),jsonObject.getString("message"));
+            log.error("调用微服务接口,修改头条计划失败,入参={};-------------------message={}",buf.toString(),jsonObject.getString("message"));
         }
         return code;
     }

+ 3 - 1
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-dev.yml

@@ -265,4 +265,6 @@ ai:
     callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
     callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative
 xxl-job:
-  requestUrl: http://jiaoyangapi.shyouteng.com.cn
+  requestUrl: http://jiaoyangapi.shyouteng.com.cn
+rule:
+    bytedanceUrl: http://139.186.165.84:8808/

+ 2 - 0
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-prod.yml

@@ -265,3 +265,5 @@ ai:
     callback-creative-url: http://139.186.27.96::31012/ai_callback_add_creative
 xxl-job:
   requestUrl: http://jiaoyangapi.shyouteng.com.cn
+rule:
+  bytedanceUrl: http://118.24.244.213:8808/