Merge branch 'feature-recommend2' into 'master'

调整阻塞队列大小

See merge request !2991

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/context/combined/ImageCombined.java

@@ -59,7 +59,7 @@ public class ImageCombined {
             ApolloUtils.combinedMaximumPoolSize(),
             60L,
             TimeUnit.SECONDS,
-            new ArrayBlockingQueue<>(40),
+            new ArrayBlockingQueue<>(20),
             new ThreadPoolExecutor.AbortPolicy()
     );