domain refer to account

demo/test/test.yaml

@@ -116,127 +116,127 @@ fields:
 #    postfix: "]\t"
 
   # domain
-#  - field: one_number_at_common
-#    from: base.domain.domain.v1.yaml
-#    use: one_number_at_common
-#    prefix: ""
-#    postfix: "\t"
-#  - field: one_number_at_cn
-#    from: base.domain.domain.v1.yaml
-#    use: one_number_at_cn
-#    prefix: ""
-#    postfix: "\t"
-#  - field: one_number_at_new
-#    from: base.domain.domain.v1.yaml
-#    use: one_number_at_new
-#    prefix: ""
-#    postfix: "\t"
-#
-#  - field: one_letter_at_common
-#    from: base.domain.domain.v1.yaml
-#    use: one_letter_at_common
-#    prefix: ""
-#    postfix: "\t"
-#  - field: one_letter_at_cn
-#    from: base.domain.domain.v1.yaml
-#    use: one_letter_at_cn
-#    prefix: ""
-#    postfix: "\t"
-#  - field: one_letter_at_new
-#    from: base.domain.domain.v1.yaml
-#    use: one_letter_at_new
-#    prefix: ""
-#    postfix: "\t"
-#
-#  - field: numbers_at_common
-#    from: base.domain.domain.v1.yaml
-#    use: numbers_at_common
-#    prefix: ""
-#    postfix: "\t"
-#  - field: numbers_at_cn
-#    from: base.domain.domain.v1.yaml
-#    use: numbers_at_cn
-#    prefix: ""
-#    postfix: "\t"
-#  - field: numbers_at_new
-#    from: base.domain.domain.v1.yaml
-#    use: numbers_at_new
-#    prefix: ""
-#    postfix: "\t"
-#
-#  - field: letters_at_common
-#    from: base.domain.domain.v1.yaml
-#    use: letters_at_common
-#    prefix: ""
-#    postfix: "\t"
-#  - field: letters_at_cn
-#    from: base.domain.domain.v1.yaml
-#    use: letters_at_cn
-#    prefix: ""
-#    postfix: "\t"
-#  - field: letters_at_new
-#    from: base.domain.domain.v1.yaml
-#    use: letters_at_new
-#    prefix: ""
-#    postfix: "\t"
-#
-#  - field: mixed_at_common
-#    from: base.domain.domain.v1.yaml
-#    use: mixed_at_common
-#    prefix: ""
-#    postfix: "\t"
-#  - field: mixed_at_cn
-#    from: base.domain.domain.v1.yaml
-#    use: mixed_at_cn
-#    prefix: ""
-#    postfix: "\t"
-#  - field: mixed_at_new
-#    from: base.domain.domain.v1.yaml
-#    use: mixed_at_new
-#    prefix: ""
-#    postfix: "\t"
+  - field: one_number_at_common
+    from: base.domain.domain.v1.yaml
+    use: one_number_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: one_number_at_cn
+    from: base.domain.domain.v1.yaml
+    use: one_number_at_cn
+    prefix: ""
+    postfix: "\t"
+  - field: one_number_at_new
+    from: base.domain.domain.v1.yaml
+    use: one_number_at_new
+    prefix: ""
+    postfix: "\t"
 
-  #email
-  - field: number_with_esp
-    from: base.email.email.v1.yaml
-    use: number_with_esp
+  - field: one_letter_at_common
+    from: base.domain.domain.v1.yaml
+    use: one_letter_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: one_letter_at_cn
+    from: base.domain.domain.v1.yaml
+    use: one_letter_at_cn
     prefix: ""
     postfix: "\t"
-  - field: number_with_self
-    from: base.email.email.v1.yaml
-    use: number_with_self
+  - field: one_letter_at_new
+    from: base.domain.domain.v1.yaml
+    use: one_letter_at_new
     prefix: ""
     postfix: "\t"
 
-  - field: letter_with_esp
-    from: base.email.email.v1.yaml
-    use: letter_with_esp
+  - field: numbers_at_common
+    from: base.domain.domain.v1.yaml
+    use: numbers_at_common
     prefix: ""
     postfix: "\t"
-  - field: letter_with_self
-    from: base.email.email.v1.yaml
-    use: letter_with_self
+  - field: numbers_at_cn
+    from: base.domain.domain.v1.yaml
+    use: numbers_at_cn
+    prefix: ""
+    postfix: "\t"
+  - field: numbers_at_new
+    from: base.domain.domain.v1.yaml
+    use: numbers_at_new
     prefix: ""
     postfix: "\t"
 
-  - field: western_with_esp
-    from: base.email.email.v1.yaml
-    use: western_with_esp
+  - field: letters_at_common
+    from: base.domain.domain.v1.yaml
+    use: letters_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: letters_at_cn
+    from: base.domain.domain.v1.yaml
+    use: letters_at_cn
     prefix: ""
     postfix: "\t"
-  - field: western_with_self
-    from: base.email.email.v1.yaml
-    use: western_with_self
+  - field: letters_at_new
+    from: base.domain.domain.v1.yaml
+    use: letters_at_new
     prefix: ""
     postfix: "\t"
 
-  - field: pinyin_with_esp
-    from: base.email.email.v1.yaml
-    use: pinyin_with_esp
+  - field: mixed_at_common
+    from: base.domain.domain.v1.yaml
+    use: mixed_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: mixed_at_cn
+    from: base.domain.domain.v1.yaml
+    use: mixed_at_cn
     prefix: ""
     postfix: "\t"
-  - field: pinyin_with_self
-    from: base.email.email.v1.yaml
-    use: pinyin_with_self
+  - field: mixed_at_new
+    from: base.domain.domain.v1.yaml
+    use: mixed_at_new
     prefix: ""
-    postfix: "\t"
\ No newline at end of file
+    postfix: "\t"
+
+#  #email
+#  - field: number_with_esp
+#    from: base.email.email.v1.yaml
+#    use: number_with_esp
+#    prefix: ""
+#    postfix: "\t"
+#  - field: number_with_self
+#    from: base.email.email.v1.yaml
+#    use: number_with_self
+#    prefix: ""
+#    postfix: "\t"
+#
+#  - field: letter_with_esp
+#    from: base.email.email.v1.yaml
+#    use: letter_with_esp
+#    prefix: ""
+#    postfix: "\t"
+#  - field: letter_with_self
+#    from: base.email.email.v1.yaml
+#    use: letter_with_self
+#    prefix: ""
+#    postfix: "\t"
+#
+#  - field: western_with_esp
+#    from: base.email.email.v1.yaml
+#    use: western_with_esp
+#    prefix: ""
+#    postfix: "\t"
+#  - field: western_with_self
+#    from: base.email.email.v1.yaml
+#    use: western_with_self
+#    prefix: ""
+#    postfix: "\t"
+#
+#  - field: pinyin_with_esp
+#    from: base.email.email.v1.yaml
+#    use: pinyin_with_esp
+#    prefix: ""
+#    postfix: "\t"
+#  - field: pinyin_with_self
+#    from: base.email.email.v1.yaml
+#    use: pinyin_with_self
+#    prefix: ""
+#    postfix: "\t"
\ No newline at end of file

yaml/base/domain/domain.v1.yaml

@@ -102,23 +102,23 @@ instances:
         use: new
 
   - instance: letters_at_common
-    note: 纯字母域名
+    note: 使用英文账号的域名
     prefix:
     fields:
       - field: part1
-        range: a-z
-        loop: 5-8
+        from: base.name.enaccount.v1.yaml
+        use: common_underline
         postfix: "."
       - field: part2
         from: base.domain.postfix.v1.yaml
         use: all
   - instance: letters_at_cn
-    note: 纯字母CN域名
+    note: 使用中文账号的域名
     prefix:
     fields:
       - field: part1
-        range: a-z
-        loop: 5-8
+        from: base.name.cnaccount.v1.yaml
+        use: common_underline
         postfix: "."
       - field: part2
         from: base.domain.postfix.v1.yaml

yaml/base/email/email.v1.yaml

@@ -53,8 +53,8 @@ instances:
     prefix:
     fields:
       - field: part1
-        from: words.v1
-        select: en
+        from: base.name.enaccount.v1.yaml
+        use: common_underline
         postfix: "."
       - field: part2
         range: "qq.com"
@@ -63,8 +63,8 @@ instances:
     prefix:
     fields:
       - field: part1
-        from: words.v1
-        select: en
+        from: base.name.enaccount.v1.yaml
+        use: common_dot
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
@@ -75,8 +75,8 @@ instances:
     prefix:
     fields:
       - field: part1
-        from: words.v1
-        select: pinyin
+        from: base.name.cnaccount.v1.yaml
+        use: common_underline
         postfix: "."
       - field: part2
         range: "qq.com"
@@ -85,8 +85,8 @@ instances:
     prefix:
     fields:
       - field: part1
-        from: words.v1
-        select: pinyin
+        from: base.name.cnaccount.v1.yaml
+        use: common_dot
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml