diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java index 0e5505217..070ec88e3 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java @@ -263,8 +263,6 @@ public class LiteFlowChainELBuilder { public static ValidationResp validateWithEx(String elStr) { ValidationResp resp = new ValidationResp(); try { - // 移除注释 - elStr = ElRegexUtil.removeComments(elStr); LiteFlowChainELBuilder.createChain().setEL(elStr); resp.setSuccess(true); } catch (Exception e) { 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 9c3df1206..2d87abfea 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 @@ -352,21 +352,21 @@ public class ParserHelper { // 如果有route这个标签，说明是决策表chain // 决策表链路必须有route和body这两个标签 if (routeElement != null){ - builder.setRoute(ElRegexUtil.removeComments(routeElement.getText())); + builder.setRoute(routeElement.getText()); Element bodyElement = e.element(BODY); if (bodyElement == null){ String errMsg = StrUtil.format("If you have defined the tag , then you must define the tag in chain[{}]", chainId); throw new FlowSystemException(errMsg); } - builder.setEL(ElRegexUtil.removeComments(bodyElement.getText())); + builder.setEL(bodyElement.getText()); }else{ // 即使没有route这个标签，body标签单独写也是被允许的 Element bodyElement = e.element(BODY); if (bodyElement != null){ - builder.setEL(ElRegexUtil.removeComments(bodyElement.getText())); + builder.setEL(bodyElement.getText()); }else{ - builder.setEL(ElRegexUtil.removeComments(e.getText())); + builder.setEL(e.getText()); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/util/ElRegexUtil.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/ElRegexUtil.java index eacbbd369..8598f0531 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/util/ElRegexUtil.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/ElRegexUtil.java @@ -21,23 +21,6 @@ public class ElRegexUtil { // abstractChain 占位符正则表达式 private static final String REGEX_ABSTRACT_HOLDER = "\\{\\{\\s*([a-zA-Z_][a-zA-Z_\\d]*|\\d+)\\s*\\}\\}(?![\\s]*=)"; - /** - * 移除 el 表达式中的注释，支持 java 的注释，包括单行注释、多行注释， 会压缩字符串，移除空格和换行符 - * - * @param elStr el 表达式 - * @return 移除注释后的 el 表达式 - */ - public static String removeComments(String elStr) { - if (StrUtil.isBlank(elStr)) { - return elStr; - } - - return Pattern.compile(REGEX_COMMENT) - .matcher(elStr) - // 移除注释 - .replaceAll(CharSequenceUtil.EMPTY); - } - /** * 根据抽象EL和实现EL，替换抽象EL中的占位符 * diff --git a/pom.xml b/pom.xml index bb586b654..9dc40ddfa 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ - 2.12.4.1 + 2.12.4.2 UTF-8 UTF-8 8