浏览代码

Merge branch 'test' into test-upload

yumeng 5 年之前
父节点
当前提交
7223f585e9

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/AccountCpaBidJob.java

@@ -58,6 +58,7 @@ public class AccountCpaBidJob implements Job {
 
                         });
                     }
+                    executorService.shutdown();
 
                 }
             }

+ 8 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyLoadFileJob.java

@@ -31,8 +31,6 @@ public class KuaishouDailyLoadFileJob implements Job {
     static CountDownLatch countDownLatch = null;
     @Autowired
     private IKuaiShouDailyReportTaskService dailyReportTaskService;
-    @Autowired
-    private IKuaiShouDailyReportTaskService kuaiShouDailyReportTaskService;
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -63,16 +61,18 @@ public class KuaishouDailyLoadFileJob implements Job {
                         }
                     });
                 }
-                try {
-                    countDownLatch.await();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                kuaiShouDailyReportTaskService.formatCreativeDailyReportData(null, statDate);
                 executorService.shutdown();
             }
         };
         thread.start();
 
     }
+
+
+    public static void main(String[] args) {
+        String nowDate = DateUtils.getDate("yyyy-MM-dd");
+        String statDate = getAnotherDay("yyyy-MM-dd", nowDate, -1);
+
+        System.err.println(statDate);
+    }
 }

+ 5 - 8
jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -1,5 +1,6 @@
 server:
   port: 8080
+  ip: 39.106.184.70
   servlet:
     context-path: /jeecg-boot
     compression:
@@ -14,7 +15,7 @@ management:
 
 spring:
   rabbitmq:
-    host: 127.0.0.1
+    host: 39.106.184.70
     port: 5672
     username: guest
     password: guest
@@ -64,10 +65,6 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-    username: hcst
-    password: test@20190531
-    driver-class-name: com.mysql.jdbc.Driver
     druid:
       stat-view-servlet:
         enabled: true
@@ -104,8 +101,8 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: root
-          password: hcst2019
+          username: hcst
+          password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -171,4 +168,4 @@ oss:
   replace:
     replace-value: oss-cn-beijing-internal
     replace-old-value: oss-cn-beijing
-    download: /mnt/file/video/
+    download: /mnt/file/video/

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouDailyReportTaskServiceImpl.java

@@ -129,6 +129,8 @@ public class KuaiShouDailyReportTaskServiceImpl extends ServiceImpl<KuaiShouDail
 
                 } else if (task.getViewType() == 4) {
                     reportDailyCreativeMapper.loadCreativeDailyReport(task.getAccountId(), localPath);
+                    Thread.sleep(1 * 1000);
+                    reportDailyCreativeMapper.formatCreativeDailyReportData(task.getAccountId(), task.getStatDate());
                 }
             }