From 310454929bea9068cc1a92768bae4ace72a8288c Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Mon, 24 Oct 2022 11:48:11 +0800
Subject: [PATCH] =?UTF-8?q?enhancement=20#I5XB03=20=E5=A2=9E=E5=8A=A0dtd?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=8A=A0=E5=BC=BAxml=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/dtd/liteflow.dtd       | 44 ++++---------------
 .../src/test/resources/base/flow.el.xml       |  1 +
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/liteflow-core/src/main/resources/dtd/liteflow.dtd b/liteflow-core/src/main/resources/dtd/liteflow.dtd
index b8e2b6b80..2545188e1 100644
--- a/liteflow-core/src/main/resources/dtd/liteflow.dtd
+++ b/liteflow-core/src/main/resources/dtd/liteflow.dtd
@@ -1,43 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!ELEMENT flow (nodes* |chain*)+>
 
-<!ELEMENT nodes (node+)>
+<!ELEMENT flow  ((nodes) , (chain)+)>
+<!ELEMENT nodes  (node)+>
+<!ELEMENT node  (#PCDATA | EMPTY)*>
+<!ELEMENT chain (#PCDATA)>
 
-<!ELEMENT chain (then* | when* | pre* | finally*)+>
-<!ATTLIST chain
-        name CDATA #REQUIRED
-        >
-
-<!ELEMENT node (#PCDATA)>
 <!ATTLIST node
         id CDATA #REQUIRED
+        type (script|if_script|switch_script|while_script|for_script|break_script) #IMPLIED
         class CDATA #IMPLIED
-        name CDATA #IMPLIED
-        type CDATA #IMPLIED
-        file CDATA #IMPLIED
-
+        language (groovy|js) #IMPLIED
         >
-
-<!ELEMENT then (#PCDATA)>
-<!ATTLIST then
-        value CDATA #REQUIRED
-        >
-
-<!ELEMENT finally (#PCDATA)>
-<!ATTLIST finally
-        value CDATA #REQUIRED
-        >
-
-<!ELEMENT pre (#PCDATA)>
-<!ATTLIST pre
-        value CDATA #REQUIRED
-        >
-
-<!ELEMENT when (#PCDATA)>
-<!ATTLIST when
-        value CDATA #REQUIRED
-        errorResume CDATA #IMPLIED
-        group CDATA #IMPLIED
-        any CDATA #IMPLIED
-        threadExecutorClass CDATA #IMPLIED
-        >
\ No newline at end of file
+<!ATTLIST chain
+        name CDATA #REQUIRED>
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml
index 578b8468a..af69a1c64 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE flow PUBLIC  "liteflow" "liteflow.dtd">
 <flow>
     <chain name="chain1">
         THEN(a,b,WHEN(c,d));