Merge branch 'working' into 'master'

Working

See merge request !249

src/main/java/com/zhiwei/searchhotcrawler/crawler/BaiDuHotSearchCrawler.java

@@ -33,7 +33,6 @@ public class BaiDuHotSearchCrawler {
 //    private static HttpBoot httpBoot = HttpBoot.newBuilder().retryTimes(3).connectTimeout(Duration.ofSeconds(60)).build();
 
 
-
     /**
      * @return void 返回类型
      * @Title: BaiDuHotSearchTest

src/main/java/com/zhiwei/searchhotcrawler/timer/quartz/GatherTimer.java

@@ -43,7 +43,7 @@ public class GatherTimer {
      * 虎嗅热文推荐的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ?")
+    //@Scheduled(cron = "0 * * * * ?")
     public void crawlerHuXiu() {
         log.info("虎嗅热文推荐开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -66,7 +66,7 @@ public class GatherTimer {
      * 微博热搜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerWeiBo(){
         log.info("微博热搜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -80,7 +80,7 @@ public class GatherTimer {
      * 微博热搜导语，阅读量，讨论量更新
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "45 0/10 * * * ? ")
+    //@Scheduled(cron = "45 0/10 * * * ? ")
     public void updateWeiBo(){
         log.info("微博热搜导语更新...");
         HotSearchCacheDAO hotSearchCacheDAO = new HotSearchCacheDAO();
@@ -105,7 +105,7 @@ public class GatherTimer {
      * 今日头条热搜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerTouTiao(){
         log.info("今日头条热搜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -126,7 +126,7 @@ public class GatherTimer {
      * 百度热搜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerBaiDu(){
         log.info("百度热搜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -140,7 +140,7 @@ public class GatherTimer {
      * 抖音热搜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerDouYin(){
         log.info("抖音热搜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -154,7 +154,7 @@ public class GatherTimer {
      * 抖音链接的更新
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 0/5 * * * ?  ")
+    //@Scheduled(cron = "0 0/5 * * * ?  ")
     public void updateDouYinUrl(){
         log.info("抖音链接更新开始...");
         HotSearchCacheDAO hotSearchCacheDAO = new HotSearchCacheDAO();
@@ -181,7 +181,7 @@ public class GatherTimer {
      * 知乎热榜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerZhihu(){
         log.info("知乎热搜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -195,7 +195,7 @@ public class GatherTimer {
      * 搜狗微信热词的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerWeChat(){
         log.info("搜狗微信热词开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -223,7 +223,7 @@ public class GatherTimer {
      * 微博话题的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerWeiBoTopic(){
         log.info("微博话题开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -237,7 +237,7 @@ public class GatherTimer {
      * 腾讯新闻热点的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "10 * * * * ? ")
+    //@Scheduled(cron = "10 * * * * ? ")
     public void crawlerTengXun(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = TengXunCrawler.getTengXunHotList(date);
@@ -259,7 +259,7 @@ public class GatherTimer {
      * 新浪热榜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "10 * * * * ? ")
+    //@Scheduled(cron = "10 * * * * ? ")
     public void crawlerXinLangHotSearch(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = XinLangHotSearchCrawler.getXinLangHotSearch(date);
@@ -270,7 +270,7 @@ public class GatherTimer {
      * 网易新闻热榜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "10 * * * * ? ")
+    //@Scheduled(cron = "10 * * * * ? ")
     public void crawlerWangYiHotSearch(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = WangYiHotSearchCrawler.getWangYiHotSearch(date);
@@ -281,7 +281,7 @@ public class GatherTimer {
      * 网易新闻跟帖热议的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "10 * * * * ? ")
+    //@Scheduled(cron = "10 * * * * ? ")
     public void crawlerWangYiHotComment(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = WangYiHotSearchCrawler.getWangYicomment(date);
@@ -292,7 +292,7 @@ public class GatherTimer {
      * 凤凰新闻热榜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "10 * * * * ? ")
+    //@Scheduled(cron = "10 * * * * ? ")
     public void crawlerFengHuangHotData(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = FengHuangSearchCrawler.getFengHuangHotData(date);
@@ -328,7 +328,7 @@ public class GatherTimer {
      * 搜狐话题的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "20 * * * * ? ")
+    //@Scheduled(cron = "20 * * * * ? ")
     public void crawlerSouHuTopic(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = SouhuTopicCrawler.getSouhuTopic(date);
@@ -339,7 +339,7 @@ public class GatherTimer {
      * 知乎热搜话题的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "20 * * * * ? ")
+    //@Scheduled(cron = "20 * * * * ? ")
     public void crawlerZhihuHotTopic(){
         log.info("知乎热搜话题开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -353,7 +353,7 @@ public class GatherTimer {
      * 微博预热榜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "20 * * * * ? ")
+    //@Scheduled(cron = "20 * * * * ? ")
     public void crawlerWeiBoPreheat(){
         log.info("微博预热榜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -394,7 +394,7 @@ public class GatherTimer {
      * maimai采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "30 0/30 * * * ? ")
+    //@Scheduled(cron = "30 0/30 * * * ? ")
     public void crawlerMaiMaiHotSearch(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = MaiMaiHotSearchCrawler.getMaiMaiHotData(date);
@@ -411,7 +411,7 @@ public class GatherTimer {
      * B站排行榜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "30 * * * * ? ")
+    //@Scheduled(cron = "30 * * * * ? ")
     public void crawlerBilibiliHotSearch(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list =BililiCrawler.getBilibiliHotSearch(date);
@@ -422,7 +422,7 @@ public class GatherTimer {
      * B站热搜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "30 * * * * ? ")
+    //@Scheduled(cron = "30 * * * * ? ")
     public void crawlerBilibiliHotData() {
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = BililiCrawler.getBiHotData(date);
@@ -514,7 +514,7 @@ public class GatherTimer {
      *快手热榜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerKuaiShou(){
         log.info("快手热榜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -527,7 +527,7 @@ public class GatherTimer {
      *淘宝热搜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerTaoBao(){
         log.info("淘宝热搜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -581,7 +581,7 @@ public class GatherTimer {
      *微博娱乐榜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerWeiBoEntertainment(){
         log.info("微博娱乐榜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -594,7 +594,7 @@ public class GatherTimer {
      *微博要闻榜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerWeiBoNews(){
         log.info("微博要闻榜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -620,7 +620,7 @@ public class GatherTimer {
      * B站综合热门的采集 每小时一次
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 0 0/1 * * ? ")
+    //@Scheduled(cron = "0 0 0/1 * * ? ")
     public void crawlerBiliComprehensiveHot(){
         log.info("B站综合热门开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -634,7 +634,7 @@ public class GatherTimer {
      * 微视热榜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerWeiShiHotSearch(){
         log.info(" 微视热榜采集开始........");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -648,7 +648,7 @@ public class GatherTimer {
      * 微博出圈榜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerWeiBoOutCircle(){
         log.info(" 微博出圈榜采集开始........");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -662,7 +662,7 @@ public class GatherTimer {
      * 头条财经,科技,汽车,数码榜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void toutiaoOtherListByPhone(){
         log.info(" 头条财经,科技,汽车,数码榜采集开始........");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -692,7 +692,7 @@ public class GatherTimer {
      * 微博视频榜采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerWeiBoVideo(){
         log.info("微博视频榜采集开始........");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -706,7 +706,7 @@ public class GatherTimer {
      * 抖音娱乐榜的采集
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 * * * * ? ")
+    //@Scheduled(cron = "0 * * * * ? ")
     public void crawlerDouYinEntertainment(){
         log.info("抖音娱乐榜开始采集...");
         Date date = DateUtils.getMillSecondTime(new Date());
@@ -720,7 +720,7 @@ public class GatherTimer {
      * 抖音娱乐榜链接的更新
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 0/5 * * * ?  ")
+    //@Scheduled(cron = "0 0/5 * * * ?  ")
     public void updateDouYinEntertainmentUrl(){
         log.info("抖音娱乐榜链接更新开始...");
         HotSearchCacheDAO hotSearchCacheDAO = new HotSearchCacheDAO();
@@ -749,7 +749,7 @@ public class GatherTimer {
      * 微博品牌榜采集(一小时采集一次)
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "0 0 0/1 * * ? ")
+    //@Scheduled(cron = "0 0 0/1 * * ? ")
     public void crawlerWeiBoBrandTotalList(){
 
         log.info("微博品牌总榜采集开始........");
@@ -812,7 +812,7 @@ public class GatherTimer {
      * 脉脉话题采集(一小时一次)
      */
     @Async(value = "myScheduler")
-    @Scheduled(cron = "30 0 0/1 * * ? ")
+    //@Scheduled(cron = "30 0 0/1 * * ? ")
     public void crawlerMaiMaiTopic(){
         Date date = DateUtils.getMillSecondTime(new Date());
         List<HotSearchList> list = MaiMaiTopicCrawler.getMaiMaiTopicData(date);