Merge remote-tracking branch 'origin/master'

data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/Application.java

@@ -3,6 +3,7 @@ package com.bailuntec;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.bailuntec.job.AdvertAddTaskSyncJob;
 import com.bailuntec.job.AdvertResultSyncJob;
+import com.bailuntec.listener.AdvertSyncJobListener;
 import com.bailuntec.utils.PropertiesUtil;
 import com.dangdang.ddframe.job.config.JobCoreConfiguration;
 import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration;
@@ -26,7 +27,7 @@ public class Application {
     private static final String EVENT_RDB_STORAGE_PASSWORD = propertiesUtil.getPropertyAsString("EVENT_RDB_STORAGE_PASSWORD");
 
     public static void main(String[] args) {
-        new JobScheduler(createRegistryCenter(), createJobConfiguration1()).init();
+        new JobScheduler(createRegistryCenter(), createJobConfiguration1(), createJobEventConfiguration(), new AdvertSyncJobListener()).init();
       //  new JobScheduler(createRegistryCenter(), createJobConfiguration2()).init();
     }
 

data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/listener/AdvertSyncJobListener.java

+package com.bailuntec.listener;
+
+import com.dangdang.ddframe.job.executor.ShardingContexts;
+import com.dangdang.ddframe.job.lite.api.listener.ElasticJobListener;
+
+public class AdvertSyncJobListener implements ElasticJobListener {
+    @Override
+    public void beforeJobExecuted(ShardingContexts shardingContexts) {
+
+    }
+    @Override
+    public void afterJobExecuted(ShardingContexts shardingContexts) {
+
+    }
+}

data-base/base_sync_finance_amazon/src/main/resources/const.properties

@@ -3,6 +3,7 @@ GETRESULT_FINANCE_URL=http://10.0.3.5:18321/outer/getresult
 ACCOUNT_API=http://pams.bailuntec.com/Api/GetAccountToken?platform=Amazon
 CAMPAIGNS_REPORT=https://advertising-api.amazon.com/v2/sp/campaigns/report
 V2_REPORTS=https://advertising-api.amazon.com/v2/reports/
+WARN_API=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b4655a50-927a-4c3c-87ad-a900e54dcc8e
 #METRICS=campaignName,campaignId,campaignStatus,campaignBudget,attributedConversions1d,attributedUnitsOrdered1d,attributedSales1d,attributedUnitsOrdered7d,attributedSales1d,impressions,clicks,cost,attributedConversions30d,attributedConversions14d,attributedConversions7d,attributedSales30d,attributedSales14d,attributedSales7d
 METRICS=campaignName,campaignId,cost,currency,campaignStatus,campaignBudget,cost