Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/tem/bocai/schedules/CrawlerSchedule.java

src/main/java/com/tem/bocai/schedules/CrawlerSchedule.java

@@ -35,7 +35,7 @@ public class CrawlerSchedule {
     /*@Scheduled(cron = "0 6-59/5 7-23 * * ?")
     @Scheduled(cron = "0 0-55/5 0-6 * * ?")*/
     // 从7:00分30秒起每5分钟执行一次
-//   @Scheduled(cron = "30 0/5 * * * ?")
+   @Scheduled(cron = "30 0/5 * * * ?")
     public void executeLotteryDraw() {
         log.info("开始爬取开奖结果");
         int retryCount = 0;
@@ -119,7 +119,7 @@ public class CrawlerSchedule {
 
 
     // 从7:00分30秒起每5分钟执行一次爬取今日已经结算
-//    @Scheduled(cron = "30 0/5 * * * ?")
+    @Scheduled(cron = "35 0/5 * * * ?")
     public void executeSettlement() {
         log.info("开始爬取今日已经结算...");
         int retryCount = 0;