Browse Source

Merge remote-tracking branch 'origin/test' into test

zhouzeyu@c-top.com.cn 3 years ago
parent
commit
fc6afd8d1e

+ 5 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaiShouCreateServiceImpl.java

@@ -8,7 +8,6 @@ import cn.com.ctop.kuaishou.modules.ai.service.IKuaiShouCreateService;
 import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouLandpagePackageService;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -276,9 +275,9 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 if (!Check.isNull(creativeJson.getLong("photo_id"))) {
                     createJson.put("photo_id", creativeJson.getLong("photo_id"));  // 视频ID
                 }
-                KuaiShouVideoGet video = videoGetService.getVideoByPhotoId(creativeJson.getLong("photo_id"));
-                if (!Check.isNull(video)) {
-                    createJson.put("creative_material_type", video.getMaterialType());  // 素材类型
+                //     KuaiShouVideoGet video = videoGetService.getVideoByPhotoId(creativeJson.getLong("photo_id"));
+                if (!Check.isNull(creativeJson.getInteger("creative_material_type"))) {
+                    createJson.put("creative_material_type", creativeJson.getInteger("creative_material_type"));  // 素材类型
                 }
                 if (!Check.isNull(creativeJson.getString("action_bar_text"))) {
                     createJson.put("action_bar_text", creativeJson.getString("action_bar_text"));  // 行动号召按钮文案
@@ -631,7 +630,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             }
         }
         //-------------兴趣行为定向
-        JSONObject behaviorInterest = new JSONObject();
+       /* JSONObject behaviorInterest = new JSONObject();
         JSONObject behavior = new JSONObject();
         JSONObject interest = new JSONObject();
         if (!Check.isNull(unitJson.getJSONArray("keyword"))) {
@@ -660,7 +659,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
         }
         if (!Check.isNull(behaviorInterest)) {
             target.put("behavior_interest", behaviorInterest);
-        }
+        }*/
         return target;
     }
 }

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

@@ -261,8 +261,8 @@ bytedance:
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
 ai:
   callback:
-    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
+    callback-unit-url: http://139.186.165.84:31012/ai_callback_add_group
+    callback-creative-url: http://139.186.165.84:31012/ai_callback_add_creative
 xxl-job:
   requestUrl: http://jiaoyangapi.shyouteng.com.cn