Browse Source

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

syh 4 năm trước cách đây
mục cha
commit
f8561e80ad

+ 9 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialAscriptionController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.ctop.controller;
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
+import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -118,7 +119,14 @@ public class MaterialAscriptionController {
         Result<MaterialAscription> result = new Result<>();
         Result<MaterialAscription> result = new Result<>();
         QueryWrapper<MaterialAscription> ascriptionQueryWrapper = new QueryWrapper<>();
         QueryWrapper<MaterialAscription> ascriptionQueryWrapper = new QueryWrapper<>();
         ascriptionQueryWrapper.eq("material_id", materialAscription.getMaterialId());
         ascriptionQueryWrapper.eq("material_id", materialAscription.getMaterialId());
-        boolean ok = materialAscriptionService.update(materialAscription, ascriptionQueryWrapper);
+        ascriptionQueryWrapper.last("limit 1");
+        MaterialAscription one = materialAscriptionService.getOne(ascriptionQueryWrapper);
+        boolean ok;
+        if (Check.isNull(one)) {
+            ok = materialAscriptionService.save(materialAscription);
+        } else {
+            ok = materialAscriptionService.update(materialAscription, ascriptionQueryWrapper);
+        }
         if (ok) {
         if (ok) {
             result.success("修改成功!");
             result.success("修改成功!");
         }
         }

+ 42 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -8,6 +8,7 @@ import cn.com.ctop.common.module.vo.ResFileDTO;
 import cn.com.ctop.crawler.modules.core.entity.CrawlerDouyinMusicTask;
 import cn.com.ctop.crawler.modules.core.entity.CrawlerDouyinMusicTask;
 import cn.com.ctop.crawler.modules.core.service.CrawlerDouyinMusicTaskService;
 import cn.com.ctop.crawler.modules.core.service.CrawlerDouyinMusicTaskService;
 import cn.com.ctop.crawler.modules.douyin.service.DouyinMusicService;
 import cn.com.ctop.crawler.modules.douyin.service.DouyinMusicService;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouTemplate;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouDailyAgentService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouDailyAgentService;
@@ -15,6 +16,7 @@ import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataServ
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceEffectVideoInfoService;
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceEffectVideoInfoService;
 import cn.com.ctop.toutiao.modules.report.service.*;
 import cn.com.ctop.toutiao.modules.report.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -90,6 +92,46 @@ public class TestController {
     static ExecutorService suzhaoService = Executors.newFixedThreadPool(5);
     static ExecutorService suzhaoService = Executors.newFixedThreadPool(5);
     @Autowired
     @Autowired
     private IKuaiShouDailyAgentService dailyAgentService;
     private IKuaiShouDailyAgentService dailyAgentService;
+    @Autowired
+    private IKuaishouTemplateService templateService;
+
+
+    @GetMapping(value = "/updateTemplate")
+    public void updateTemplate(Long projectId, String startDate, String endDate) {
+
+        List<Long> list = new ArrayList();
+        list.add(7022550L);
+        list.add(7409586L);
+        list.add(5473041L);
+        list.add(5852766L);
+        list.add(6962896L);
+        list.add(7409919L);
+        for (int i = 0; i < list.size(); i++) {
+            Long accountId = list.get(i);
+            CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
+            templateService.getTemplateByAccountId(oauthToken.getAccountId(), oauthToken.getAccessToken(), 1);
+
+            QueryWrapper<KuaishouTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("account_id", accountId);
+            List<KuaishouTemplate> list1 = templateService.list(queryWrapper);
+            if (!Check.isNull(list1)) {
+                for (KuaishouTemplate template : list1) {
+                    JSONObject param = new JSONObject();
+                    param.put("templateId", template.getTemplateId());
+                    param.put("accountId", template.getAccountId());
+                    param.put("templateName", template.getTemplateName());
+                    param.put("filterConvertedLevel", 5);
+                    templateService.updateTemplate(oauthToken.getAccountId(), oauthToken.getAccessToken(), param);
+
+                }
+
+            }
+
+
+        }
+
+
+    }
 
 
 
 
     @GetMapping(value = "/getCreativeByProjectId")
     @GetMapping(value = "/getCreativeByProjectId")

+ 8 - 8
module-alarm/src/main/java/cn/com/ctop/alarm/modules/constant/MatchLogic.java

@@ -108,8 +108,8 @@ public class MatchLogic {
                     List<String> thresholds = strToList(threshold);
                     List<String> thresholds = strToList(threshold);
                     //包含 任一存在则报警
                     //包含 任一存在则报警
                     if ("contain".equals(condition)) {
                     if ("contain".equals(condition)) {
-                        for (String v : values) {
-                            if (threshold.contains(v)) {
+                        for (String thr : thresholds) {
+                            if (values.contains(thr)) {
                                 return true;
                                 return true;
                             }
                             }
                         }
                         }
@@ -121,16 +121,16 @@ public class MatchLogic {
                             if (values.size() != thresholds.size()) {
                             if (values.size() != thresholds.size()) {
                                 return true;
                                 return true;
                             }
                             }
-                            for (String v : values) {
-                                if (!threshold.contains(v)) {
+                            for (String thr : thresholds) {
+                                if (!values.contains(thr)) {
                                     return true;
                                     return true;
                                 }
                                 }
                             }
                             }
                         } else {
                         } else {
                             boolean flag = true;
                             boolean flag = true;
                             //不包含,阈值中,存在任一目标则不报警,都不存在时则报警,出现阈值之外的亦报警
                             //不包含,阈值中,存在任一目标则不报警,都不存在时则报警,出现阈值之外的亦报警
-                            for (String v : values) {
-                                if (threshold.contains(v)) {
+                            for (String thr : thresholds) {
+                                if (values.contains(thr)) {
                                     flag = false;
                                     flag = false;
                                 } else {
                                 } else {
                                     return true;
                                     return true;
@@ -141,9 +141,9 @@ public class MatchLogic {
                     }
                     }
                 } else {
                 } else {
                     if ("contain".equals(condition)) {
                     if ("contain".equals(condition)) {
-                        return threshold.contains(value);
+                        return value.contains(threshold);
                     } else {
                     } else {
-                        return !threshold.contains(value);
+                        return !value.contains(threshold);
                     }
                     }
                 }
                 }
             }
             }

+ 9 - 3
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -46,6 +46,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.StringJoiner;
 import java.util.StringJoiner;
 import java.util.UUID;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
 /**
  * 规则组
  * 规则组
@@ -101,6 +103,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     private final static String PLAN = "plan";
     private final static String PLAN = "plan";
     private final static String CREATIVE = "creative";
     private final static String CREATIVE = "creative";
 
 
+    static ExecutorService executorService = Executors.newFixedThreadPool(5);
+
     @Override
     @Override
     public void checkRules() {
     public void checkRules() {
         log.info("------start------");
         log.info("------start------");
@@ -126,9 +130,11 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
             log.error("获取指标内容失败");
             log.error("获取指标内容失败");
             return;
             return;
         }
         }
-        for (RuleAccountTemplate templates : ruleAccountTemplates) {
+
+        ruleAccountTemplates.forEach(templates -> executorService.submit(() -> {
             matchAlarmRules(ruleGroupMap, indicators, templates);
             matchAlarmRules(ruleGroupMap, indicators, templates);
-        }
+        }));
+
         Long endTime = System.currentTimeMillis();
         Long endTime = System.currentTimeMillis();
         log.info("------end------共耗时: {} ms", endTime - startTime);
         log.info("------end------共耗时: {} ms", endTime - startTime);
     }
     }
@@ -642,7 +648,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
      * @throws
      * @throws
      * @author ZHAOXA
      * @author ZHAOXA
      */
      */
-    private JSONObject getUserByAccountId(Long accountId) {
+    private synchronized JSONObject getUserByAccountId(Long accountId) {
         JSONObject obj = userObj.getJSONObject(accountId.toString());
         JSONObject obj = userObj.getJSONObject(accountId.toString());
         if (Check.isNull(obj)) {
         if (Check.isNull(obj)) {
             JSONObject user = sysUserMapper.selectUserByAccount(accountId);
             JSONObject user = sysUserMapper.selectUserByAccount(accountId);

+ 1 - 2
module-common/src/main/java/cn/com/ctop/common/module/utils/CorpWexinUtils.java

@@ -50,8 +50,7 @@ public class CorpWexinUtils {
         }
         }
     }
     }
 
 
-
-    public static void sendMessageByWeChatId(String weChatId, String content) {
+    public synchronized static void sendMessageByWeChatId(String weChatId, String content) {
         if (wxCpService == null) {
         if (wxCpService == null) {
             initService();
             initService();
         }
         }

+ 1 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/KuaishouInterfaceConstant.java

@@ -83,6 +83,7 @@ public class KuaishouInterfaceConstant {
      * 创建定向模板
      * 创建定向模板
      */
      */
     public static final String TEMPLATE_CREATE = "/rest/openapi/v1/target/template/create";
     public static final String TEMPLATE_CREATE = "/rest/openapi/v1/target/template/create";
+    public static final String TEMPLATE_UPDATE = "/rest/openapi/v1/target/template/update";
     /**
     /**
      * 获取地域信息
      * 获取地域信息
      */
      */

+ 26 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouAlarmRuleJob.java

@@ -0,0 +1,26 @@
+package cn.com.ctop.job.kuaishou.handler;
+
+
+import cn.com.ctop.alarm.modules.service.IRuleGroupService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class KuaiShouAlarmRuleJob {
+    @Autowired
+    private IRuleGroupService ruleGroupService;
+
+    /**
+     * 定时任务
+     *
+     * @param
+     * @return
+     * @throws
+     * @author ZHAOXA
+     */
+    @XxlJob("kuaiShoualarmRuleJob")
+    public void execute() throws Exception {
+        ruleGroupService.checkRules();
+    }
+}

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaiShouMaterialControer.java

@@ -106,6 +106,7 @@ public class KuaiShouMaterialControer {
 
 
     @PostMapping(value = "/getHistoryVideoList")
     @PostMapping(value = "/getHistoryVideoList")
     public JSONObject getHistoryVideoList(@RequestBody JSONObject requestJson) {
     public JSONObject getHistoryVideoList(@RequestBody JSONObject requestJson) {
+        System.err.println(requestJson);
         JSONObject returnJson = new JSONObject();
         JSONObject returnJson = new JSONObject();
         try {
         try {
             if (Check.isNull(requestJson)) {
             if (Check.isNull(requestJson)) {

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouNewCreateCampaignServiceImpl.java

@@ -68,8 +68,8 @@ public class AiKuaishouNewCreateCampaignServiceImpl implements IAiKuaishouNewCre
 
 
         // 2.2 执行 素造的 视频拉取服务,时间过滤执行 yyyy-MM-dd HH:mm:ss
         // 2.2 执行 素造的 视频拉取服务,时间过滤执行 yyyy-MM-dd HH:mm:ss
         // 时间差,单位为分钟
         // 时间差,单位为分钟
-        int timeStart = -25;
-        int timeEnd = -20;
+        int timeStart = -10;
+        int timeEnd = -5;
         Long now = System.currentTimeMillis();
         Long now = System.currentTimeMillis();
         String startTime = DateUtils.formatDate(new Date(now + timeStart*60*1000),"yyyy-MM-dd HH:mm:ss");
         String startTime = DateUtils.formatDate(new Date(now + timeStart*60*1000),"yyyy-MM-dd HH:mm:ss");
         String endTime = DateUtils.formatDate(new Date(now + timeEnd*60*1000),"yyyy-MM-dd HH:mm:ss");
         String endTime = DateUtils.formatDate(new Date(now + timeEnd*60*1000),"yyyy-MM-dd HH:mm:ss");

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaiShouCreateServiceImpl.java

@@ -155,7 +155,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 } else {
                 } else {
                     JSONObject target = getTarget(groupCreateJson);
                     JSONObject target = getTarget(groupCreateJson);
                     if (!Check.isNull(target)) {
                     if (!Check.isNull(target)) {
-                        createJson.put("getTarget", target); // 定向数据
+                        createJson.put("target", target); // 定向数据
                     }
                     }
                 }
                 }
                 Map<String, Object> unitMap = iKuaishouInterfaceService.adUnitCreate(oauthToken.getAccessToken(), oauthToken.getAccountId(), createJson, 1);
                 Map<String, Object> unitMap = iKuaishouInterfaceService.adUnitCreate(oauthToken.getAccessToken(), oauthToken.getAccountId(), createJson, 1);
@@ -183,7 +183,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 }
                 }
                 returnArr.add(returnJson);
                 returnArr.add(returnJson);
             }
             }
-            callback("url", returnArr);
+            callback("http://192.168.1.193:31012/ai_callback_add_group", returnArr);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             log.error("创建组错误!!!!!");
             log.error("创建组错误!!!!!");
@@ -292,7 +292,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 }
                 }
                 returnArr.add(returnJson);
                 returnArr.add(returnJson);
             }
             }
-            callback("url", returnArr);
+            callback("http://192.168.1.193:31012/ai_callback_add_creative", returnArr);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -2975,7 +2975,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                     @Override
                     @Override
                     public void run() {
                     public void run() {
                         List<MaterialCutFrame> cutFrames = cutFrameService.getListByVideoSignature(md5);
                         List<MaterialCutFrame> cutFrames = cutFrameService.getListByVideoSignature(md5);
-                        if(null!=cutFrames&&!cutFrames.isEmpty()){
+                        if(null==cutFrames||cutFrames.isEmpty()){
                             videoGetService.getKeyFrame(token, accountId, md5, String.valueOf(photo_id));
                             videoGetService.getKeyFrame(token, accountId, md5, String.valueOf(photo_id));
                         }
                         }
                     }
                     }

+ 28 - 21
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouTemplateServiceImpl.java

@@ -346,8 +346,12 @@ public class KuaishouTemplateServiceImpl extends ServiceImpl<KuaishouTemplateMap
             }
             }
 
 
             JSONObject param = new JSONObject();
             JSONObject param = new JSONObject();
+            param.put("template_id", requestJson.getLong("templateId"));
             param.put("advertiser_id", accountId);
             param.put("advertiser_id", accountId);
-            param.put("template_name", requestJson.getString("templateName"));
+            if(!Check.isNull(requestJson.getString("templateName"))){
+                param.put("template_name", requestJson.getString("templateName"));
+            }
+
             JSONObject targetJson = new JSONObject();
             JSONObject targetJson = new JSONObject();
             if (!Check.isNull(requestJson.getJSONArray("region"))) {
             if (!Check.isNull(requestJson.getJSONArray("region"))) {
                 targetJson.put("region", requestJson.getJSONArray("region"));
                 targetJson.put("region", requestJson.getJSONArray("region"));
@@ -362,14 +366,11 @@ public class KuaishouTemplateServiceImpl extends ServiceImpl<KuaishouTemplateMap
                 targetJson.put("ages_range", requestJson.getJSONArray("agesRange"));
                 targetJson.put("ages_range", requestJson.getJSONArray("agesRange"));
             }
             }
 
 
-            JSONObject ageJson = new JSONObject();
-            if (!Check.isNull(requestJson.getInteger("min"))) {
+
+            if (!Check.isNull(requestJson.getInteger("min")) && !Check.isNull(requestJson.getInteger("max"))) {
+                JSONObject ageJson = new JSONObject();
                 ageJson.put("min", requestJson.getInteger("min"));
                 ageJson.put("min", requestJson.getInteger("min"));
-            }
-            if (!Check.isNull(requestJson.getInteger("max"))) {
                 ageJson.put("max", requestJson.getInteger("max"));
                 ageJson.put("max", requestJson.getInteger("max"));
-            }
-            if (!Check.isNull(ageJson)) {
                 targetJson.put("age", ageJson);
                 targetJson.put("age", ageJson);
             }
             }
 
 
@@ -424,23 +425,27 @@ public class KuaishouTemplateServiceImpl extends ServiceImpl<KuaishouTemplateMap
             if (!Check.isNull(requestJson.getJSONArray("excludePopulation"))) {
             if (!Check.isNull(requestJson.getJSONArray("excludePopulation"))) {
                 targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
                 targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
             }
             }
-            JSONObject intelliExtendJson = new JSONObject();
+
 
 
             if (!Check.isNull(requestJson.getInteger("isOpen"))) {
             if (!Check.isNull(requestJson.getInteger("isOpen"))) {
+                JSONObject intelliExtendJson = new JSONObject();
                 intelliExtendJson.put("is_open", requestJson.getInteger("isOpen"));
                 intelliExtendJson.put("is_open", requestJson.getInteger("isOpen"));
+
+                if (!Check.isNull(requestJson.getInteger("noAgeBreak"))) {
+                    intelliExtendJson.put("no_age_break", requestJson.getInteger("noAgeBreak"));
+                }
+                if (!Check.isNull(requestJson.getInteger("noGenderBreak"))) {
+                    intelliExtendJson.put("no_gender_break", requestJson.getInteger("noGenderBreak"));
+                }
+                if (!Check.isNull(requestJson.getInteger("noAreaBreak"))) {
+                    intelliExtendJson.put("no_area_break", requestJson.getInteger("noAreaBreak"));
+                }
+                if (!Check.isNull(intelliExtendJson)) {
+                    targetJson.put("intelli_extend", intelliExtendJson);
+                }
+
             }
             }
-            if (!Check.isNull(requestJson.getInteger("noAgeBreak"))) {
-                intelliExtendJson.put("no_age_break", requestJson.getInteger("noAgeBreak"));
-            }
-            if (!Check.isNull(requestJson.getInteger("noGenderBreak"))) {
-                intelliExtendJson.put("no_gender_break", requestJson.getInteger("noGenderBreak"));
-            }
-            if (!Check.isNull(requestJson.getInteger("noAreaBreak"))) {
-                intelliExtendJson.put("no_area_break", requestJson.getInteger("noAreaBreak"));
-            }
-            if (!Check.isNull(intelliExtendJson)) {
-                targetJson.put("intelli_extend", intelliExtendJson);
-            }
+
             if (!Check.isNull(targetJson)) {
             if (!Check.isNull(targetJson)) {
                 param.put("target", targetJson);
                 param.put("target", targetJson);
             }
             }
@@ -448,9 +453,11 @@ public class KuaishouTemplateServiceImpl extends ServiceImpl<KuaishouTemplateMap
             Map<String, String> headers = new HashMap<String, String>();
             Map<String, String> headers = new HashMap<String, String>();
             headers.put("Access-Token", accessToken);
             headers.put("Access-Token", accessToken);
             headers.put("Content-Type", " application/json");
             headers.put("Content-Type", " application/json");
-            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.TEMPLATE_CREATE;
+            System.err.println("入参:" + param.toJSONString());
+            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.TEMPLATE_UPDATE;
             String result = HttpUtils.kuaiShouhttpPostRequest(url, param.toJSONString(), headers);
             String result = HttpUtils.kuaiShouhttpPostRequest(url, param.toJSONString(), headers);
             JSONObject resultJson = JSONObject.parseObject(result);
             JSONObject resultJson = JSONObject.parseObject(result);
+            System.err.println("返回:" + resultJson.toJSONString());
             if (!Check.isNull(resultJson)) {
             if (!Check.isNull(resultJson)) {
                 Integer code = resultJson.getInteger("code");
                 Integer code = resultJson.getInteger("code");
                 if (code == 0) {
                 if (code == 0) {

+ 24 - 24
module-kuaishou/src/main/resources/kuaishou_config.properties

@@ -1,30 +1,12 @@
-#kuaishou_api_url=https://ad.e.kuaishou.com
-#kuaishou_auth_url=https://ad.e.kuaishou.com
-#kuaishou_appid=27
-#kuaishou_third_appid=328
-#oauth_type=agent
-#kuaishou_secret=QovprB1tNhXptgDc
-#kuaishou_third_secret=1iFTBiMdohkyEQQs
-#kuaishou_callback_url=http://adsp.c-top.com.cn:8080/jeecg-boot/kuaishou
-#kuaishou_third_callback_url=http://callback.shyouteng.com.cn/kuaishou
-#apk_sava_path=/mnt/file/apk
-#image_sava_path=/mnt/file/image
-#video_sava_path=/mnt/file/video
-### 模板视频存放路径
-#model_video_src_path=/mnt/data/src/
-### 片段合成视频存放路径
-#model_video_fill_path=/mnt/data/fill/
-###
-#model_video_final_path=/mnt/data/final/
-
-
-## jiaoyang
 kuaishou_api_url=https://ad.e.kuaishou.com
 kuaishou_api_url=https://ad.e.kuaishou.com
 kuaishou_auth_url=https://ad.e.kuaishou.com
 kuaishou_auth_url=https://ad.e.kuaishou.com
-kuaishou_appid=328
+kuaishou_appid=27
+kuaishou_third_appid=328
 oauth_type=agent
 oauth_type=agent
-kuaishou_secret=1iFTBiMdohkyEQQs
-kuaishou_callback_url=http://callback.shyouteng.com.cn/kuaishou
+kuaishou_secret=QovprB1tNhXptgDc
+kuaishou_third_secret=1iFTBiMdohkyEQQs
+kuaishou_callback_url=http://adsp.c-top.com.cn:8080/jeecg-boot/kuaishou
+kuaishou_third_callback_url=http://callback.shyouteng.com.cn/kuaishou
 apk_sava_path=/mnt/file/apk
 apk_sava_path=/mnt/file/apk
 image_sava_path=/mnt/file/image
 image_sava_path=/mnt/file/image
 video_sava_path=/mnt/file/video
 video_sava_path=/mnt/file/video
@@ -34,3 +16,21 @@ model_video_src_path=/mnt/data/src/
 model_video_fill_path=/mnt/data/fill/
 model_video_fill_path=/mnt/data/fill/
 ##
 ##
 model_video_final_path=/mnt/data/final/
 model_video_final_path=/mnt/data/final/
+
+
+## jiaoyang
+#kuaishou_api_url=https://ad.e.kuaishou.com
+#kuaishou_auth_url=https://ad.e.kuaishou.com
+#kuaishou_appid=328
+#oauth_type=agent
+#kuaishou_secret=1iFTBiMdohkyEQQs
+#kuaishou_callback_url=http://callback.shyouteng.com.cn/kuaishou
+#apk_sava_path=/mnt/file/apk
+#image_sava_path=/mnt/file/image
+#video_sava_path=/mnt/file/video
+### 模板视频存放路径
+#model_video_src_path=/mnt/data/src/
+### 片段合成视频存放路径
+#model_video_fill_path=/mnt/data/fill/
+###
+#model_video_final_path=/mnt/data/final/