Merge branch 'dev3.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.2

src/jy/extract/extract.go

@@ -708,7 +708,7 @@ func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]
 										"value":       text,
 										"type":        "colon1",
 										"matchtype":   "tag_string",
-										"blocktag":    bl.Tag,
+										"blocktag":    bl.Classify,
 									})
 								}
 								break
@@ -726,7 +726,7 @@ func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]
 										"value":       text,
 										"type":        "colon1",
 										"matchtype":   "tag_regexp",
-										"blocktag":    bl.Tag,
+										"blocktag":     bl.Classify,
 									})
 								}
 								break
@@ -747,7 +747,7 @@ func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]
 										"value":       text,
 										"type":        "colon2",
 										"matchtype":   "tag_string",
-										"blocktag":    bl.Tag,
+										"blocktag":    bl.Classify,
 									})
 								}
 								break
@@ -765,7 +765,7 @@ func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]
 										"value":       text,
 										"type":        "colon2",
 										"matchtype":   "tag_regexp",
-										"blocktag":    bl.Tag,
+										"blocktag":     bl.Classify,
 									})
 								}
 								break
@@ -793,7 +793,7 @@ func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]
 										"value":       text,
 										"type":        "space",
 										"matchtype":   "tag_string",
-										"blocktag":    bl.Tag,
+										"blocktag":     bl.Classify,
 									})
 								}
 								break
@@ -811,7 +811,7 @@ func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]
 										"value":       text,
 										"type":        "space",
 										"matchtype":   "tag_regexp",
-										"blocktag":    bl.Tag,
+										"blocktag":    bl.Classify,
 									})
 								}
 								break
@@ -842,7 +842,7 @@ func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]
 								"value":       v,
 								"type":        "table",
 								"matchtype":   "tag_string",
-								"blocktag":    bl.Tag,
+								"blocktag":    bl.Classify,
 							})
 						} else { //涉及其他待处理
 							// log.Debug(tags)