修改mgo

udpdataclear/udpSensitiveWords/go.mod

@@ -7,14 +7,11 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	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
 	gopkg.in/yaml.v2 v2.3.0

udpdataclear/udpSensitiveWords/grpc_server/data.go

@@ -60,12 +60,14 @@ func initSensitiveWordsData()  {
 		log.Fatalln(err)
 	}
 	log.Println("id段落：",util.BsonTOStringId(gteid),util.BsonTOStringId(lteid))
-	iter := MixDataMgo.GetMgoConn().C("unique_qyxy").Find(map[string]interface{}{
+	sess := MixDataMgo.GetMgoConn()
+	defer MixDataMgo.DestoryMongoConn(sess)
+	iter := sess.DB(MixDataMgo.DbName).C("unique_qyxy").Find(map[string]interface{}{
 		"_id": map[string]interface{}{
 			"$gte": gteid,
 			"$lte": lteid,
 		},
-	}).Sort("_id").Iter()
+	}).Iter()
 	Filter = sensitive.New()
 	var initnum uint
 	for tmp := map[string]interface{}{}; iter.Next(&tmp); tmp = map[string]interface{}{} {
@@ -86,7 +88,11 @@ func initSensitiveWordsData()  {
 
 //定时增量数据处理---冯
 func addTaskSensitiveWordsData()  {
-
+	defer func() {
+		if err := recover(); err != nil {
+			log.Println("func() addTaskSensitiveWordsData",err)
+		}
+	}()
 
 	mmmgo, err := util.InitMgoEn("mongodb://172.17.4.187:27082,172.17.145.163:27083", 20, "fengweiqiang", "fwq@123123")
 	if err != nil {
@@ -103,7 +109,7 @@ func addTaskSensitiveWordsData()  {
 		cronData := time.Date(ctime.Year(), ctime.Month(), ctime.Day()-7, ctime.Hour(), ctime.Minute(), ctime.Second(), 0, time.Local)
 		findByupdate, err := con.Database("mixdata").Collection("qyxy_std").Find(nil, bson.M{
 			"updatetime": bson.M{"$gte": cronData.Unix()},
-		}, options.Find().SetProjection(bson.M{"company_name": 1, "updatetime": 1,"company_type": 1,"company_type_old": 1}).SetSort(bson.M{"_id": 1}))
+		}, options.Find().SetProjection(bson.M{"company_name": 1, "updatetime": 1,"company_type": 1,"company_type_old": 1}))
 		if err != nil {
 			log.Println("tick err", cronData)
 			continue

udpdataclear/udpSensitiveWords/grpc_server/main.go

@@ -41,7 +41,6 @@ var (
 	}, []string{"name"})
 )
 func init() {
-	return
 	yamlFile, err := ioutil.ReadFile(YAMLFILE)
 	if err != nil {
 		log.Fatalln("load conf error")
@@ -70,16 +69,13 @@ func init() {
 
 	reg.MustRegister(grpcMetrics, customizedCounterMetric)
 
-
-
-
 }
 
 
 
 func main() {
 
-
+/*
 	MixDataMgo = &util.MongodbSim{
 		MongodbAddr: "192.168.3.207:27092",
 		Size:        20,
@@ -96,13 +92,13 @@ func main() {
 
 	temporaryTest()
 	return
-
+*/
 	//淡赌跑断
-	//if YamlConfig.IsAddTask == 0 {
-	//	initSensitiveWordsData() //初始化敏感词数据
-	//} else {
-	//	go addTaskSensitiveWordsData() //增量-改配置文件
-	//}
+	if YamlConfig.IsAddTask == 0 {
+		initSensitiveWordsData() //初始化敏感词数据
+	} else {
+		go addTaskSensitiveWordsData() //增量-改配置文件
+	}
 
 	lis, err := net.Listen("tcp", YamlConfig.Port)
 	if err != nil {
@@ -116,10 +112,9 @@ func main() {
 			2092),
 	}
 	grpcServer := grpc.NewServer(
-	//grpc.StreamInterceptor(grpcMetrics.StreamServerInterceptor()),
-	grpc.UnaryInterceptor(grpcMetrics.UnaryServerInterceptor()))
+		grpc.UnaryInterceptor(grpcMetrics.UnaryServerInterceptor()),
+	)
 	proto_grpc.RegisterSensitiveWordsServer(grpcServer, &server{})
-	// Initialize all metrics.
 	grpcMetrics.InitializeMetrics(grpcServer)
 	// Start your http server for prometheus.
 	go func() {

udpdataclear/udpSensitiveWords/util/common.go

@@ -438,13 +438,6 @@ func EndWith(value, str string) bool {
 func Catch() {
 	if r := recover(); r != nil {
 		log.Println(r)
-		for skip := 0; ; skip++ {
-			_, file, line, ok := runtime.Caller(skip)
-			if !ok {
-				break
-			}
-			log.Printf("%v,%v\n", file, line)
-		}
 	}
 }
 

udpdataclear/udpSensitiveWords/util/udpdata.go

@@ -43,7 +43,9 @@ func QuerySensitiveWords(sid, eid string) {
 		return
 	}
 	var num int64
-	iter := QfwMgo85.GetMgoConn().C(Collection).Find(map[string]interface{}{
+	mgoSess := QfwMgo85.GetMgoConn()
+	defer QfwMgo85.DestoryMongoConn(mgoSess)
+	iter := mgoSess.DB(QfwMgo85.DbName).C(Collection).Find(map[string]interface{}{
 		"_id": map[string]interface{}{
 			"$gte": objSid,
 			"$lte": objEid,