xg

CMPlatform/config.json

@@ -1,22 +1,22 @@
 {
   "port": "7001",
   "udpport": ":11117",
-  "mgodb": "192.168.3.71:29099",
+  "mgodb": "172.20.45.129:27002",
   "dbsize": 5,
   "dbname": "datatag_ent",
-  "mgodben": "192.168.3.71:29099",
+  "mgodben": "172.20.45.129:27002",
   "dbnameen": "enterprise",
   "mongoenc": "winner_enterprise",
   "subday": 15,
-  "logpath": "",
+  "logpath": "./log/log.out",
   "customer": {
     "api": "https://jybx3-webtest.jydev.jianyu360.com/api1/user/jy_newuser",
-    "mgodb": "192.168.3.206:27080",
+    "mgodb": "172.20.45.129:27002",
     "dbname": "jyqyfw",
     "dbsize": 5
   },
   "preview_href": "http://192.168.20.214:5500/data-preview.html",
-  "elasticsearch": "http://192.168.3.241:9205",
+  "elasticsearch": "http://127.0.0.1:19908",
   "elasticsearch_index": "bidding",
   "elasticsearch_type": "bidding",
   "elasticPoolSize": 10,
@@ -31,7 +31,7 @@
     "memo": "生索引"
   },
   "buyerinfo": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.129:27002",
     "size": 15,
     "db": "mixdata",
     "hospcoll": "buyer_rank",
@@ -41,7 +41,7 @@
     "replSet": ""
   },
   "enterprise": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.129:27002",
     "size": 15,
     "db": "mixdata",
     "coll": "qyxy_std",
@@ -50,7 +50,7 @@
     "replSet": ""
   },
   "save": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.129:27002",
     "size": 15,
     "db": "datatag_ent",
     "coll": "usermail_history",
@@ -59,13 +59,13 @@
     "coll_project": "usermail_history_projectid"
   },
   "extract": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.129:27002",
     "coll": "result_20200917",
     "db": "qfw",
     "size": 15
   },
   "es": {
-    "addr": "http://192.168.3.241:9205",
+    "addr": "http://172.20.45.129:9206",
     "index": "bidding",
     "itype": "bidding",
     "pool": 15,
@@ -74,7 +74,7 @@
     "password": "Top2023_JEB01i@31"
   },
   "es_customer": {
-    "addr": "http://192.168.3.241:9205",
+    "addr": "http://127.0.0.1:19908",
     "index": "bidding",
     "pool": 15,
     "version": "v7",
@@ -225,34 +225,34 @@
   "need_projectid_appid": [
     "jyFApXQQIEAw5TTUZOMBpD"
   ],
-  "redis_addrs": "datag=192.168.3.149:1712,session=192.168.3.149:1712,other=192.168.3.149:1712,ent=192.168.3.149:1712",
+  "redis_addrs": "datag=172.20.45.129:1712,session=172.20.45.129:1712,other=172.20.45.129:1712,ent=172.20.45.129:1712",
   "jyPushMysql": {
     "username": "root",
     "password": "=PDT49#80Z!RVv52_z",
-    "address": "192.168.3.14:4000",
+    "address": "172.20.45.129:4000",
     "dbName": "jianyu"
   },
   "jyMysql": {
     "username": "root",
     "password": "=PDT49#80Z!RVv52_z",
-    "address": "192.168.3.14:4000",
+    "address": "172.20.45.129:4000",
     "dbName": "jianyu"
   },
   "pushMysql": {
     "username": "root",
     "password": "=PDT49#80Z!RVv52_z",
-    "address": "192.168.3.14:4000",
+    "address": "172.20.45.129:4000",
     "dbName": "jianyu",
     "maxIdleConns": 2
   },
   "entMysql": {
     "username": "root",
     "password": "=PDT49#80Z!RVv52_z",
-    "address": "192.168.3.14:4000",
+    "address": "172.20.45.129:4000",
     "dbName": "bi_service"
   },
   "bidding_mgo": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.129:27002",
     "coll": "bidding",
     "db": "qfw",
     "size": 15,
@@ -290,7 +290,7 @@
   "elasticsearch_interim_index": "bidding",
   "elasticsearch_total_index": "bidding",
   "site_mgo": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.129:27002",
     "size": 5,
     "db": "datatag_ent",
     "coll": "site"

CMPlatform/history/datamodel.go

@@ -31,6 +31,7 @@ var (
 
 // 客户模型
 type Customer struct {
+	HistoryId    string                            `bson:"history_id"`
 	ID           string                            //客户ID
 	Name         string                            //客户名称
 	AppId        string                            //appid

CMPlatform/history/historytask.go

@@ -90,6 +90,7 @@ func (this *HistoryData) HistoryTask(history_id string) {
 		cus.SaveDataArr = []map[string]interface{}{}
 		cus.tempChan = make(chan *tempData, 2000)
 		cus.tempChanOver = make(chan bool)
+		cus.HistoryId = history_id
 		//cus.saveTempColl = fmt.Sprintf("temp_history_%s_%d", date.NowFormat(date.Date_yyyyMMdd), time.Now().Unix())
 		cus.saveTempColl = fmt.Sprintf("temp_history_%s", history_id)
 

CMPlatform/history/task.go

@@ -426,7 +426,7 @@ func processedData_A(c *Customer, data *tempData) {
 		到此已经匹配完数据
 	*/
 	if !IsMatch {
-		log.Debug("---------------------", zap.String("id", id), zap.Any("IsMatch", IsMatch))
+		log.Debug("---------------------", zap.String("historyId", c.HistoryId), zap.String("id", id), zap.Any("IsMatch", IsMatch))
 	}
 	if IsMatch {
 		//匹配成功，数据上新增规则id,matchKey,item并临时保存数据

CMPlatform/history/util_history.go

@@ -2358,7 +2358,7 @@ func GetProjectId(id string) (string, int64, int64) {
 		//log.Debug("projectId: " + projectId)
 		//
 	} else {
-		log.Debug("ES未查到项目id: " + id)
+		//log.Debug("ES未查到项目id: " + id)
 	}
 	return projectId, zbtime, yitime
 }