ソースを参照

Merge remote-tracking branch 'origin/master'

syh 4 年 前
コミット
8bd04a996a

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -90,10 +90,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ctop/bytedanceInterestCategory/**", "anon");
         filterChainDefinitionMap.put("/template/creative/words/get", "anon");
         filterChainDefinitionMap.put("template/bytedance/industry/list", "anon");
-        //报表设计器排除
-        filterChainDefinitionMap.put("/design/report/**", "anon");
+        //积木报表排除
+        filterChainDefinitionMap.put("/jmreport/**", "anon");
+        filterChainDefinitionMap.put("/**/*.js.map", "anon");
         filterChainDefinitionMap.put("/**/*.css.map", "anon");
-
         filterChainDefinitionMap.put("/bytedance/batch/creative/words/get", "anon");
         filterChainDefinitionMap.put("/bytedance/batch/action/text", "anon");
         filterChainDefinitionMap.put("/bytedance/batch/industry/list", "anon");

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

@@ -549,7 +549,7 @@ public class CrossAccountBatchServiceImpl implements ICrossAccountBatchService {
                     if (code == 500000 && count <= 4) {
                         aCreativeCreate(requestJson, count + 1);
                     }
-                    if (code == 400001 && "/rest/openapi/v2/creative/create已超日限".equals(resultJson.getString("message"))) {
+                    if (code == 400001 && "/rest/openapi/v2/creative/create调用已超日限,次日可恢复调用".equals(resultJson.getString("message"))) {
                         overRunSendMessageService.creativeOverRunSendMessage(advertiserId);
                     }
                     log.error("创建广告创意失败,advertiser_id:{},返回信息:{},入参:{}", advertiserId, resultJson, requestJson, count + 1);

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

@@ -1991,7 +1991,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         creativeCreate(accessToken, advertiserId, requestJson, count + 1);
                     }
 
-                    if (code == 400001 && "/rest/openapi/v2/creative/create已超日限".equals(resultJson.getString("message"))) {
+                    if (code == 400001 && "/rest/openapi/v2/creative/create调用已超日限,次日可恢复调用".equals(resultJson.getString("message"))) {
                         overRunSendMessageService.creativeOverRunSendMessage(advertiserId);
                     }
                     log.error("创建广告创意失败,advertiser_id:{},返回信息:{},入参:{}", advertiserId, resultJson, requestJson, count + 1);
@@ -2070,7 +2070,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         creativeCreate(accessToken, advertiserId, requestJson, count + 1);
                     }
 
-                    if (code == 400001 && "/rest/openapi/v2/creative/create已超日限".equals(resultJson.getString("message"))) {
+                    if (code == 400001 && "/rest/openapi/v2/creative/create调用已超日限,次日可恢复调用".equals(resultJson.getString("message"))) {
                         overRunSendMessageService.creativeOverRunSendMessage(advertiserId);
                     }
                     log.error("创建广告创意失败,advertiser_id:{},返回信息:{},入参:{}", advertiserId, resultJson, requestJson, count + 1);