Merge branch 'wyp/0121-bugFix' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/filter/FilterService.java

@@ -53,7 +53,7 @@ public class FilterService {
             futures.add(future);
         }
         try {
-            cdl.await(10000, TimeUnit.MILLISECONDS);
+            cdl.await(20000, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             log.error("filter error", e);
             return null;
@@ -64,6 +64,9 @@ public class FilterService {
         Set<String> filterContentIds = new HashSet<>();
         for (Future<FilterResult> f : futures) {
             try {
+                if (Objects.isNull(f)) {
+                    continue;
+                }
                 FilterResult filterResult = f.get();
                 contentIdsList.add(filterResult.getContentIds());
                 if (CollectionUtils.isNotEmpty(filterResult.getFilterContent())) {