update yaml def

yaml/base/domain/domain.v1.yaml

-title: 域名
+title: 自定义域名
 desc:
 author: zentao
 version: 1.0
@@ -8,163 +8,169 @@ instances:
   - instance: one_number_at_common
     note: 单数字域名
     fields:
-      - field: part1
+      - field: one_number
         range: 1-9
-        rand: true
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: all
   - instance: one_number_at_cn
     note: 单数字CN域名
-    prefix:
     fields:
-      - field: part1
+      - field: one_number
         range: 1-9
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: cn
   - instance: one_number_at_new
     note: 单数字新域名
-    prefix:
     fields:
-      - field: part1
+      - field: one_number
         range: 1-9
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: new
 
   - instance: one_letter_at_common
     note: 单字母域名
-    prefix:
     fields:
-      - field: part1
+      - field: one_letter
         range: a-z
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: all
   - instance: one_letter_at_cn
     note: 单字母CN域名
-    prefix:
     fields:
-      - field: part1
+      - field: one_letter
         range: a-z
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: cn
   - instance: one_letter_at_new
     note: 单字母新域名
-    prefix:
     fields:
-      - field: part1
+      - field: one_letter
         range: a-z
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: new
 
   - instance: numbers_at_common
     note: 纯数字域名
-    prefix:
     fields:
-      - field: part1
+      - field: several_numbers
         range: 0-9
         loop: 5-8
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: all
   - instance: numbers_at_cn
     note: 纯数字CN域名
-    prefix:
     fields:
-      - field: part1
+      - field: several_numbers
         range: 0-9
         loop: 5-8
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: cn
   - instance: numbers_at_new
     note: 纯数字新域名
-    prefix:
     fields:
-      - field: part1
+      - field: several_numbers
         range: a-z
         loop: 5-8
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: new
 
   - instance: letters_at_common
-    note: 使用英文账号的域名
-    prefix:
+    note: 使用英文字符的域名
     fields:
-      - field: part1
-        from: base.name.enaccount.v1.yaml
-        use: common_underline
+      - field: letters
+        from: base.name.letters.v1.yaml
+        use: letters
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: all
   - instance: letters_at_cn
-    note: 使用中文账号的域名
-    prefix:
+    note: 使用英文字符的CN域名
     fields:
-      - field: part1
-        from: base.name.cnaccount.v1.yaml
-        use: common_underline
+      - field: letters
+        from: base.name.letters.v1.yaml
+        use: letters
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: cn
   - instance: letters_at_new
-    note: 纯字母新域名
-    prefix:
+    note: 使用英文字符的新域名
     fields:
-      - field: part1
-        range: a-z
-        loop: 5-8
+      - field: letters
+        from: base.name.letters.v1.yaml
+        use: letters
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: new
 
   - instance: mixed_at_common
-    note: 字母和数字域名
-    prefix:
+    note: 字母和数字混合的域名
     fields:
-      - field: part1
+      - field: numbers_and_letters
         range: [a-z,0-9]:R
         loop: 5-8
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: all
   - instance: mixed_at_cn
-    note: 字母和数字CN域名
-    prefix:
+    note: 字母和数字混合的CN域名
     fields:
-      - field: part1
+      - field: numbers_and_letters
         range: [a-z,0-9]:R
         loop: 5-8
         postfix: "."
-      - field: part2
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: cn
   - instance: mixed_at_new
-    note: 字母和数字新域名
-    prefix:
+    note: 字母和数字混合的新域名
     fields:
-      - field: part1
+      - field: numbers_and_letters
         range: [a-z,0-9]:R
         loop: 5-8
         postfix: "."
-      - field: part2
+      - field: domain_postfix
+        from: base.domain.postfix.v1.yaml
+        use: new
+
+  - instance: mixed_at_common
+    note: 使用英文账号的CN域名
+    fields:
+      - field: english_account
+        from: base.name.enaccount.v1.yaml
+        use: common_underline
+        postfix: "."
+      - field: domain_postfix
+        from: base.domain.postfix.v1.yaml
+        use: cn
+  - instance: mixed_at_cn
+    note: 使用中文账号的新域名
+    fields:
+      - field: chinese_account
+        from: base.name.cnaccount.v1.yaml
+        use: common_dot
+        postfix: "."
+      - field: domain_postfix
         from: base.domain.postfix.v1.yaml
         use: new
\ No newline at end of file

yaml/base/domain/esp.v1.yaml

-title: 域名
+title: 邮件服务商域名
 desc:
 author: zentao
 version: 1.0
@@ -6,7 +6,7 @@ version: 1.0
 field: esp
 instances:
   - instance: esp
-    note: 服务商域名
+    note: 邮件服务商域名
     fields:
-      - field: part1
+      - field: domain
         range: [qq.com,163.com,263.net,aliyun.com,126.com,gmail.com,outlook.com,hotmail.com]
\ No newline at end of file

yaml/base/email/email.v1.yaml

-title: 域名
+title: 邮件地址
 desc:
 author: zentao
 version: 1.0
@@ -8,86 +8,83 @@ instances:
   - instance: number_with_esp
     note: 数字加服务商域名
     fields:
-      - field: part1
+      - field: several_numbers
         from: base.name.numbers.v1.yaml
         use: numbers
-        postfix: "."
-      - field: part2
-        range: "qq.com"
+        postfix: "@"
+      - field: esp_domain
+        from: base.domain.esp.v1.yaml
+        use: common
   - instance: number_with_self
-    note: 数字加自有域名
-    prefix:
+    note: 数字加自定义域名
     fields:
-      - field: part1
+      - field: several_numbers
         from: base.name.numbers.v1.yaml
         use: numbers
-        postfix: "."
-      - field: part2
+        postfix: "@"
+      - field: custom_domain
         from: base.domain.domain.v1.yaml
         use: mixed_at_common
 
   - instance: letter_with_esp
-    note: 字母加服务商域名
-    prefix:
+    note: 英文字符加服务商域名
     fields:
-      - field: part1
+      - field: letters
         from: base.name.letters.v1.yaml
-        select: letters
-        postfix: "."
-      - field: part2
-        range: "qq.com"
+        use: letters
+        postfix: "@"
+      - field: esp_domain
+        from: base.domain.esp.v1.yaml
+        use: common
   - instance: letter_with_self
-    note: 字母加自有域名
-    prefix:
+    note: 英文字符加自定义CN域名
     fields:
-      - field: part1
+      - field: letters
         from: base.name.letters.v1.yaml
-        select: letters
-        postfix: "."
-      - field: part2
+        use: letters
+        postfix: "@"
+      - field: custom_domain
         from: base.domain.domain.v1.yaml
         use: mixed_at_cn
 
   - instance: western_with_esp
-    note: 单词加服务商域名
-    prefix:
+    note: 英文账号加服务商域名
     fields:
-      - field: part1
+      - field: english_account
         from: base.name.enaccount.v1.yaml
         use: common_underline
-        postfix: "."
-      - field: part2
-        range: "qq.com"
+        postfix: "@"
+      - field: esp_domain
+        from: base.domain.esp.v1.yaml
+        use: common
   - instance: western_with_self
-    note: 单词加自有域名
-    prefix:
+    note: 英文账号加自定义新域名
     fields:
-      - field: part1
+      - field: english_account
         from: base.name.enaccount.v1.yaml
         use: common_dot
-        postfix: "."
-      - field: part2
+        postfix: "@"
+      - field: custom_domain
         from: base.domain.domain.v1.yaml
         use: mixed_at_new
 
   - instance: pinyin_with_esp
     note: 拼音加服务商域名
-    prefix:
     fields:
-      - field: part1
+      - field: chinese_account
         from: base.name.cnaccount.v1.yaml
         use: common_underline
-        postfix: "."
-      - field: part2
-        range: "qq.com"
+        postfix: "@"
+      - field: esp_domain
+        from: base.domain.esp.v1.yaml
+        use: common
   - instance: pinyin_with_self
     note: 拼音加自有域名
-    prefix:
     fields:
-      - field: part1
+      - field: chinese_account
         from: base.name.cnaccount.v1.yaml
         use: common_dot
-        postfix: "."
+        postfix: "@"
       - field: part2
         from: base.domain.domain.v1.yaml
         use: mixed_at_common
\ No newline at end of file