瀏覽代碼

修改测试环境下的财务模块配置

songyh 4 年之前
父節點
當前提交
ad37ef7a7c

+ 2 - 2
jeecg-boot-finance/src/main/resources/application.yml

@@ -1,11 +1,11 @@
 server:
   port: 7005
   servlet:
-    context-path: /
+    context-path: /jeecg-cloud-finance
 
 spring:
   application:
-    name: jeecg-boot-finance
+    name: jeecg-cloud-finance
   profiles:
     active: @activatedProperties@
   cloud:

+ 2 - 12
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceHomepageMapper.xml

@@ -75,18 +75,8 @@
                sum(show_num)                          showNum,
                sum(click)                             click,
                CASE
-                   WHEN (sum(click) / sum(show_num)) IS NULL THEN
-                       0
-                   ELSE
-                       CONCAT(
-                               cast(
-                                       ROUND(
-                                               (sum(click) / sum(show_num)) * 100,
-                                               2
-                                           ) as char),
-                               '%'
-                           )
-                   END AS                             'clickRate',
+                   WHEN sum(click)>=0 and um(show_num)>0 THEN CONCAT(ROUND(sum(click) / sum(show_num) * 100,2) ,'%')
+                   else '0%' end AS   'clickRate',
                CASE
                    WHEN (sum(cost) / sum(show_num)) IS NULL THEN
                        0

+ 6 - 0
jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application-test.yml

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