Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

spider2/src/client/ecps/ln/downcontent.go

@@ -24,7 +24,7 @@ func downloadContent(param map[string]interface{}) (bool, map[string]interface{}
 		return false, nil
 	}
 	//log.Println(query)
-	//query = "211200004026325"
+	//query = "210200400048103"
 	var checkcode string
 	reg, _ := regexp.Compile("(\\d{4})")
 	var cookies []*http.Cookie
@@ -86,14 +86,20 @@ func downloadContent(param map[string]interface{}) (bool, map[string]interface{}
 	doc, _ := goquery.NewDocumentFromReader(bytes.NewBuffer(listbs))
 	info := getListInfo(doc)
 	if info == nil || info["regno"] == nil {
+		log.Println(query, "无对应查询结果")
 		return false, nil
 	}
 	regno := info["regno"].(string)
 	if regno == "" {
 		return false, nil
 	}
-	pripid := info["pripid"].(string)
+	//查询结果不匹配，用来防止死循环
 	entname := info["entname"].(string)
+	if (entname != query) && (regno != query) {
+		log.Println(query, info, "查询结果不匹配")
+		return false, nil
+	}
+	pripid := info["pripid"].(string)
 	enttype := info["enttype"].(string)
 	optstate := info["optstate"].(string)
 

spider2/src/client/ecps/ln/parse.go

@@ -113,7 +113,7 @@ func addJob(tmplist []interface{}) {
 			} else {
 				cm["query"] = tmp["Inv"]
 			}
-			if cm["query"] != nil && cm["query"] != "" && len(cm["query"].(string)) > 5 {
+			if cm["query"] != nil && cm["query"] != "" && len(cm["query"].(string)) > 6 {
 				//防止死循环
 				if cm["query"] == infoMap["CerNo"] || cm["query"] == infoMap["EntName"] {
 					continue

spider2/src/client/ecps/ln/spider.go

@@ -87,16 +87,14 @@ func downList() {
 			if ent != nil {
 				log.Println(ent["EntName"], ent["RegNo"], ",根据配置频率跳过")
 				putLogs(":"+fmt.Sprint(ent["EntName"])+","+fmt.Sprint(ent["RegNo"])+",根据配置频率跳过", 1)
-
 				Lists.Remove(e)
 				continue
 			}
-			b, info := downloadContent(tmp)
 			Lists.Remove(e)
+			b, info := downloadContent(tmp)
 			if b {
 				log.Println("成功下载：", info["EntName"], info["RegNo"])
 				putLogs("成功下载："+fmt.Sprint(info["EntName"])+","+fmt.Sprint(info["RegNo"]), 1)
-
 			} else {
 				log.Println("下载失败：", tmp)
 				putLogs("下载失败："+fmt.Sprint(tmp), 1)