From d4bc6e261a2613f65389c751588b4a158c2ce0af Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Sun, 9 Apr 2023 19:11:42 +0800
Subject: [PATCH] =?UTF-8?q?bug=20#I6TRT2=20EL=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84//=E8=A2=AB=E8=BF=87=E6=BB=A4=E6=8E=89?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yomahub/liteflow/parser/helper/ParserHelper.java    | 2 +-
 .../test/comments/LiteflowNodeELSpringbootTest.java         | 6 +++++-
 .../java/com/yomahub/liteflow/test/comments/cmp/ACmp.java   | 3 +++
 .../src/test/resources/comments/flow.el.xml                 | 3 ++-
 4 files changed, 11 insertions(+), 3 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 45a4838f7..30513400d 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
@@ -253,7 +253,7 @@ public class ParserHelper {
 	private static class RegexUtil {
 
 		// java 注释的正则表达式
-		private static final String REGEX_COMMENT = "/\\*((?!\\*/).|[\\r\\n])*?\\*/|[ \\t]*//.*";
+		private static final String REGEX_COMMENT = "(?<!:)\\/\\/.*|\\/\\*(\\s|.)*?\\*\\/";
 
 		/**
 		 * 移除 el 表达式中的注释，支持 java 的注释，包括单行注释、多行注释， 会压缩字符串，移除空格和换行符
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java
index 287f26265..e73d60e28 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java
@@ -3,6 +3,7 @@ package com.yomahub.liteflow.test.comments;
 import cn.hutool.core.collection.ListUtil;
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
+import com.yomahub.liteflow.slot.DefaultContext;
 import com.yomahub.liteflow.test.BaseTest;
 import org.junit.Assert;
 import org.junit.Test;
@@ -27,10 +28,13 @@ public class LiteflowNodeELSpringbootTest extends BaseTest {
 
 	// 测试注释
 	@Test
-	public void testAsyncFlow1() {
+	public void testComments1() {
 		LiteflowResponse response = flowExecutor.execute2Resp("chain1", "it's a base request");
+		DefaultContext context = response.getFirstContextBean();
+		String str = context.getData("str");
 		Assert.assertTrue(response.isSuccess());
 		Assert.assertTrue(ListUtil.toList("a==>b==>c==>b", "a==>b==>b==>c").contains(response.getExecuteStepStr()));
+		Assert.assertEquals("https://liteflow.yomahub.com", str);
 	}
 
 }
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java
index f50b451aa..69a5fb1a9 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java
@@ -10,6 +10,7 @@ package com.yomahub.liteflow.test.comments.cmp;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
+import com.yomahub.liteflow.slot.DefaultContext;
 import org.springframework.stereotype.Component;
 
 @Component("a")
@@ -17,6 +18,8 @@ public class ACmp {
 
 	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
 	public void process(NodeComponent bindCmp) {
+		DefaultContext context = bindCmp.getFirstContextBean();
+		context.setData("str", bindCmp.getCmpData(String.class));
 		System.out.println("ACmp executed!");
 	}
 
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/flow.el.xml
index e4aecb451..8169530f2 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/flow.el.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <chain name="chain1">
+        str = "https://liteflow.yomahub.com";
         // 单行注释
         THEN(
             // 单行注释
-            a,
+            a.data(str),
             b,
             WHEN(
                 /**