|
|
@@ -740,6 +740,7 @@ func getKvByLuaFields(vc *RuleCore, j *ju.Job, et *ExtractTask) map[string][]map
|
|
|
text := ju.TrimLRSpace(vv.Value, "")
|
|
|
if text != "" {
|
|
|
kvmap[field] = append(kvmap[field], map[string]interface{}{
|
|
|
+ "code": "CL_" + vv.Key,
|
|
|
"field": field,
|
|
|
"ruletext": vv.Key,
|
|
|
"extfrom": vc.ExtFrom,
|
|
|
@@ -920,10 +921,10 @@ func ExtRegBack(j *ju.Job, in *RegLuaInfo, t *TaskInfo) {
|
|
|
if text != "" {
|
|
|
text = in.RegPreBac.Reg.ReplaceAllString(text, in.RegPreBac.Replace)
|
|
|
}
|
|
|
- j.Result[in.Field][k].Value = text
|
|
|
if text == qu.ObjToString(v.Value) { //值未发生改变，不存日志
|
|
|
continue
|
|
|
}
|
|
|
+ j.Result[in.Field][k].Value = text
|
|
|
exts = append(exts, map[string]interface{}{
|
|
|
"field": v.Field,
|
|
|
"code": v.Code,
|
|
|
@@ -950,10 +951,10 @@ func ExtRegBack(j *ju.Job, in *RegLuaInfo, t *TaskInfo) {
|
|
|
if text != "" {
|
|
|
text = in.RegPreBac.Reg.ReplaceAllString(text, in.RegPreBac.Replace)
|
|
|
}
|
|
|
- j.Result[key][k].Value = text
|
|
|
if text == qu.ObjToString(v.Value) { //值未发生改变，不存日志
|
|
|
continue
|
|
|
}
|
|
|
+ j.Result[key][k].Value = text
|
|
|
exts = append(exts, map[string]interface{}{
|
|
|
"field": v.Field,
|
|
|
"code": v.Code,
|
|
|
@@ -1004,7 +1005,7 @@ func AddExtLog(ftype, sid string, before interface{}, extinfo interface{}, v *Re
|
|
|
return
|
|
|
}
|
|
|
logdata := map[string]interface{}{
|
|
|
- "code": v.Code,
|
|
|
+ "code": qu.If(v.Code == "", "kv", v.Code),
|
|
|
"name": v.Name,
|
|
|
"type": ftype,
|
|
|
"ruletext": v.RuleText,
|
