Browse Source

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

huangxuechao 3 years ago
parent
commit
e00bbf9a2c

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/common/constant/AccountReportConstants.java

@@ -917,7 +917,6 @@ public class AccountReportConstants {
     public static Map<String, Map<String, Object>> getDicMapKs(){
         Object jsonKs = JSON.parseObject(KUAISHOU_FILED_MAPPING_JSON);
         return JsonResourceUtil.jsonToMap(jsonKs);
-
     }
     public static Map<String, Map<String, Object>> getDicMapByVideo(){
         Object jsonByVideo = JSON.parseObject(BYTEDANCE_VIDEO_REPORT_MAPPING_JSON);

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/common/utils/JsonResourceUtil.java

@@ -83,6 +83,8 @@ public class JsonResourceUtil {
      * 拼接字段
      */
     public static String joinFiled(Map<String, Map<String,Object>> mapMap,JSONArray array) {
+        System.out.println(mapMap);
+        System.out.println(array);
         StringBuilder sb = new StringBuilder();
         array.forEach(it -> {
             if (mapMap.get(it.toString()).isEmpty()) {

+ 7 - 1
jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application-prod.yml

@@ -43,7 +43,13 @@ spring:
         filters:
           - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
         predicates:
-          - Path=/bytedance/ad/**
+          - Path=/bytedanceAd/**
+      - id: jeecg-cloud-finance
+        uri: lb://jeecg-cloud-finance
+        filters:
+          - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
+        predicates:
+          - Path=/finance/**
 # hystrix 信号量隔离,3秒后自动超时
 hystrix:
   enabled: true