apple 4 роки тому
батько
коміт
a63b7d582e

+ 1 - 0
udpdataclear/udpSensitiveWords/go.mod

@@ -18,4 +18,5 @@ require (
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/olivere/elastic.v1 v1.0.1
 	gopkg.in/yaml.v2 v2.3.0
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
 )

+ 4 - 4
udpdataclear/udpSensitiveWords/grpc_server/main.go

@@ -7,19 +7,16 @@ import (
 	"github.com/importcjj/sensitive"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"google.golang.org/grpc"
 	"gopkg.in/olivere/elastic.v1"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	"io/ioutil"
 	"log"
-	"math/big"
 	"net"
 	"net/http"
 	"regexp"
 	"sensitiveWords.udp/proto_grpc"
 	"sensitiveWords.udp/util"
-	"strconv"
 	"strings"
 )
 
@@ -115,6 +112,9 @@ var (
 
 func main() {
 
+
+	log.Println("main ...")
+	return
 	//淡赌跑断
 	if YamlConfig.IsAddTask == 0 {
 		initSensitiveWordsData() //初始化敏感词数据

+ 12 - 0
udpdataclear/udpSensitiveWords/grpc_server/mgo.go

@@ -328,6 +328,18 @@ func NewObjectId() primitive.ObjectID {
 
 
 
+func StringTOBsonId(id string) primitive.ObjectID {
+	objectId, _ := primitive.ObjectIDFromHex(id)
+	return objectId
+}
+
+func BsonTOStringId(id interface{}) string {
+	return id.(primitive.ObjectID).Hex()
+}
+
+
+
+
 
 
 func toMegaBytes(bytes uint64) float64 {