Merge branch 'master' into test6.8.9

@@ -78,7 +78,7 @@ public class GrassArticleSyncServiceImpl implements IGrassArticleSyncService {
     @Override
     public String syncArticle(Long startTime, Long endTime) {
         logger.info("syncArticle begin, startTime is {}, endTime is {}", startTime, endTime);
-        ExecutorService es = Executors.newSingleThreadExecutor();
+        ExecutorService es = Executors.newFixedThreadPool(2);
         int pageSize = 100;
         int total = grassArticleRepository.countByCreateTimeAfterAndCreateTimeBeforeAndArticleTypeInAndAuthStatusIn(startTime, endTime,needSyncArticleType,needSyncArticleStatus);
         logger.info("syncArticle get grassArticle count is {}", total);