From 1759c4ab46fecb8743c8b4173cb6f09fd25efa08 Mon Sep 17 00:00:00 2001
From: aaron <462826@qq.com>
Date: Fri, 18 Sep 2020 08:39:10 +0800
Subject: [PATCH] close task#7909

---
 .../{test_country.yaml => test-country.yaml}  |  0
 demo/test/{test_date.yaml => test-date.yaml}  |  0
 demo/test/test-email.yaml                     | 16 +++---
 .../{test_format.yaml => test-format.yaml}    |  0
 demo/test/test-ip.yaml                        | 37 +++++++++++++
 ...est_recursice.yaml => test-recursice.yaml} |  0
 yaml/email/{email.v1.yaml => v1.yaml}         |  0
 yaml/ip/v2.yaml                               | 54 +++++++++++++++++++
 8 files changed, 99 insertions(+), 8 deletions(-)
 rename demo/test/{test_country.yaml => test-country.yaml} (100%)
 rename demo/test/{test_date.yaml => test-date.yaml} (100%)
 rename demo/test/{test_format.yaml => test-format.yaml} (100%)
 create mode 100644 demo/test/test-ip.yaml
 rename demo/test/{test_recursice.yaml => test-recursice.yaml} (100%)
 rename yaml/email/{email.v1.yaml => v1.yaml} (100%)
 create mode 100644 yaml/ip/v2.yaml

diff --git a/demo/test/test_country.yaml b/demo/test/test-country.yaml
similarity index 100%
rename from demo/test/test_country.yaml
rename to demo/test/test-country.yaml
diff --git a/demo/test/test_date.yaml b/demo/test/test-date.yaml
similarity index 100%
rename from demo/test/test_date.yaml
rename to demo/test/test-date.yaml
diff --git a/demo/test/test-email.yaml b/demo/test/test-email.yaml
index 90da56ce..236d6f0d 100644
--- a/demo/test/test-email.yaml
+++ b/demo/test/test-email.yaml
@@ -5,45 +5,45 @@ version: 1.0
 
 fields:
   - field: number_with_esp
-    from: email.email.v1.yaml
+    from: email.v1.yaml
     use: number_with_esp
     prefix: ""
     postfix: "\t"
   - field: number_with_self
-    from: email.email.v1.yaml
+    from: email.v1.yaml
     use: number_with_self
     prefix: ""
     postfix: "\t"
 
   - field: letter_with_esp
-    from: email.email.v1.yaml
+    from: email.v1.yaml
     use: letter_with_esp
     prefix: ""
     postfix: "\t"
   - field: letter_with_self
-    from: email.email.v1.yaml
+    from: email.v1.yaml
     use: letter_with_self
     prefix: ""
     postfix: "\t"
 
   - field: western_with_esp
-    from: email.email.v1.yaml
+    from: email.v1.yaml
     use: western_with_esp
     prefix: ""
     postfix: "\t"
   - field: western_with_self
-    from: email.email.v1.yaml
+    from: email.v1.yaml
     use: western_with_self
     prefix: ""
     postfix: "\t"
 
   - field: pinyin_with_esp
-    from: email.email.v1.yaml
+    from: email.v1.yaml
     use: pinyin_with_esp
     prefix: ""
     postfix: "\t"
   - field: pinyin_with_self
-    from: email.email.v1.yaml
+    from: email.v1.yaml
     use: pinyin_with_self
     prefix: ""
     postfix: "\t"
\ No newline at end of file
diff --git a/demo/test/test_format.yaml b/demo/test/test-format.yaml
similarity index 100%
rename from demo/test/test_format.yaml
rename to demo/test/test-format.yaml
diff --git a/demo/test/test-ip.yaml b/demo/test/test-ip.yaml
new file mode 100644
index 00000000..983dc1fe
--- /dev/null
+++ b/demo/test/test-ip.yaml
@@ -0,0 +1,37 @@
+title: 测试文件
+desc:
+author: zentao
+version: 1.0
+
+fields:
+  - field: privateC
+    from: ip.v1.yaml
+    use: privateC
+    prefix: ""
+    postfix: "\t"
+  - field: privateB
+    from: ip.v1.yaml
+    use: privateB
+    prefix: ""
+    postfix: "\t"
+  - field: privateA
+    from: ip.v1.yaml
+    use: privateA
+    prefix: ""
+    postfix: "\t"
+
+  - field: ipC
+    from: ip.v2.yaml
+    use: ipC
+    prefix: ""
+    postfix: "\t"
+  - field: ipB
+    from: ip.v2.yaml
+    use: ipB
+    prefix: ""
+    postfix: "\t"
+  - field: ipA
+    from: ip.v2.yaml
+    use: ipA
+    prefix: ""
+    postfix: "\t"
\ No newline at end of file
diff --git a/demo/test/test_recursice.yaml b/demo/test/test-recursice.yaml
similarity index 100%
rename from demo/test/test_recursice.yaml
rename to demo/test/test-recursice.yaml
diff --git a/yaml/email/email.v1.yaml b/yaml/email/v1.yaml
similarity index 100%
rename from yaml/email/email.v1.yaml
rename to yaml/email/v1.yaml
diff --git a/yaml/ip/v2.yaml b/yaml/ip/v2.yaml
new file mode 100644
index 00000000..45534f05
--- /dev/null
+++ b/yaml/ip/v2.yaml
@@ -0,0 +1,54 @@
+title: IP地址
+desc: 含有多种实现的示例。
+author: wwccss
+version: 1.0
+
+field: ip
+instances:
+  - instance: ipC
+    note: C类IP地址
+    mode: r
+    fields:
+      - field: part1
+        range: 192-223
+        postfix: .
+      - field: part2
+        range: 0-254
+        postfix: .
+      - field: part3
+        range: 0-254
+        postfix: .
+      - field: part4
+        range: 1-254
+
+  - instance: ipB
+    note: B类IP地址
+    mode: r
+    fields:
+      - field: part1
+        range: 128-191
+        postfix: .
+      - field: part2
+        range: 0-254
+        postfix: .
+      - field: part3
+        range: 0-254
+        postfix: .
+      - field: part4
+        range: 1-254
+
+  - instance: ipA
+    note: A类IP地址
+    mode: r
+    fields:
+      - field: part1
+        range: 1-126
+        postfix: .
+      - field: part2
+        range: 0-254
+        postfix: .
+      - field: part3
+        range: 0-254
+        postfix: .
+      - field: part4
+        range: 1-254
\ No newline at end of file
-- 
GitLab