Merge branch 'master' into dev

# Conflicts:
#	pom.xml
This commit is contained in:
everywhere.z
2024-12-31 16:39:57 +08:00

View File

@@ -576,7 +576,8 @@ public class FlowExecutor {
List<Tuple> routeTupleList = new ArrayList<>();
for (Chain routeChain : routeChainList){
CompletableFuture<Slot> f = CompletableFuture.supplyAsync(
() -> doExecute(routeChain.getChainId(), param, finalRequestId, contextBeanClazzArray, contextBeanArray, null, InnerChainTypeEnum.NONE, ChainExecuteModeEnum.ROUTE)
() -> doExecute(routeChain.getChainId(), param, finalRequestId, contextBeanClazzArray, contextBeanArray, null, InnerChainTypeEnum.NONE, ChainExecuteModeEnum.ROUTE),
ExecutorHelper.loadInstance().buildWhenExecutor()
);
routeTupleList.add(new Tuple(routeChain, f));
@@ -612,7 +613,8 @@ public class FlowExecutor {
List<CompletableFuture<Slot>> executeChainCfList = new ArrayList<>();
for (Chain chain : matchedRouteChainList){
CompletableFuture<Slot> cf = CompletableFuture.supplyAsync(
() -> doExecute(chain.getChainId(), param, finalRequestId, contextBeanClazzArray, contextBeanArray, null, InnerChainTypeEnum.NONE, ChainExecuteModeEnum.BODY)
() -> doExecute(chain.getChainId(), param, finalRequestId, contextBeanClazzArray, contextBeanArray, null, InnerChainTypeEnum.NONE, ChainExecuteModeEnum.BODY),
ExecutorHelper.loadInstance().buildWhenExecutor()
);
executeChainCfList.add(cf);
}