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

udpdataclear/udpSensitiveWords/go.mod

@@ -6,14 +6,11 @@ require (
 	github.com/fortytw2/leaktest v1.3.0 // indirect
 	github.com/importcjj/sensitive v0.0.0-20200106142752-42d1c505be7b
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/olivere/elastic v6.2.35+incompatible // indirect
 	github.com/prometheus/client_golang v1.10.0
-	github.com/spf13/pflag v1.0.3 // indirect
 	go.mongodb.org/mongo-driver v1.5.1
 	google.golang.org/grpc v1.36.1
 	google.golang.org/protobuf v1.26.0
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/olivere/elastic.v1 v1.0.1
 )

udpdataclear/udpSensitiveWords/util/udpdata.go

@@ -90,7 +90,7 @@ func handletmp(tmp map[string]interface{}, unum *int, c <-chan struct{}) {
 	}
 
 	if buyer, isok := tmp["buyer"].(string); isok {
-		if fok, flog, fname := cheakname(buyer); fok && flog != "" && flog != "tremQuery" {
+		if fok, flog, fname := cheakname(buyer); fok && flog != "" && flog != "tremQuery"&& flog != "queryScore"&& flog != "queryString" {
 			tmp["buyer"] = fname
 			up["buyer"] = fmt.Sprintf("%s_%s", flog, buyer)
 		}