From d62a05ee87c83ca3bed8cab78418cf019d5b549f Mon Sep 17 00:00:00 2001 From: "bryan.zhang" Date: Thu, 18 Jan 2018 11:42:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8slot=E9=87=8C=E9=9D=A2=E5=8A=A0?= =?UTF-8?q?=E5=85=A5chainName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../com/thebeastshop/liteflow/core/FlowExecutor.java | 1 + .../thebeastshop/liteflow/entity/data/AbsSlot.java | 12 +++++++++++- .../com/thebeastshop/liteflow/entity/data/Slot.java | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a72cb0d85..918cb6ba0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ liteflow jar 4.0.0 - 1.2.16 + 1.2.17 UTF-8 diff --git a/src/main/java/com/thebeastshop/liteflow/core/FlowExecutor.java b/src/main/java/com/thebeastshop/liteflow/core/FlowExecutor.java index fa8927e55..816fd588f 100644 --- a/src/main/java/com/thebeastshop/liteflow/core/FlowExecutor.java +++ b/src/main/java/com/thebeastshop/liteflow/core/FlowExecutor.java @@ -102,6 +102,7 @@ public class FlowExecutor { if(!isInnerChain) { slot.setRequestData(param); + slot.setChainName(chainId); }else { slot.setChainReqData(chainId, param); } diff --git a/src/main/java/com/thebeastshop/liteflow/entity/data/AbsSlot.java b/src/main/java/com/thebeastshop/liteflow/entity/data/AbsSlot.java index 80af5e047..13e4393b3 100644 --- a/src/main/java/com/thebeastshop/liteflow/entity/data/AbsSlot.java +++ b/src/main/java/com/thebeastshop/liteflow/entity/data/AbsSlot.java @@ -28,6 +28,8 @@ public abstract class AbsSlot implements Slot{ private final String RESPONSE = "response"; + private final String CHAINNAME = "chain_name"; + private final String COND_NODE_PREFIX = "cond_"; private final String NODE_INPUT_PREFIX = "input_"; @@ -98,6 +100,14 @@ public abstract class AbsSlot implements Slot{ return (T)dataMap.get(COND_NODE_PREFIX + key); } + public void setChainName(String chainName) { + dataMap.put(CHAINNAME, chainName); + } + + public String getChainName() { + return (String)dataMap.get(CHAINNAME); + } + public void addStep(CmpStep step){ CmpStep lastStep = this.executeSteps.peekLast(); if(lastStep != null && lastStep.equals(step)) { @@ -117,7 +127,7 @@ public abstract class AbsSlot implements Slot{ str.append("==>"); } } - LOG.info("[{}]:{}",getRequestId(),str.toString()); + LOG.info("[{}]:CHAIN_NAME[{}]\n{}",getRequestId(),str.toString()); } @Override diff --git a/src/main/java/com/thebeastshop/liteflow/entity/data/Slot.java b/src/main/java/com/thebeastshop/liteflow/entity/data/Slot.java index a7163e9a2..7b9913406 100644 --- a/src/main/java/com/thebeastshop/liteflow/entity/data/Slot.java +++ b/src/main/java/com/thebeastshop/liteflow/entity/data/Slot.java @@ -45,4 +45,8 @@ public interface Slot { public void generateRequestId(); public String getRequestId(); + + public void setChainName(String chainName); + + public String getChainName(); }