Browse Source

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

# Conflicts:
#	jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
yangzian 4 years ago
parent
commit
cc4e1742d4

+ 3 - 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -129,12 +129,14 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/vxeSocket/**", "anon");//JVxeTable无痕刷新示例
         filterChainDefinitionMap.put("/vxeSocket/**", "anon");//JVxeTable无痕刷新示例
         filterChainDefinitionMap.put("/eoaSocket/**","anon");//我的聊天
         filterChainDefinitionMap.put("/eoaSocket/**","anon");//我的聊天
 
 
+        //filterChainDefinitionMap.put("/advertiser/aiBytedanceAdvertiserStrategy/**","anon");//
+        filterChainDefinitionMap.put("/advertiser/**","anon");//
+        filterChainDefinitionMap.put("/advertiser/materialInfoController/**","anon");//素材下线
         filterChainDefinitionMap.put("/advertiser/aiBytedanceAdvertiserStrategy/**","anon");
         filterChainDefinitionMap.put("/advertiser/aiBytedanceAdvertiserStrategy/**","anon");
         filterChainDefinitionMap.put("/advertiser/bytedanceGeneralCopywriter/**","anon");
         filterChainDefinitionMap.put("/advertiser/bytedanceGeneralCopywriter/**","anon");
         filterChainDefinitionMap.put("/ctop/bytedanceVideoSlogenInfo/**","anon");
         filterChainDefinitionMap.put("/ctop/bytedanceVideoSlogenInfo/**","anon");
         filterChainDefinitionMap.put("/sys/user/**","anon");//
         filterChainDefinitionMap.put("/sys/user/**","anon");//
 
 
-        //filterChainDefinitionMap.put("/advertiser/**","anon");//
         filterChainDefinitionMap.put("/file/**","anon");//
         filterChainDefinitionMap.put("/file/**","anon");//
 
 
         //获取计划和素材维度的审核建议数据
         //获取计划和素材维度的审核建议数据
@@ -142,7 +144,6 @@ public class ShiroConfig {
 
 
         filterChainDefinitionMap.put("/sys/dict/**","anon");//
         filterChainDefinitionMap.put("/sys/dict/**","anon");//
 
 
-
         filterChainDefinitionMap.put("/advertiser/bytedanceReportController/updateADCpaBid","anon");//
         filterChainDefinitionMap.put("/advertiser/bytedanceReportController/updateADCpaBid","anon");//
 
 
         //性能监控  TODO 存在安全漏洞泄露TOEKN(durid连接池也有)
         //性能监控  TODO 存在安全漏洞泄露TOEKN(durid连接池也有)

+ 4 - 4
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/service/impl/AiBytedanceAdvertiserStrategyServiceImpl.java

@@ -274,7 +274,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         return videoCnt;
         return videoCnt;
     }
     }
 
 
-    // 创建创意  拼接创意参数
+    // 创建创意  拼接创意参数 master
     private JSONObject getCreativeParams(AiBytedanceAdvertiserStrategy strategy, Long adId,ByteDanceVideoInfo videoInfo,CtopOauthToken token) {
     private JSONObject getCreativeParams(AiBytedanceAdvertiserStrategy strategy, Long adId,ByteDanceVideoInfo videoInfo,CtopOauthToken token) {
         JSONObject params = new JSONObject();
         JSONObject params = new JSONObject();
         params.put("advertiser_id", strategy.getAccountId());
         params.put("advertiser_id", strategy.getAccountId());
@@ -328,11 +328,11 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         if(null!=isPresentedVideo&&isPresentedVideo!=0){
         if(null!=isPresentedVideo&&isPresentedVideo!=0){
             ad_data.put("is_presented_video",isPresentedVideo);
             ad_data.put("is_presented_video",isPresentedVideo);
         }
         }
-        //是否开启衍生计划
-        Integer generateDerivedAd = strategy.getCreativeGenerateDerivedAd();
+        //是否开启衍生计划 该字段已下线
+      /*  Integer generateDerivedAd = strategy.getCreativeGenerateDerivedAd();
         if(null!=generateDerivedAd&&generateDerivedAd!=0){
         if(null!=generateDerivedAd&&generateDerivedAd!=0){
             ad_data.put("generate_derived_ad",generateDerivedAd);
             ad_data.put("generate_derived_ad",generateDerivedAd);
-        }
+        }*/
         //搭配试玩素材url
         //搭配试玩素材url
         String playableUrl = strategy.getCreativePlayableUrl();
         String playableUrl = strategy.getCreativePlayableUrl();
         if(!Check.isNull(playableUrl)){
         if(!Check.isNull(playableUrl)){