Bladeren bron

Merge remote-tracking branch 'origin/master'

syh 4 jaren geleden
bovenliggende
commit
563f5f424f

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -101,7 +101,7 @@ spring:
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,slf4j
+        filters: stat,wall,slf4j
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:

+ 40 - 40
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAccountMapper.xml

@@ -428,11 +428,11 @@
 
 
     <insert id="loadAccountDailyReport">
-		LOAD DATA local INFILE  #{localPath}
+		LOAD DATA local INFILE  '${localPath}'
 		INTO TABLE ctop_kuaishou_report_daily_account
 		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\r\n'
 		IGNORE 1 LINES
-		(@ad_scene,
+		(ad_scene,
         charge,
         photo_show,
         aclick,
@@ -450,13 +450,13 @@
         activation,
         submit,
         stat_date,
-        @stat_hour,
+        stat_hour,
         photo_click,
         photo_click_ratio,
         action_ratio,
         impression_1k_cost,
         photo_click_cost,
-        @click_1k_cost,
+        click_1k_cost,
         action_cost,
         event_pay_first_day,
         event_pay_purchase_amount_first_day,
@@ -487,43 +487,43 @@
         event_next_day_stay_ratio,
         event_next_day_stay,
         play_3s_ratio,
-        @event_valid_clues,
-        @event_valid_clues_cost,
-        @ad_product_cnt,
-        @event_goods_view,
-        @merchant_reco_fans,
-        @event_order_amount_roi,
-        @event_goods_view_cost,
-        @merchant_reco_fans_cost,
-        @event_new_user_pay,
-        @event_new_user_pay_cost,
-        @event_new_user_pay_ratio,
-        @event_button_click,
-        @event_button_click_cost,
-        @event_button_click_ratio,
-        @play_5s_ratio,
-        @play_end_ratio,
-        @event_order_paid_roi,
-        @event_new_user_jinjian_app,
-        @event_new_user_jinjian_app_cost,
-        @event_new_user_jinjian_app_roi,
-        @event_new_user_credit_grant_app,
-        @event_new_user_credit_grant_app_cost,
-        @event_new_user_credit_grant_app_roi,
-        @event_new_user_jinjian_page,
-        @event_new_user_jinjian_page_cost,
-        @event_new_user_jinjian_page_roi,
-        @event_new_user_credit_grant_page,
-        @event_new_user_credit_grant_page_cost,
-        @event_new_user_credit_grant_page_roi,
-        @event_appoint_form,
-        @event_appoint_form_cost,
-        @event_appoint_form_ratio,
-        @event_appoint_jump_click,
-        @event_appoint_jump_click_cost,
-        @event_appoint_jump_click_ratio
+        event_valid_clues,
+        event_valid_clues_cost,
+        ad_product_cnt,
+        event_goods_view,
+        merchant_reco_fans,
+        event_order_amount_roi,
+        event_goods_view_cost,
+        merchant_reco_fans_cost,
+        event_new_user_pay,
+        event_new_user_pay_cost,
+        event_new_user_pay_ratio,
+        event_button_click,
+        event_button_click_cost,
+        event_button_click_ratio,
+        play_5s_ratio,
+        play_end_ratio,
+        event_order_paid_roi,
+        event_new_user_jinjian_app,
+        event_new_user_jinjian_app_cost,
+        event_new_user_jinjian_app_roi,
+        event_new_user_credit_grant_app,
+        event_new_user_credit_grant_app_cost,
+        event_new_user_credit_grant_app_roi,
+        event_new_user_jinjian_page,
+        event_new_user_jinjian_page_cost,
+        event_new_user_jinjian_page_roi,
+        event_new_user_credit_grant_page,
+        event_new_user_credit_grant_page_cost,
+        event_new_user_credit_grant_page_roi,
+        event_appoint_form,
+        event_appoint_form_cost,
+        event_appoint_form_ratio,
+        event_appoint_jump_click,
+        event_appoint_jump_click_cost,
+        event_appoint_jump_click_ratio
         )
-          set account_id = #{accountId}
+          set account_id = ${accountId}
     </insert>
 
     <select id="selectCost" resultType="com.alibaba.fastjson.JSONObject">