From 6cf11c5b24bf3c56710876bdf383a9aac4ecf216 Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Wed, 27 Nov 2024 17:11:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=20#IB7EQJ=20SWITCH=E5=90=8E=E7=9A=84tar?=
 =?UTF-8?q?get=E5=A6=82=E6=9E=9C=E5=8A=A0=E4=BA=86maxWaitMilliseconds?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=80=89=E4=B8=8D=E5=88=B0=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../liteflow/builder/el/operator/MaxWaitTimeOperator.java    | 2 ++
 .../test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java  | 5 +++++
 .../src/test/resources/maxWaitSeconds/flow.el.xml            | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java
index fb5bdfd13..6ca3fd3ec 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java
@@ -65,6 +65,8 @@ public abstract class MaxWaitTimeOperator extends BaseOperator<Condition> {
         timeoutCondition.addExecutable(executable);
         timeoutCondition.setMaxWaitTime(maxWaitTime);
         timeoutCondition.setMaxWaitTimeUnit(getMaxWaitTimeUnit());
+        timeoutCondition.setId(executable.getId());
+        timeoutCondition.setTag(executable.getTag());
         return timeoutCondition;
     }
 
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java
index 611e39c17..1976909bf 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java
@@ -111,6 +111,11 @@ public class MaxWaitSecondsELSpringbootTest extends BaseTest {
         assertNotTimeout("switch2");
     }
 
+    @Test
+    public void testSwitch3() {
+        assertNotTimeout("switch3");
+    }
+
     // 测试 IF 的超时情况
     @Test
     public void testIf1() {
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml
index 17edf5a01..e8b8d3442 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml
@@ -62,6 +62,11 @@
         SWITCH(s).TO(a, b).maxWaitSeconds(3);
     </chain>
 
+    <chain name="switch3">
+        <!-- 不超时 -->
+        SWITCH(s).TO(a.maxWaitSeconds(3), b.maxWaitSeconds(2));
+    </chain>
+
     <!-- 条件编排测试 -->
     <!-- f 返回 true -->
     <chain name="if1">

From 39494ae004fdc566288429f5f98b1a0af1a8bb2c Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Wed, 27 Nov 2024 17:12:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A1=A5=E4=B8=81?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC2.12.4.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bb586b654..7fa30d670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 	</scm>
 
 	<properties>
-		<revision>2.12.4.1</revision>
+		<revision>2.12.4.3</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>8</maven.compiler.source>