From a662102faca860e9ccaa183b9e5336b72892f5fa Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Mon, 24 Oct 2022 16:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=8A=A0=E4=B8=8Alanguage?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/resources/ifelse/flow.el.xml     |  8 ++---
 .../src/test/resources/loop/flow.xml          | 20 ++++++-------
 .../src/test/resources/scriptbean/flow.xml    | 12 ++++----
 .../src/test/resources/xml-script/flow.el.xml | 30 +++++++++----------
 .../resources/xml-script/flow_update.el.xml   | 20 ++++++-------
 .../src/test/resources/common/flow.xml        |  2 +-
 .../src/test/resources/ifelse/flow.xml        |  4 +--
 .../src/test/resources/loop/flow.xml          |  6 ++--
 .../src/test/resources/refresh/flow.xml       |  2 +-
 .../test/resources/refresh/flow_update.xml    |  4 +--
 .../src/test/resources/scriptbean/flow.xml    |  4 +--
 .../src/test/resources/sw/flow.xml            |  2 +-
 12 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/ifelse/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/ifelse/flow.el.xml
index a0a5c2418..c48071a97 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/ifelse/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/ifelse/flow.el.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="x0" type="if_script">
+        <node id="x0" type="if_script" language="groovy">
             <![CDATA[
-                return true;
+                return true
             ]]>
         </node>
 
-        <node id="x1" type="if_script">
+        <node id="x1" type="if_script" language="groovy">
             <![CDATA[
-                return false;
+                return false
             ]]>
         </node>
     </nodes>
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/loop/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/loop/flow.xml
index 01200b857..25ef49658 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/loop/flow.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/loop/flow.xml
@@ -2,27 +2,27 @@
 <flow>
 
     <nodes>
-        <node id="x" type="for_script">
+        <node id="x" type="for_script" language="groovy">
             <![CDATA[
-                return 3;
+                return 3
             ]]>
         </node>
 
-        <node id="y" type="break_script">
+        <node id="y" type="break_script" language="groovy">
             <![CDATA[
-                def count = defaultContext.getData("test");
-                return count > 3;
+                def count = defaultContext.getData("test")
+                return count > 3
             ]]>
         </node>
 
-        <node id="z" type="while_script">
+        <node id="z" type="while_script" language="groovy">
             <![CDATA[
-                def key = "test";
+                def key = "test"
                 if (defaultContext.hasData(key)){
-                    def count = defaultContext.getData("test");
-                    return count < 5;
+                    def count = defaultContext.getData("test")
+                    return count < 5
                 }else{
-                    return true;
+                    return true
                 }
             ]]>
         </node>
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/scriptbean/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/scriptbean/flow.xml
index fbb25a168..c9e22fa3e 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/scriptbean/flow.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/scriptbean/flow.xml
@@ -2,17 +2,17 @@
 <flow>
 
     <nodes>
-        <node id="d" type="script">
+        <node id="d" type="script" language="groovy">
             <![CDATA[
-                def str = demo.getDemoStr1();
-                defaultContext.setData("demo", str);
+                def str = demo.getDemoStr1()
+                defaultContext.setData("demo", str)
             ]]>
         </node>
 
-        <node id="e" type="script">
+        <node id="e" type="script" language="groovy">
             <![CDATA[
-                def str = demo.getDemoStr2("kobe");
-                defaultContext.setData("demo", str);
+                def str = demo.getDemoStr2("kobe")
+                defaultContext.setData("demo", str)
             ]]>
         </node>
     </nodes>
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/xml-script/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/xml-script/flow.el.xml
index 206db98e3..fa87fa079 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/xml-script/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/xml-script/flow.el.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="s1" name="普通脚本1" type="script">
+        <node id="s1" name="普通脚本1" type="script" language="groovy">
             <![CDATA[
-                import cn.hutool.core.date.DateUtil;
+                import cn.hutool.core.date.DateUtil
 
-                def date = DateUtil.parse("2022-10-17 13:31:43");
-                println(date);
-                defaultContext.setData("demoDate", date);
+                def date = DateUtil.parse("2022-10-17 13:31:43")
+                println(date)
+                defaultContext.setData("demoDate", date)
 
                 class Student {
-                   int studentID;
-                   String studentName;
-                };
+                   int studentID
+                   String studentName
+                }
 
-                Student student = new Student();
-                student.studentID = 100301;
-                student.studentName = "张三";
-                defaultContext.setData("student",student);
+                Student student = new Student()
+                student.studentID = 100301
+                student.studentName = "张三"
+                defaultContext.setData("student",student)
 
-                def a=3;
-                def b=2;
-                defaultContext.setData("s1",a*b);
+                def a=3
+                def b=2
+                defaultContext.setData("s1",a*b)
             ]]>
         </node>
 
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/xml-script/flow_update.el.xml b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/xml-script/flow_update.el.xml
index a6be8d31a..70e5f3043 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/xml-script/flow_update.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/xml-script/flow_update.el.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="s1" name="普通脚本" type="script">
+        <node id="s1" name="普通脚本" type="script" language="groovy">
             <![CDATA[
                 def a=3;
                 def b=2;
@@ -9,23 +9,23 @@
             ]]>
         </node>
 
-        <node id="s2" name="条件脚本_改" type="switch_script">
+        <node id="s2" name="条件脚本_改" type="switch_script" language="groovy">
             <![CDATA[
-                count = defaultContext.getData("count");
+                count = defaultContext.getData("count")
                 if(count > 150){
-                    return "b";
+                    return "b"
                 }else{
-                    return "a";
+                    return "a"
                 }
             ]]>
         </node>
 
-        <node id="s3" name="普通脚本_新增" type="script">
+        <node id="s3" name="普通脚本_新增" type="script" language="groovy">
             <![CDATA[
-                def a=3;
-                def b=2;
-                def c=10;
-                defaultContext.setData("s1",a*b+c);
+                def a=3
+                def b=2
+                def c=10
+                defaultContext.setData("s1",a*b+c)
             ]]>
         </node>
     </nodes>
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/common/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/common/flow.xml
index 8583b8558..4eafbb464 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/common/flow.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/common/flow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="s1" name="普通脚本1" type="script">
+        <node id="s1" name="普通脚本1" type="script" language="js">
             <![CDATA[
                 var a=3;
                 var b=2;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/ifelse/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/ifelse/flow.xml
index a0a5c2418..db5d0d591 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/ifelse/flow.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/ifelse/flow.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="x0" type="if_script">
+        <node id="x0" type="if_script" language="js">
             <![CDATA[
                 return true;
             ]]>
         </node>
 
-        <node id="x1" type="if_script">
+        <node id="x1" type="if_script" language="js">
             <![CDATA[
                 return false;
             ]]>
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/loop/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/loop/flow.xml
index b27a68151..603cf721a 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/loop/flow.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/loop/flow.xml
@@ -2,20 +2,20 @@
 <flow>
 
     <nodes>
-        <node id="x" type="for_script">
+        <node id="x" type="for_script" language="js">
             <![CDATA[
                 return 3;
             ]]>
         </node>
 
-        <node id="y" type="break_script">
+        <node id="y" type="break_script" language="js">
             <![CDATA[
                 var count = defaultContext.getData("test");
                 return count > 3;
             ]]>
         </node>
 
-        <node id="z" type="while_script">
+        <node id="z" type="while_script" language="js">
             <![CDATA[
                 var key = "test";
                 if (defaultContext.hasData(key)){
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/refresh/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/refresh/flow.xml
index 51fcb3290..520326434 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/refresh/flow.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/refresh/flow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="s1" name="选择脚本" type="switch_script">
+        <node id="s1" name="选择脚本" type="switch_script" language="js">
             <![CDATA[
                 var count = defaultContext.getData("count");
                 if(count > 100){
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/refresh/flow_update.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/refresh/flow_update.xml
index 340c5efc4..19a5c5bd9 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/refresh/flow_update.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/refresh/flow_update.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="s1" name="选择脚本_改" type="switch_script">
+        <node id="s1" name="选择脚本_改" type="switch_script" language="js">
             <![CDATA[
                 var count = defaultContext.getData("count");
                 if(count > 150){
@@ -12,7 +12,7 @@
             ]]>
         </node>
 
-        <node id="s2" name="普通脚本_新增" type="script">
+        <node id="s2" name="普通脚本_新增" type="script" language="js">
             <![CDATA[
                 var a=3;
                 var b=2;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/scriptbean/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/scriptbean/flow.xml
index 1ea7703e1..c9cf7aa00 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/scriptbean/flow.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/scriptbean/flow.xml
@@ -2,14 +2,14 @@
 <flow>
 
     <nodes>
-        <node id="d" type="script">
+        <node id="d" type="script" language="js">
             <![CDATA[
                 var str = demo.getDemoStr1();
                 defaultContext.setData("demo", str);
             ]]>
         </node>
 
-        <node id="e" type="script">
+        <node id="e" type="script" language="js">
             <![CDATA[
                 var str = demo.getDemoStr2("kobe");
                 defaultContext.setData("demo", str);
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/sw/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/sw/flow.xml
index b10e3c8b7..5203f8b24 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/sw/flow.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/sw/flow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="s1" name="选择脚本" type="switch_script">
+        <node id="s1" name="选择脚本" type="switch_script" language="js">
             <![CDATA[
                 var count = defaultContext.getData('count');
                 if(count > 100){