From e204cb8fd36a80d65829d5884020d10908f468b6 Mon Sep 17 00:00:00 2001
From: zy <953725892@qq.com>
Date: Sat, 7 Oct 2023 20:11:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#I7SVZF=20=E4=BD=BF=E7=94=A8hutool?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../liteflow/parser/helper/ParserHelper.java        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java
index b43ac7b79..bb44c4375 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java
@@ -1,6 +1,7 @@
 package com.yomahub.liteflow.parser.helper;
 
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -24,7 +25,7 @@ import static com.yomahub.liteflow.common.ChainConstant.*;
 /**
  * Parser 通用 Helper
  *
- * @author tangkc
+ * @author tangkc,zy
  */
 public class ParserHelper {
 
@@ -149,11 +150,11 @@ public class ParserHelper {
 				// 检查 chainName
 				checkChainId(chainName, e.getText());
 				if (!chainNameSet.add(chainName)) {
-					throw new ChainDuplicateException(String.format("[chain name duplicate] chainName=%s", chainName));
+					throw new ChainDuplicateException(StrUtil.format("[chain name duplicate] chainName={}", chainName));
 				}
 
 				FlowBus.addChain(chainName);
-				if(!("true".equals(e.attributeValue(ABSTRACT)))) {
+				if(BooleanUtil.toBoolean(e.attributeValue(ABSTRACT))==true){
 					abstratChainMap.put(chainName,e);
 				}
 			});
@@ -169,7 +170,7 @@ public class ParserHelper {
 				//首先需要对继承自抽象Chain的chain进行字符串替换
 				parseImplChain(abstratChainMap, implChainSet, chain);
 				//如果一个chain不为抽象chain，则进行解析
-				if(chain.attributeValue(ABSTRACT) == null || !chain.attributeValue(ABSTRACT).equals("true")){
+				if(BooleanUtil.toBoolean(chain.attributeValue(ABSTRACT))==false){
 					parseOneChainConsumer.accept(chain);
 				}
 			}
@@ -307,7 +308,7 @@ public class ParserHelper {
 			if(baseChain!=null) {
 				internalParseImplChain(baseChain,chain,abstratChainMap,implChainSet);
 			}else{
-				throw new ChainNotFoundException(String.format("[abstract chain not found] chainName=%s", baseChainId));
+				throw new ChainNotFoundException(StrUtil.format("[abstract chain not found] chainName={}", baseChainId));
 			}
 		}
 	}
@@ -325,7 +326,7 @@ public class ParserHelper {
 			if(baseChain!=null) {
 				internalParseImplChain(baseChain,chainNode,abstratChainMap,implChainSet);
 			}else{
-				throw new ChainNotFoundException(String.format("[abstract chain not found] chainName=%s", baseChainId));
+				throw new ChainNotFoundException(StrUtil.format("[abstract chain not found] chainName={}", baseChainId));
 			}
 		}
 	}