From a510907841a60455b2a46f92867f6a1e9bdfb48f Mon Sep 17 00:00:00 2001
From: aaron <462826@qq.com>
Date: Thu, 17 Sep 2020 11:06:51 +0800
Subject: [PATCH] close task#7907

---
 src/model/definition.go                       |  4 +--
 .../chinese/{ => 01}/jixuwen-p01-s01.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p02-s01.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p02-s02.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p03-s01.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p03-s02.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p03-s03.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p03-s04.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p03-s05.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p03-s06.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p04-s01.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p04-s02.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p04-s03.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p05-s01.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p05-s02.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p06-s01.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p06-s02.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p06-s03.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p07-s01.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p07-s02.yaml     |  0
 .../chinese/{ => 01}/jixuwen-p07-s03.yaml     |  0
 yaml/article/chinese/{ => 01}/jixuwen.txt     |  0
 yaml/article/chinese/{ => 01}/jixuwen.yaml    | 34 -------------------
 yaml/article/chinese/01/out.txt               | 10 ++++++
 yaml/article/chinese/out.txt                  | 10 ------
 25 files changed, 12 insertions(+), 46 deletions(-)
 rename yaml/article/chinese/{ => 01}/jixuwen-p01-s01.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p02-s01.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p02-s02.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p03-s01.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p03-s02.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p03-s03.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p03-s04.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p03-s05.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p03-s06.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p04-s01.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p04-s02.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p04-s03.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p05-s01.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p05-s02.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p06-s01.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p06-s02.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p06-s03.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p07-s01.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p07-s02.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen-p07-s03.yaml (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen.txt (100%)
 rename yaml/article/chinese/{ => 01}/jixuwen.yaml (62%)
 create mode 100755 yaml/article/chinese/01/out.txt
 delete mode 100755 yaml/article/chinese/out.txt

diff --git a/src/model/definition.go b/src/model/definition.go
index 63f0dc3..a227d97 100644
--- a/src/model/definition.go
+++ b/src/model/definition.go
@@ -134,8 +134,8 @@ type Article struct {
 type ArticleField struct {
 	Field string  `yaml:"field"`
 	Range  string  `yaml:"range"`
-	Prefix string  `yaml:"prefix"`
-	Postfix  string  `yaml:"postfix"`
+	Prefix string  `yaml:"prefix,omitempty"`
+	Postfix  string  `yaml:"postfix,omitempty"`
 }
 type ArticleSent struct {
 	Type string
diff --git a/yaml/article/chinese/jixuwen-p01-s01.yaml b/yaml/article/chinese/01/jixuwen-p01-s01.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p01-s01.yaml
rename to yaml/article/chinese/01/jixuwen-p01-s01.yaml
diff --git a/yaml/article/chinese/jixuwen-p02-s01.yaml b/yaml/article/chinese/01/jixuwen-p02-s01.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p02-s01.yaml
rename to yaml/article/chinese/01/jixuwen-p02-s01.yaml
diff --git a/yaml/article/chinese/jixuwen-p02-s02.yaml b/yaml/article/chinese/01/jixuwen-p02-s02.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p02-s02.yaml
rename to yaml/article/chinese/01/jixuwen-p02-s02.yaml
diff --git a/yaml/article/chinese/jixuwen-p03-s01.yaml b/yaml/article/chinese/01/jixuwen-p03-s01.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p03-s01.yaml
rename to yaml/article/chinese/01/jixuwen-p03-s01.yaml
diff --git a/yaml/article/chinese/jixuwen-p03-s02.yaml b/yaml/article/chinese/01/jixuwen-p03-s02.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p03-s02.yaml
rename to yaml/article/chinese/01/jixuwen-p03-s02.yaml
diff --git a/yaml/article/chinese/jixuwen-p03-s03.yaml b/yaml/article/chinese/01/jixuwen-p03-s03.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p03-s03.yaml
rename to yaml/article/chinese/01/jixuwen-p03-s03.yaml
diff --git a/yaml/article/chinese/jixuwen-p03-s04.yaml b/yaml/article/chinese/01/jixuwen-p03-s04.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p03-s04.yaml
rename to yaml/article/chinese/01/jixuwen-p03-s04.yaml
diff --git a/yaml/article/chinese/jixuwen-p03-s05.yaml b/yaml/article/chinese/01/jixuwen-p03-s05.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p03-s05.yaml
rename to yaml/article/chinese/01/jixuwen-p03-s05.yaml
diff --git a/yaml/article/chinese/jixuwen-p03-s06.yaml b/yaml/article/chinese/01/jixuwen-p03-s06.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p03-s06.yaml
rename to yaml/article/chinese/01/jixuwen-p03-s06.yaml
diff --git a/yaml/article/chinese/jixuwen-p04-s01.yaml b/yaml/article/chinese/01/jixuwen-p04-s01.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p04-s01.yaml
rename to yaml/article/chinese/01/jixuwen-p04-s01.yaml
diff --git a/yaml/article/chinese/jixuwen-p04-s02.yaml b/yaml/article/chinese/01/jixuwen-p04-s02.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p04-s02.yaml
rename to yaml/article/chinese/01/jixuwen-p04-s02.yaml
diff --git a/yaml/article/chinese/jixuwen-p04-s03.yaml b/yaml/article/chinese/01/jixuwen-p04-s03.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p04-s03.yaml
rename to yaml/article/chinese/01/jixuwen-p04-s03.yaml
diff --git a/yaml/article/chinese/jixuwen-p05-s01.yaml b/yaml/article/chinese/01/jixuwen-p05-s01.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p05-s01.yaml
rename to yaml/article/chinese/01/jixuwen-p05-s01.yaml
diff --git a/yaml/article/chinese/jixuwen-p05-s02.yaml b/yaml/article/chinese/01/jixuwen-p05-s02.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p05-s02.yaml
rename to yaml/article/chinese/01/jixuwen-p05-s02.yaml
diff --git a/yaml/article/chinese/jixuwen-p06-s01.yaml b/yaml/article/chinese/01/jixuwen-p06-s01.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p06-s01.yaml
rename to yaml/article/chinese/01/jixuwen-p06-s01.yaml
diff --git a/yaml/article/chinese/jixuwen-p06-s02.yaml b/yaml/article/chinese/01/jixuwen-p06-s02.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p06-s02.yaml
rename to yaml/article/chinese/01/jixuwen-p06-s02.yaml
diff --git a/yaml/article/chinese/jixuwen-p06-s03.yaml b/yaml/article/chinese/01/jixuwen-p06-s03.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p06-s03.yaml
rename to yaml/article/chinese/01/jixuwen-p06-s03.yaml
diff --git a/yaml/article/chinese/jixuwen-p07-s01.yaml b/yaml/article/chinese/01/jixuwen-p07-s01.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p07-s01.yaml
rename to yaml/article/chinese/01/jixuwen-p07-s01.yaml
diff --git a/yaml/article/chinese/jixuwen-p07-s02.yaml b/yaml/article/chinese/01/jixuwen-p07-s02.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p07-s02.yaml
rename to yaml/article/chinese/01/jixuwen-p07-s02.yaml
diff --git a/yaml/article/chinese/jixuwen-p07-s03.yaml b/yaml/article/chinese/01/jixuwen-p07-s03.yaml
similarity index 100%
rename from yaml/article/chinese/jixuwen-p07-s03.yaml
rename to yaml/article/chinese/01/jixuwen-p07-s03.yaml
diff --git a/yaml/article/chinese/jixuwen.txt b/yaml/article/chinese/01/jixuwen.txt
similarity index 100%
rename from yaml/article/chinese/jixuwen.txt
rename to yaml/article/chinese/01/jixuwen.txt
diff --git a/yaml/article/chinese/jixuwen.yaml b/yaml/article/chinese/01/jixuwen.yaml
similarity index 62%
rename from yaml/article/chinese/jixuwen.yaml
rename to yaml/article/chinese/01/jixuwen.yaml
index a0e5f47..bf41a65 100644
--- a/yaml/article/chinese/jixuwen.yaml
+++ b/yaml/article/chinese/01/jixuwen.yaml
@@ -5,70 +5,36 @@ type: article
 
 fields:
     - field: "1"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p01-s01.yaml
     - field: "2"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p02-s01.yaml
     - field: "3"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p02-s02.yaml
     - field: "4"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p03-s01.yaml
     - field: "5"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p03-s02.yaml
     - field: "6"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p03-s03.yaml
     - field: "7"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p03-s04.yaml
     - field: "8"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p03-s05.yaml
     - field: "9"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p03-s06.yaml
     - field: "10"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p04-s01.yaml
     - field: "11"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p04-s02.yaml
     - field: "12"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p04-s03.yaml
     - field: "13"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p05-s01.yaml
     - field: "14"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p05-s02.yaml
     - field: "15"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p06-s01.yaml
     - field: "16"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p06-s02.yaml
     - field: "17"
-      postfix: ""
-      prefix: ""
       range: jixuwen-p06-s03.yaml
diff --git a/yaml/article/chinese/01/out.txt b/yaml/article/chinese/01/out.txt
new file mode 100755
index 0000000..5ecfe35
--- /dev/null
+++ b/yaml/article/chinese/01/out.txt
@@ -0,0 +1,10 @@
+难忘的秋游
+
+段落一：秋天的天气秋兰飘香的、彩彻区明的，漂亮的清婉特别幸运，因为养母要带她去骊山窥红的菩提榕与白生生的水浮莲。苗条的清婉总舒服，高兴地搂着勇敢正义的妻妹子。
+
+段落二：三个月后，她们先乘坐直升飞机再乘坐交通工具，一起来到了秋意深浓的骊山。这除了有绿森森的白千层与淡紫的紫苑，还有殷红的五月花、绿莹莹的喇叭花、绿森森的火殃勒、果绿的圆叶乌桕……琳琅满目。在这个季节，天柱山有很多花草树木，嫩绿的、绿荫如盖的，浅绿的、淡黄的，琳琅满目，竟有+八十八株五颜六色的花儿。沉浸在万石山的美景中，她们忽然听到一阵悠扬的歌声，走近了一看，原来是有人在载歌载舞。云曦和旁系热切地瞅，振奋地侧卧。其他游客们有的在说笑，有的在打听，还有的在互相拍照，热闹极了。
+
+段落三：逛了好一会，妈妈说：“午饭时间到了，我们去吃饭吧。她们来到一处农家乐吃午餐，午餐的菜式有”+绿油油的大蒜、白生生的西红柿、绿的土豆，都新鲜极了，让人胃口大开。漂亮的馨悦不禁食指大动，她唱黄澄澄的黑麦，咀白生生的小松菜，吃绿油油的猕猴桃，大快朵颐。
+此有一个动物园，佳跟老婆进去逛了逛。在动物园里，她们看到了”+凶猛的鲨鱼、凶猛的海狮、昂首挺胸的鹦鹉、气势汹汹的鸭，斐还是第一次逛动物园呢，第一次看到这么些只在书上见过的动物，她可真是既震惊又舒畅看得入迷都忘记了时间。
+
+段落四：不知不觉天都黑了，+云曦跟丈母娘边说笑边瞅，意犹未尽。在”+菁的记忆里她对这里似曾相识，似乎在梦中就来过麦积山。就这样，在恋恋不舍中，马尔泰若曦和妈妈结束了这次旅行。
\ No newline at end of file
diff --git a/yaml/article/chinese/out.txt b/yaml/article/chinese/out.txt
deleted file mode 100755
index aaf855b..0000000
--- a/yaml/article/chinese/out.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-难忘的秋游
-
-段落一：秋天的天气秋高气爽的、秋兰飘香的，黝黑的望舒总快乐，因为堂妹值得带她去钟山俯视橄榄绿的幌伞枫和淡黄的康乃馨。黝黑的洵美分外舒服，如释重负地搂着婆婆妈妈的舅妈。
-
-段落二：大前天，她们先乘坐公共汽车再乘坐交通工具，一起来到了微风拂面的天柱山。此除了有葱绿的山乌桕跟蓝的珍珠花，还有浅绿的夜来香、淡黄的莲花、湖绿的莫氏榄仁、葱绿的使君子……美不胜收。在这个季节，雁荡山有很多花草树木，青绿的、绿油油的，粉嫩嫩的、嫩黄的，目不暇接，竟有+六十六支五颜六色的花儿。沉浸在金佛山的美景中，她们忽然听到一阵悠扬的歌声，走近了一看，原来是有人在载歌载舞。菁与外婆幸福地鸟瞰，饱满地躺着。其他游客们有的在说笑，有的在静听，还有的在互相拍照，热闹极了。
-
-段落三：逛了好一会，妈妈说：“午饭时间到了，我们去吃饭吧。她们来到一处农家乐吃午餐，午餐的菜式有”+深红的黄瓜、深紫的花菜西兰花、白花花的茄子，都新鲜极了，让人胃口大开。甜美的望舒不禁食指大动，她吃黄澄澄的黑豆，咬淡紫的菜心，吃粉红的美国香瓜，大快朵颐。
-那里有一个动物园，雯和老爷进去逛了逛。在动物园里，她们看到了”+昂首挺胸的羊、凶猛的海豹、安静的骆驼、温驯的兔，雪还是第一次逛动物园呢，第一次看到这么些只在书上见过的动物，她可真是既目瞪口呆又从容看得入迷都忘记了时间。
-
-段落四：不知不觉天都黑了，+琳与表姐边吆喝边瞧，意犹未尽。在”+静姝的记忆里她对这里似曾相识，似乎在梦中就来过井冈山。就这样，在恋恋不舍中，马尔泰若曦和妈妈结束了这次旅行。
\ No newline at end of file
-- 
GitLab