Merge branch 'dev3.1' into dev3.1.2

src/jy/extract/extract.go

@@ -990,14 +990,14 @@ func (e *ExtractTask) StartMatch(field, text string) *pretreated.SortMap {
 					lock.Unlock()
 					for _, r := range ruleMap { //rule
 						rulePrerule := qu.ObjToString(r["s_rule_prerule"])
-						s_code := qu.ObjToString(r["s_code"])
+						s_name := qu.ObjToString(r["s_name"])
 						rule := r["rule"].([]interface{})
 						textAfterRulePrerule := ju.PreFilter(textAfterClassPrerule, rulePrerule) //class的前置过滤
 						if textAfterRulePrerule != "" {
 							b, _ := ju.RecogAnalyRules(textAfterRulePrerule, rule)
 							if b { //匹配到一个分类下某个规则时，不再继续匹配
 								if savefield != "" { //保存字段不为空，存储代码信息
-									SMap.AddKey(field+"_"+savefield, s_code)
+									SMap.AddKey(field+"_"+savefield, s_name)
 								}
 								break L
 							}