Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

yumeng 1 gadu atpakaļ
vecāks
revīzija
dc0b018d49

+ 5 - 5
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialStareMapper.xml

@@ -641,7 +641,7 @@
         IF(SUM( d.charge ) / SUM( d.activation ) > 0.0001,ROUND( SUM( d.charge ) / SUM( d.activation ), 2 ),0) AS
         activationPrice,
         IF(SUM( d.event_next_day_stay ) / SUM( d.activation ) > 0.0001,CONCAT(ROUND(SUM( d.event_next_day_stay ) / SUM(
-        d.activation ) * 100, 2 ),'%'),0.00)AS leave,
+        d.activation ) * 100, 2 ),'%'),0.00)AS 'leave',
         IFNULL(SUM( d.event_pay ),0) AS eventPay,
         IF(SUM( d.charge ) / SUM( d.event_pay ) > 0.0001,ROUND( SUM( d.charge ) / SUM( d.event_pay ), 2 ),0) AS
         eventPayCost,
@@ -837,7 +837,7 @@
         IFNULL(SUM( d.activation ),0) AS activation,
         IFNULL(ROUND( SUM( d.charge ) / SUM( d.activation ), 2 ),0) AS activationPrice,
         IF(SUM( d.event_next_day_stay ) / SUM( d.activation ) > 0.0001,CONCAT(ROUND(SUM( d.event_next_day_stay ) / SUM(
-        d.activation ) * 100, 2 ),'%'),0.00) AS leave,
+        d.activation ) * 100, 2 ),'%'),0.00) AS 'leave',
         IFNULL(SUM( d.event_pay ),0) AS eventPay,
         IFNULL(ROUND( SUM( d.charge ) / SUM( d.event_pay ), 2 ),0) AS eventPayCost,
         IF(SUM( d.event_pay ) / ( SUM( d.activation ) + SUM( d.form_count )) > 0.0001,CONCAT(ROUND( SUM( d.event_pay ) /
@@ -1250,7 +1250,7 @@
             SUM( d.event_next_day_stay ) AS eventNextDayStay,
         </if>
         <if test='type == "leave"'>
-            IFNULL( ROUND( SUM( d.event_next_day_stay ) / SUM( d.activation ), 2 ), 0 ) AS leave,
+            IFNULL( ROUND( SUM( d.event_next_day_stay ) / SUM( d.activation ), 2 ), 0 ) AS 'leave',
         </if>
         d.ad_scene AS adScene
         FROM
@@ -1346,7 +1346,7 @@
             SUM( d.event_next_day_stay ) AS eventNextDayStay,
         </if>
         <if test='type == "leave"'>
-            IFNULL( ROUND( SUM( d.event_next_day_stay ) / SUM( d.activation ), 2 ), 0 ) AS leave,
+            IFNULL( ROUND( SUM( d.event_next_day_stay ) / SUM( d.activation ), 2 ), 0 ) AS 'leave',
         </if>
         d.age_segment AS ageSegment
         FROM
@@ -1397,7 +1397,7 @@
             SUM( d.event_next_day_stay ) AS eventNextDayStay,
         </if>
         <if test='type == "leave"'>
-            IFNULL( ROUND( SUM( d.event_next_day_stay ) / SUM( d.activation ), 2 ), 0 ) AS leave,
+            IFNULL( ROUND( SUM( d.event_next_day_stay ) / SUM( d.activation ), 2 ), 0 ) AS 'leave',
         </if>
         d.gender AS gender
         FROM

+ 16 - 20
jeecg-boot-material-view/src/main/resources/application-dev.yml

@@ -11,10 +11,10 @@ server:
     min-response-size: 1024
     mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
+ endpoints:
+  web:
+   exposure:
+    include: metrics,httptrace
 spring:
   cloud:
     nacos:
@@ -22,9 +22,9 @@ spring:
         server-addr: 127.0.0.1:8848
         service: jeecg-cloud-material
   servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+     multipart:
+        max-file-size: 10MB
+        max-request-size: 10MB
   mail:
     host: smtp.163.com
     username: jeecgos@163.com
@@ -38,8 +38,8 @@ spring:
             required: true
   #json 时间戳统一转换
   jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
+    date-format:   yyyy-MM-dd HH:mm:ss
+    time-zone:   GMT+8
   jpa:
     open-in-view: false
   activiti:
@@ -106,18 +106,14 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          #          url: jdbc:mysql://103.46.170.107:3390/application?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true&serverTimezone=GMT%2B8
-          #          username: hcst
-          #          password: hcst@2021
+#          url: jdbc:mysql://103.46.170.107:3390/application?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true&serverTimezone=GMT%2B8
+#          username: hcst
+#          password: hcst@2021
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
-          #------------------------内网
-          #          url: jdbc:mysql://192.168.0.184:3390/jeecg-boot?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #          username: hcst
-          #          password: hcst@2021
-          url: jdbc:mysql://139.186.27.96:3390/jeecg-boot?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: data
+          url: jdbc:mysql://192.168.0.184:3390/jeecg-boot?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: hcst
           password: hcst@2021
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
@@ -146,11 +142,11 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
-    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
-jeecg:
+jeecg :
   oss:
     secretKey:
     accessKey: