zhengkun hace 1 año
padre
commit
08ae9abce2
Se han modificado 4 ficheros con 200 adiciones y 184 borrados
  1. 45 0
      config.json
  2. 23 55
      ent_contact/contact_add.go
  3. 80 129
      ent_util/init.go
  4. 52 0
      mark

+ 45 - 0
config.json

@@ -0,0 +1,45 @@
+{
+  "mongo" : {
+    "bid_mgo": {
+      "addr": "127.0.0.1:12005",
+      "dbname" : "qfw",
+      "username": "zhengkun",
+      "password": "zk@123123"
+    },
+    "qy_mgo": {
+      "addr": "127.0.0.1:12005",
+      "dbname" : "mixdata",
+      "username": "zhengkun",
+      "password": "zk@123123"
+    },
+    "spi_mgo": {
+      "addr": "127.0.0.1:12004",
+      "dbname" : "mixdata",
+      "username": "",
+      "password": ""
+    },
+    "ext_mgo": {
+      "addr": "127.0.0.1:12001",
+      "dbname" : "qfw",
+      "username": "",
+      "password": ""
+    }
+  },
+  "mysql": {
+    "addr": "127.0.0.1:15001",
+    "dbname" : "global_common_data",
+    "username": "zhengkun",
+    "password": "Zk#20220824"
+  },
+  "clickhouse": {
+    "addr": "192.168.3.207:19000",
+    "dbname" : "information",
+    "username": "jytop",
+    "password": "pwdTopJy123"
+  },
+  "es": {
+    "addr": "http://127.0.0.1:13003",
+    "username": "es_all",
+    "password": "TopJkO2E_d1x"
+  }
+}

+ 23 - 55
ent_contact/contact_add.go

@@ -1,58 +1,26 @@
 package ent_contact
 
-func aaabbb() {
-	//buyer := qu.ObjToString(tmp["buyer"])
-	//agency := qu.ObjToString(tmp["agency"])
-	//winner := qu.ObjToString(tmp["winner"])
-	//owner := qu.ObjToString(tmp["owner"])
-	//s_winner := qu.ObjToString(tmp["s_winner"])
-	//b_per := qu.ObjToString(tmp["buyerperson"])
-	//b_tel := qu.ObjToString(tmp["buyertel"])
-	//if utf8.RuneCountInString(b_tel) > 60 {
-	//	b_tel = ""
-	//}
-	//a_per := qu.ObjToString(tmp["agencyperson"])
-	//a_tel := qu.ObjToString(tmp["agencytel"])
-	//if utf8.RuneCountInString(a_tel) > 60 {
-	//	a_tel = ""
-	//}
-	//w_per := qu.ObjToString(tmp["winnerperson"])
-	//w_tel := qu.ObjToString(tmp["winnertel"])
-	//if utf8.RuneCountInString(w_tel) > 60 {
-	//	w_tel = ""
-	//}
-	//o_per := qu.ObjToString(tmp["project_person"])
-	//o_tel := qu.ObjToString(tmp["project_phone"])
-	//if utf8.RuneCountInString(o_tel) > 60 {
-	//	o_tel = ""
-	//}
-	//
-	//buyerclass := qu.ObjToString(tmp["buyerclass"])
-	//publishtime := qu.Int64All(tmp["publishtime"])
-	//tmpid := ul.BsonTOStringId(tmp["_id"])
-	//winner_arr, winner_bool := ul.SegmentationEntName(winner, s_winner)
-	//
-	//updateLock.Lock()
-	//if buyer != "" && utf8.RuneCountInString(buyer) < 30 {
-	//	dealWithUpdateContact(buyer, buyerclass, &ul.Contact{b_per, b_tel, true, false, false, false, publishtime}, "0001", tmpid)
-	//}
-	////中标单位
-	//for k, v := range winner_arr {
-	//	b := winner_bool[k]
-	//	c := ul.Contact{"", "", false, false, true, false, publishtime}
-	//	if b {
-	//		c.Per = w_per
-	//		c.Tel = w_tel
-	//	}
-	//	dealWithUpdateContact(v, "", &c, "0010", tmpid)
-	//}
-	//
-	//if agency != "" && utf8.RuneCountInString(agency) < 30 {
-	//	dealWithUpdateContact(agency, "", &ul.Contact{a_per, a_tel, false, true, false, false, publishtime}, "0100", tmpid)
-	//}
-	//
-	//if owner != "" && utf8.RuneCountInString(owner) < 30 {
-	//	dealWithUpdateContact(owner, "", &ul.Contact{o_per, o_tel, false, false, false, true, publishtime}, "1000", tmpid)
-	//}
-	//updateLock.Unlock()
+import (
+	"context"
+	ul "data_ent_wuye/ent_util"
+	log "github.com/donnie4w/go-logger/logger"
+	"time"
+)
+
+// 增量对于标讯数据...
+func InjectContactAddTask(uid string, name string, phone string, email string) {
+	if phone == "" {
+		return
+	}
+	source_type := 1
+	create_time := time.Now().Unix()
+	msgs := GetEntContacts(uid)
+	if !QueryingExists(msgs, name, phone) {
+		query := "INSERT INTO information.ent_contact(id,phone,name,email,source_type,create_time,update_time) VALUES(?,?,?,?,?,?,?)"
+		//插入数据
+		err := ul.ClickHouseConn.Exec(context.Background(), query, uid, phone, name, email, source_type, create_time, create_time)
+		if err != nil {
+			log.Debug(err)
+		}
+	}
 }

+ 80 - 129
ent_util/init.go

@@ -2,7 +2,6 @@ package ent_util
 
 import (
 	"context"
-	"fmt"
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	log "github.com/donnie4w/go-logger/logger"
@@ -16,7 +15,8 @@ var (
 	SourceMgo, QyxyMgo *MongodbSim
 	SpiMgo, ExtMgo     *MongodbSim
 	MysqlGlobalTool    *Mysql
-	IsLocal, IsDev     bool
+	SysConfig          map[string]interface{}
+	IsLocal            bool
 	ClickHouseConn     driver.Conn
 	EsClinet           *elastic.Elastic
 	BuyerClassData     = map[string]string{}
@@ -29,130 +29,86 @@ var (
 const (
 	G_Units_Baseinfo = "dws_f_ent_baseinfo"
 	G_Units_Contact  = "dws_f_ent_contact"
-	G_Units_Tags     = "dws_f_ent_tags"
-	G_Units_Warning  = "dws_f_ent_warning"
 )
 
 func InitGlobalVar() {
 	IsLocal = true
+	qu.ReadConfig(&SysConfig) //加载配置文件
 	initMgo()
-	//initMysql()
-	//initVCode()
-	//initClickHouse()
-	//initEs()
-}
-
-func initEs() {
-	url := "http://127.0.0.1:13003"
-	if !IsLocal {
-		url = "http://172.17.4.184:19805"
-	}
-	EsClinet = &elastic.Elastic{
-		S_esurl:  url,
-		I_size:   10,
-		Username: "es_all",
-		Password: "TopJkO2E_d1x",
-	}
-	EsClinet.InitElasticSize()
-}
-
-func initClickHouse() {
-	ClickHouseConn, _ = connectClickhouse()
+	initMysql()
+	initVCode()
+	initClickHouse()
+	initEs()
 }
 
 // 初始化mgo
 func initMgo() {
+	mgo := *qu.ObjToMap(SysConfig["mongo"])
+	b_mgo := *qu.ObjToMap(mgo["bid_mgo"])
+	q_mgo := *qu.ObjToMap(mgo["qy_mgo"])
+	s_mgo := *qu.ObjToMap(mgo["spi_mgo"])
+	e_mgo := *qu.ObjToMap(mgo["ext_mgo"])
+
+	SourceMgo = &MongodbSim{
+		MongodbAddr: qu.ObjToString(b_mgo["addr"]),
+		DbName:      qu.ObjToString(b_mgo["dbname"]),
+		Size:        10,
+		UserName:    qu.ObjToString(b_mgo["username"]),
+		Password:    qu.ObjToString(b_mgo["password"]),
+	}
 	if IsLocal {
-		SourceMgo = &MongodbSim{
-			MongodbAddr: "127.0.0.1:12005",
-			DbName:      "qfw",
-			Size:        10,
-			UserName:    "zhengkun",
-			Password:    "zk@123123",
-		}
 		SourceMgo.InitPoolDirect()
-
-		QyxyMgo = &MongodbSim{
-			MongodbAddr: "127.0.0.1:12005",
-			DbName:      "mixdata",
-			Size:        10,
-			UserName:    "zhengkun",
-			Password:    "zk@123123",
-		}
-		QyxyMgo.InitPoolDirect()
-
-		SpiMgo = &MongodbSim{
-			MongodbAddr: "127.0.0.1:12004",
-			DbName:      "zhengkun",
-			Size:        10,
-			UserName:    "",
-			Password:    "",
-		}
-		SpiMgo.InitPoolDirect()
-
-		ExtMgo = &MongodbSim{
-			MongodbAddr: "127.0.0.1:12001",
-			DbName:      "qfw",
-			Size:        10,
-			UserName:    "",
-			Password:    "",
-		}
-		ExtMgo.InitPoolDirect()
 	} else {
-		SourceMgo = &MongodbSim{
-			MongodbAddr: "172.17.189.140:27080,172.17.189.141:27081",
-			DbName:      "qfw",
-			Size:        10,
-			UserName:    "zhengkun",
-			Password:    "zk@123123",
-		}
 		SourceMgo.InitPool()
+	}
 
-		QyxyMgo = &MongodbSim{
-			MongodbAddr: "172.17.189.140:27080,172.17.189.141:27081",
-			DbName:      "mixdata",
-			Size:        10,
-			UserName:    "zhengkun",
-			Password:    "zk@123123",
-		}
+	QyxyMgo = &MongodbSim{
+		MongodbAddr: qu.ObjToString(q_mgo["addr"]),
+		DbName:      qu.ObjToString(q_mgo["dbname"]),
+		Size:        10,
+		UserName:    qu.ObjToString(q_mgo["username"]),
+		Password:    qu.ObjToString(q_mgo["password"]),
+	}
+	if IsLocal {
+		QyxyMgo.InitPoolDirect()
+	} else {
 		QyxyMgo.InitPool()
+	}
 
-		SpiMgo = &MongodbSim{
-			MongodbAddr: "172.17.4.181:27001",
-			DbName:      "mixdata",
-			Size:        10,
-			UserName:    "",
-			Password:    "",
-		}
+	SpiMgo = &MongodbSim{
+		MongodbAddr: qu.ObjToString(s_mgo["addr"]),
+		DbName:      qu.ObjToString(s_mgo["dbname"]),
+		Size:        10,
+		UserName:    qu.ObjToString(s_mgo["username"]),
+		Password:    qu.ObjToString(s_mgo["password"]),
+	}
+	if IsLocal {
+		SpiMgo.InitPoolDirect()
+	} else {
 		SpiMgo.InitPool()
+	}
 
-		ExtMgo = &MongodbSim{
-			MongodbAddr: "172.17.4.85:27080",
-			DbName:      "qfw",
-			Size:        10,
-			UserName:    "",
-			Password:    "",
-		}
+	ExtMgo = &MongodbSim{
+		MongodbAddr: qu.ObjToString(e_mgo["addr"]),
+		DbName:      qu.ObjToString(e_mgo["dbname"]),
+		Size:        10,
+		UserName:    qu.ObjToString(e_mgo["username"]),
+		Password:    qu.ObjToString(e_mgo["password"]),
+	}
+	if IsLocal {
+		ExtMgo.InitPoolDirect()
+	} else {
 		ExtMgo.InitPool()
 	}
 }
 
 func initMysql() {
-
-	username, password := "zhengkun", "Zk#20220824"
-	address := "127.0.0.1:15001"
-	if !IsLocal {
-		address = "172.17.4.242:4000"
-	}
-	if IsDev {
-		username, password = "root", "=PDT49#80Z!RVv52_z"
-		address = "192.168.3.217:4000"
-	}
+	mysql := *qu.ObjToMap(SysConfig["mysql"])
 	MysqlGlobalTool = &Mysql{
-		Address:  address,
-		UserName: username,
-		PassWord: password,
-		DBName:   "global_common_data",
+		Address:  qu.ObjToString(mysql["addr"]),
+		UserName: qu.ObjToString(mysql["username"]),
+		PassWord: qu.ObjToString(mysql["password"]),
+		DBName:   qu.ObjToString(mysql["dbname"]),
 	}
 	MysqlGlobalTool.Init()
 }
@@ -184,56 +140,51 @@ func initVCode() {
 }
 
 // 创建clickhouse连接
+func initClickHouse() {
+	ClickHouseConn, _ = connectClickhouse()
+}
 func connectClickhouse() (driver.Conn, error) {
+	ck := *qu.ObjToMap(SysConfig["clickhouse"])
 	var (
-		ctx = context.Background()
-		/*
-			外网地址:cc-2ze9tv451wov14w9e.public.clickhouse.ads.aliyuncs.com:9000
-			内网地址:cc-2ze9tv451wov14w9e.clickhouse.ads.aliyuncs.com:9000
-		*/
-
+		ctx       = context.Background()
 		conn, err = clickhouse.Open(&clickhouse.Options{
-			Addr:         []string{"192.168.3.207:19000"},
+			Addr:         []string{qu.ObjToString(ck["addr"])},
 			DialTimeout:  10 * time.Second,
 			MaxIdleConns: 3,
 			MaxOpenConns: 30,
 			Auth: clickhouse.Auth{
-				Database: "information",
-				Username: "jytop",
-				Password: "pwdTopJy123",
+				Database: qu.ObjToString(ck["dbname"]),
+				Username: qu.ObjToString(ck["username"]),
+				Password: qu.ObjToString(ck["password"]),
 			},
 			Debugf: func(format string, v ...interface{}) {
-				fmt.Printf(format, v)
+				log.Debug(format, v)
 			},
 		})
-
-		//conn, err = clickhouse.Open(&clickhouse.Options{
-		//	Addr:         []string{"cc-2ze9tv451wov14w9e.public.clickhouse.ads.aliyuncs.com:9000"},
-		//	DialTimeout:  10 * time.Second,
-		//	MaxIdleConns: 3,
-		//	MaxOpenConns: 30,
-		//	Auth: clickhouse.Auth{
-		//		Database: "information",
-		//		Username: "biservice",
-		//		Password: "Bi_top95215#",
-		//	},
-		//	Debugf: func(format string, v ...interface{}) {
-		//		fmt.Printf(format, v)
-		//	},
-		//})
 	)
 	if err != nil {
 		return nil, err
 	}
 	if err := conn.Ping(ctx); err != nil {
 		if exception, ok := err.(*clickhouse.Exception); ok {
-			fmt.Printf("Exception [%d] %s \n%s\n", exception.Code, exception.Message, exception.StackTrace)
+			log.Debug("Exception [%d] %s \n%s\n", exception.Code, exception.Message, exception.StackTrace)
 		}
 		return nil, err
 	}
 	return conn, nil
 }
 
+func initEs() {
+	es := *qu.ObjToMap(SysConfig["es"])
+	EsClinet = &elastic.Elastic{
+		S_esurl:  qu.ObjToString(es["addr"]),
+		I_size:   10,
+		Username: qu.ObjToString(es["username"]),
+		Password: qu.ObjToString(es["password"]),
+	}
+	EsClinet.InitElasticSize()
+}
+
 // ...
 func GetNewInfo(index, query string) map[string]interface{} {
 	//log.Println("query  -- ", query)

+ 52 - 0
mark

@@ -0,0 +1,52 @@
+正式环境配置
+{
+  "mongo" : {
+    "bid_mgo": {
+      "addr": "172.17.189.140:27080,172.17.189.141:27081",
+      "dbname" : "qfw",
+      "username": "zhengkun",
+      "password": "zk@123123"
+    },
+    "qy_mgo": {
+      "addr": "172.17.189.140:27080,172.17.189.141:27081",
+      "dbname" : "mixdata",
+      "username": "zhengkun",
+      "password": "zk@123123"
+    },
+    "spi_mgo": {
+      "addr": "172.17.4.181:27001",
+      "dbname" : "mixdata",
+      "username": "",
+      "password": ""
+    },
+    "ext_mgo": {
+      "addr": "172.17.4.85:27080",
+      "dbname" : "qfw",
+      "username": "",
+      "password": ""
+    }
+  },
+  "mysql": {
+    "addr": "172.17.4.242:4000",
+    "dbname" : "global_common_data",
+    "username": "zhengkun",
+    "password": "Zk#20220824"
+  },
+  "clickhouse": {
+    "addr": "cc-2ze9tv451wov14w9e.clickhouse.ads.aliyuncs.com:9000",
+    "dbname" : "information",
+    "username": "biservice",
+    "password": "Bi_top95215#"
+  },
+  "es": {
+    "addr": "http://172.17.4.184:19805",
+    "username": "es_all",
+    "password": "TopJkO2E_d1x"
+  }
+}
+
+
+/*
+			外网地址:cc-2ze9tv451wov14w9e.public.clickhouse.ads.aliyuncs.com:9000
+			内网地址:cc-2ze9tv451wov14w9e.clickhouse.ads.aliyuncs.com:9000
+		*/