|
|
@@ -272,12 +272,10 @@ public class ChannelDemandMatchJob {
|
|
|
)
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
- // 等待所有渠道处理完成,单个渠道超时60分钟
|
|
|
+ // 等待所有渠道处理完成
|
|
|
CompletableFuture<Void> allFuture = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
|
|
|
try {
|
|
|
- allFuture.get(60, TimeUnit.MINUTES);
|
|
|
- } catch (TimeoutException e) {
|
|
|
- log.error("多渠道并发执行超时,部分渠道可能未完成");
|
|
|
+ allFuture.get();
|
|
|
} catch (ExecutionException e) {
|
|
|
log.error("多渠道并发执行异常: {}", e.getCause().getMessage(), e.getCause());
|
|
|
}
|