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

udpfilterdup/src/README.md

@@ -35,4 +35,44 @@
     "specialtitle_1": "[0-9a-zA-Z一二三四五六七八九十零１２３４５６７８９](次|包|标段|标包|批|期)",
     "specialtitle_2": "项目[(（][0-9a-zA-Z一二三四五六七八九十零１２３４５６７８９][)）]",
     "beifen": "[(（]?[0-9一二三四五六七八九十零１２３４５６７８９再][)）]?[子分]?[次批标包]|重招|重新招标|勘察|设计|施工|监理|总承包|土石方|可研"
-}
+}
+
+
+
+
+
+
+
+
+{
+    "udpport": ":17859",
+    "dupdays": 5,
+    "mongodb": {
+        "addr": "192.168.3.207:27092",
+        "pool": 5,
+        "db": "extract_kf",
+        "extract": "a_testbidding",
+        "extract_back": "a_testbidding",
+        "site": {
+            "dbname": "extract_kf",
+            "coll": "site"
+        }
+    },
+    "jkmail": {
+        "to": "zhengkun@topnet.net.cn,zhangjinkun@topnet.net.cn",
+        "api": "http://10.171.112.160:19281/_send/_mail"
+    },
+    "nextNode": [
+    ],
+    "threads": 1,
+    "isMerger": true,
+    "lowHeavy":true,
+    "timingTask":false,
+    "timingSpanDay": 3,
+    "timingPubScope": 720,
+    "specialwords": "(重招|重新招标|勘察|设计|施工|监理|总承包|土石方|可研)",
+    "specialtitle_0": "(包|标段|标包)[(（]?[0-9a-zA-Z一二三四五六七八九十零１２３４５６７８９][)）]?",
+    "specialtitle_1": "[0-9a-zA-Z一二三四五六七八九十零１２３４５６７８９](次|包|标段|标包|批|期)",
+    "specialtitle_2": "项目[(（][0-9a-zA-Z一二三四五六七八九十零１２３４５６７８９][)）]",
+    "beifen": "[(（]?[0-9一二三四五六七八九十零１２３４５６７８９再][)）]?[子分]?[次批标包]|重招|重新招标|勘察|设计|施工|监理|总承包|土石方|可研"
+}

udpfilterdup/src/config.json

@@ -1,14 +1,14 @@
 {
-    "udpport": ":1785",
+    "udpport": ":17859",
     "dupdays": 5,
     "mongodb": {
-        "addr": "172.17.4.187:27083",
+        "addr": "192.168.3.207:27092",
         "pool": 5,
-        "db": "qfw",
-        "extract": "result_file_20200410",
-        "extract_back": "result_file_20200409",
+        "db": "extract_kf",
+        "extract": "a_testbidding",
+        "extract_back": "a_testbidding",
         "site": {
-            "dbname": "qfw",
+            "dbname": "extract_kf",
             "coll": "site"
         }
     },
@@ -17,12 +17,6 @@
         "api": "http://10.171.112.160:19281/_send/_mail"
     },
     "nextNode": [
-        {
-            "addr": "127.0.0.1",
-            "port": 1783,
-            "stype": "bidding",
-            "memo": "创建招标数据索引new"
-        }
     ],
     "threads": 1,
     "isMerger": true,

udpfilterdup/src/main.go

@@ -106,7 +106,6 @@ func init() {
 
 
 func main() {
-
 	go checkMapJob()
 	updport := Sysconfig["udpport"].(string)
 	udpclient = mu.UdpClient{Local: updport, BufSize: 1024}
@@ -299,22 +298,22 @@ func task(data []byte, mapInfo map[string]interface{}) {
 						//mongo更新 - 具体字段 - merge
 						mgo.UpdateById(extract,source.id,update_map)
 						//发udp  更新索引
-						for _, to := range nextNode {
-							key := source.id + "-" + source.id + "-" + util.ObjToString(to["stype"])
-							by, _ := json.Marshal(map[string]interface{}{
-								"gtid":  source.id,
-								"lteid": source.id,
-								"stype": "biddingall",
-								"key":   key,
-							})
-							addr := &net.UDPAddr{
-								IP:   net.ParseIP(to["addr"].(string)),
-								Port: util.IntAll(to["port"]),
-							}
-							node := &udpNode{by, addr, time.Now().Unix(), 0}
-							udptaskmap.Store(key, node)
-							udpclient.WriteUdp(by, mu.OP_TYPE_DATA, addr)
-						}
+						//for _, to := range nextNode {
+						//	key := source.id + "-" + source.id + "-" + util.ObjToString(to["stype"])
+						//	by, _ := json.Marshal(map[string]interface{}{
+						//		"gtid":  source.id,
+						//		"lteid": source.id,
+						//		"stype": "biddingall",
+						//		"key":   key,
+						//	})
+						//	addr := &net.UDPAddr{
+						//		IP:   net.ParseIP(to["addr"].(string)),
+						//		Port: util.IntAll(to["port"]),
+						//	}
+						//	node := &udpNode{by, addr, time.Now().Unix(), 0}
+						//	udptaskmap.Store(key, node)
+						//	udpclient.WriteUdp(by, mu.OP_TYPE_DATA, addr)
+						//}
 					}
 				}
 			}
@@ -422,8 +421,6 @@ func timedTaskOnce() {
 			continue
 		}
 
-
-
 		//取-符合-发布时间X年内的数据
 		if util.IntAll(tmp["dataging"]) == 1 {
 			pubtime := util.Int64All(tmp["publishtime"])