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

udpdataclear/udpSensitiveWords/grpc_server/data.go

@@ -249,7 +249,7 @@ func temporaryTest()  {
 	sess := MixDataMgo.GetMgoConn()
 	defer MixDataMgo.DestoryMongoConn(sess)
 	//多线程升索引
-	pool_es := make(chan bool, 20)
+	pool_es := make(chan bool, 10)
 	wg_es := &sync.WaitGroup{}
 	it := sess.DB(MixDataMgo.DbName).C("zk_company_test").Find(&q).Iter()
 	total,isOK:=0,0
@@ -257,6 +257,7 @@ func temporaryTest()  {
 		if total % 1000 == 0 {
 			log.Println("current index",total,isOK)
 		}
+
 		name:=util.ObjToString(tmp["name"])
 		pool_es <- true
 		wg_es.Add(1)
@@ -266,11 +267,10 @@ func temporaryTest()  {
 				<-pool_es
 				wg_es.Done()
 			}()
-
 			new_name,b :=dealWithNameScoreRules(name)
 			if new_name!="" && b {
 				isOK++
-				MixDataMgo.Save("zk_words_test", map[string]interface{}{
+				MixDataMgo.Save("zk_words_test_test", map[string]interface{}{
 					"name":name,
 					"new_name":new_name,
 				})

udpdataclear/udpSensitiveWords/grpc_server/main.go

@@ -64,7 +64,6 @@ func init() {
 
 	es_type, es_index = "azktest", "azktest"
 
-	//政府采购 - 公共资源   （23 25）
 
 	reg.MustRegister(grpcMetrics, customizedCounterMetric)