From 10c6e07683a918760182d40d7eb248c305318fcc Mon Sep 17 00:00:00 2001
From: blinkfox <chenjiayin1990@163.com>
Date: Wed, 3 Feb 2021 17:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=20Fenix=20=E7=9A=84=20XML=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86=20xmlns=20?=
 =?UTF-8?q?=E7=AD=89=E5=85=83=E7=B4=A0=EF=BC=8C=E7=94=A8=E4=BA=8E=20xsd=20?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=92=8C=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fenix.xsd                                       | 3 ++-
 src/test/resources/fenix/BlogRepository.xml     | 5 ++++-
 src/test/resources/fenix/UnitTestRepository.xml | 5 ++++-
 src/test/resources/fenix/UserRepository.xml     | 5 ++++-
 src/test/resources/fenix/fenix.xml              | 5 ++++-
 src/test/resources/my/dir/xml/other-dir.xml     | 5 ++++-
 src/test/resources/myfenix/my.xml               | 5 ++++-
 src/test/resources/others/fenix-xml.xml         | 5 ++++-
 8 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/fenix.xsd b/fenix.xsd
index 2f2c03b8..314732a9 100644
--- a/fenix.xsd
+++ b/fenix.xsd
@@ -129,6 +129,7 @@
             </xs:choice>
             <xs:attribute name="id" type="xs:string" use="required"/>
             <xs:attribute name="resultType" type="xs:string"/>
+            <xs:attribute name="removeIfExist" type="xs:string"/>
         </xs:complexType>
     </xs:element>
 
@@ -174,4 +175,4 @@
         </xs:complexType>
     </xs:element>
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/src/test/resources/fenix/BlogRepository.xml b/src/test/resources/fenix/BlogRepository.xml
index f0efb828..6658115d 100644
--- a/src/test/resources/fenix/BlogRepository.xml
+++ b/src/test/resources/fenix/BlogRepository.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 这是用来测试 XML 模版或标签生成的 SQL语句或参数的 Fenix XML 文件. -->
-<fenixs namespace="BlogRepository">
+<fenixs namespace="BlogRepository"
+        xmlns="http://www.w3school.com.cn"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.w3school.com.cn https://gitee.com/blinkfox/fenix/raw/master/fenix.xsd">
 
     <!-- 一个最简单的示例来查询我的博客信息. -->
     <fenix id="querySimplyDemo">
diff --git a/src/test/resources/fenix/UnitTestRepository.xml b/src/test/resources/fenix/UnitTestRepository.xml
index a36ea5b2..c90f38a6 100644
--- a/src/test/resources/fenix/UnitTestRepository.xml
+++ b/src/test/resources/fenix/UnitTestRepository.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 这是用来单元测试 XML 模版或标签生成的 SQL 的数据库操作运行时的 Fenix XML 仓库. -->
-<fenixs namespace="UnitTestRepository">
+<fenixs namespace="UnitTestRepository"
+        xmlns="http://www.w3school.com.cn"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.w3school.com.cn https://gitee.com/blinkfox/fenix/raw/master/fenix.xsd">
 
     <fenix id="sqlHeader">
         SELECT u FROM User AS u
diff --git a/src/test/resources/fenix/UserRepository.xml b/src/test/resources/fenix/UserRepository.xml
index 511667f6..9ca002f5 100644
--- a/src/test/resources/fenix/UserRepository.xml
+++ b/src/test/resources/fenix/UserRepository.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 这是用来测试 XML 模版或标签生成的 SQL语句或参数的 Fenix XML 文件. -->
-<fenixs namespace="com.blinkfox.fenix.repository.UserRepository">
+<fenixs namespace="com.blinkfox.fenix.repository.UserRepository"
+        xmlns="http://www.w3school.com.cn"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.w3school.com.cn https://gitee.com/blinkfox/fenix/raw/master/fenix.xsd">
 
     <fenix id="UserHeader">
         SELECT u FROM User AS u
diff --git a/src/test/resources/fenix/fenix.xml b/src/test/resources/fenix/fenix.xml
index 0d430362..ff752e48 100644
--- a/src/test/resources/fenix/fenix.xml
+++ b/src/test/resources/fenix/fenix.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 这是用来测试 XML 模版或标签生成的 SQL语句或参数的 Fenix XML 文件. -->
-<fenixs namespace="fenix">
+<fenixs namespace="fenix"
+        xmlns="http://www.w3school.com.cn"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.w3school.com.cn https://gitee.com/blinkfox/fenix/raw/master/fenix.xsd">
 
     <!-- 用于单元测试 equal 标签生成的 JPQL 语句和参数. -->
     <fenix id="equal">
diff --git a/src/test/resources/my/dir/xml/other-dir.xml b/src/test/resources/my/dir/xml/other-dir.xml
index b55f6c2d..148ab8dd 100644
--- a/src/test/resources/my/dir/xml/other-dir.xml
+++ b/src/test/resources/my/dir/xml/other-dir.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 这是用来 XML 文件在自定义的目录中. -->
-<fenixs namespace="otherFenix">
+<fenixs namespace="otherFenix"
+        xmlns="http://www.w3school.com.cn"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.w3school.com.cn https://gitee.com/blinkfox/fenix/raw/master/fenix.xsd">
 
     <!-- 测试该多个 and 时移除 "1 = 1 AND " 的 SQL 片段 -->
     <fenix id="queryUsersByName" removeIfExist="1 = 1 AND ">
diff --git a/src/test/resources/myfenix/my.xml b/src/test/resources/myfenix/my.xml
index 65646aaf..576f41b3 100644
--- a/src/test/resources/myfenix/my.xml
+++ b/src/test/resources/myfenix/my.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 这是用来 XML 文件在自定义的目录中. -->
-<fenixs namespace="defaultFenix">
+<fenixs namespace="defaultFenix"
+        xmlns="http://www.w3school.com.cn"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.w3school.com.cn https://gitee.com/blinkfox/fenix/raw/master/fenix.xsd">
 
     <!-- 测试该多个 and 时移除 "1 = 1 AND " 的 SQL 片段 -->
     <fenix id="queryUsersByName" removeIfExist="1 = 1 AND ">
diff --git a/src/test/resources/others/fenix-xml.xml b/src/test/resources/others/fenix-xml.xml
index ecf06ff0..c23b3c61 100644
--- a/src/test/resources/others/fenix-xml.xml
+++ b/src/test/resources/others/fenix-xml.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 这是用来测试当配置了具体的 XML 文件路径时是否能扫描到该 XML 文件. -->
-<fenixs namespace="myFenixXml">
+<fenixs namespace="myFenixXml"
+        xmlns="http://www.w3school.com.cn"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.w3school.com.cn https://gitee.com/blinkfox/fenix/raw/master/fenix.xsd">
 
     <!-- 查询所有用户信息. -->
     <fenix id="queryAllUsers">