|
@@ -122,31 +122,31 @@ func (s *Script) LoadScript(code, script_file string, newstate bool) string {
|
|
|
ret := Download(s.Downloader, url, "get", util.GetTable(head), charset, s.Userproxy, ishttps, s.SCode, s.Timeout)
|
|
|
//后续代码中完善sendListNum方法后将下方有关心跳代码去除
|
|
|
//result := "Ret Null"
|
|
|
- ok := false
|
|
|
- if ret != "" && ret != "[]" {
|
|
|
- ret = SpaceReg.ReplaceAllString(ret, "")
|
|
|
- tmpArr := []interface{}{}
|
|
|
- tmpMap := map[string]interface{}{}
|
|
|
- if err := json.Unmarshal([]byte(ret), &tmpMap); err == nil && len(tmpMap) >= 2 {
|
|
|
- //result = "Map Ok"
|
|
|
- ok = true
|
|
|
- } else if err := json.Unmarshal([]byte(ret), &tmpArr); err == nil && len(tmpArr) >= 2 {
|
|
|
- //result = "Arr Ok"
|
|
|
- ok = true
|
|
|
- } else if htmlArr := HtmlReg.FindAllString(ret, -1); len(htmlArr) >= 4 {
|
|
|
- //result = "Html Ok"
|
|
|
- ok = true
|
|
|
- } else if textArr := HanReg.FindAllString(ret, -1); len(textArr) > 0 {
|
|
|
- text := strings.Join(textArr, "")
|
|
|
- if len([]rune(text)) >= 50 {
|
|
|
- //result = "Text Ok"
|
|
|
- ok = true
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- if ok {
|
|
|
- UpdateHeart("", "", code, "", "findlist") //记录列表页实际采集数据量心跳
|
|
|
- }
|
|
|
+ //ok := false
|
|
|
+ //if ret != "" && ret != "[]" {
|
|
|
+ // ret = SpaceReg.ReplaceAllString(ret, "")
|
|
|
+ // tmpArr := []interface{}{}
|
|
|
+ // tmpMap := map[string]interface{}{}
|
|
|
+ // if err := json.Unmarshal([]byte(ret), &tmpMap); err == nil && len(tmpMap) >= 2 {
|
|
|
+ // //result = "Map Ok"
|
|
|
+ // ok = true
|
|
|
+ // } else if err := json.Unmarshal([]byte(ret), &tmpArr); err == nil && len(tmpArr) >= 2 {
|
|
|
+ // //result = "Arr Ok"
|
|
|
+ // ok = true
|
|
|
+ // } else if htmlArr := HtmlReg.FindAllString(ret, -1); len(htmlArr) >= 4 {
|
|
|
+ // //result = "Html Ok"
|
|
|
+ // ok = true
|
|
|
+ // } else if textArr := HanReg.FindAllString(ret, -1); len(textArr) > 0 {
|
|
|
+ // text := strings.Join(textArr, "")
|
|
|
+ // if len([]rune(text)) >= 50 {
|
|
|
+ // //result = "Text Ok"
|
|
|
+ // ok = true
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //if ok {
|
|
|
+ // UpdateHeart("", "", code, "", "findlist") //记录列表页实际采集数据量心跳
|
|
|
+ //}
|
|
|
S.Push(lua.LString(ret))
|
|
|
atomic.AddInt32(&s.ToDayRequestNum, 1)
|
|
|
atomic.AddInt32(&s.TotalRequestNum, 1)
|
|
@@ -188,31 +188,31 @@ func (s *Script) LoadScript(code, script_file string, newstate bool) string {
|
|
|
}
|
|
|
//后续代码中完善sendListNum方法后将下方有关心跳代码去除
|
|
|
//result := "Ret Null"
|
|
|
- ok := false
|
|
|
- if ret != "" && ret != "[]" {
|
|
|
- ret = SpaceReg.ReplaceAllString(ret, "")
|
|
|
- tmpArr := []interface{}{}
|
|
|
- tmpMap := map[string]interface{}{}
|
|
|
- if err := json.Unmarshal([]byte(ret), &tmpMap); err == nil && len(tmpMap) >= 2 {
|
|
|
- //result = "Map Ok"
|
|
|
- ok = true
|
|
|
- } else if err := json.Unmarshal([]byte(ret), &tmpArr); err == nil && len(tmpArr) >= 2 {
|
|
|
- //result = "Arr Ok"
|
|
|
- ok = true
|
|
|
- } else if htmlArr := HtmlReg.FindAllString(ret, -1); len(htmlArr) >= 4 {
|
|
|
- //result = "Html Ok"
|
|
|
- ok = true
|
|
|
- } else if textArr := HanReg.FindAllString(ret, -1); len(textArr) > 0 {
|
|
|
- text := strings.Join(textArr, "")
|
|
|
- if len([]rune(text)) >= 50 {
|
|
|
- //result = "Text Ok"
|
|
|
- ok = true
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- if ok {
|
|
|
- UpdateHeart("", "", code, "", "findlist") //记录列表页实际采集数据量心跳
|
|
|
- }
|
|
|
+ //ok := false
|
|
|
+ //if ret != "" && ret != "[]" {
|
|
|
+ // ret = SpaceReg.ReplaceAllString(ret, "")
|
|
|
+ // tmpArr := []interface{}{}
|
|
|
+ // tmpMap := map[string]interface{}{}
|
|
|
+ // if err := json.Unmarshal([]byte(ret), &tmpMap); err == nil && len(tmpMap) >= 2 {
|
|
|
+ // //result = "Map Ok"
|
|
|
+ // ok = true
|
|
|
+ // } else if err := json.Unmarshal([]byte(ret), &tmpArr); err == nil && len(tmpArr) >= 2 {
|
|
|
+ // //result = "Arr Ok"
|
|
|
+ // ok = true
|
|
|
+ // } else if htmlArr := HtmlReg.FindAllString(ret, -1); len(htmlArr) >= 4 {
|
|
|
+ // //result = "Html Ok"
|
|
|
+ // ok = true
|
|
|
+ // } else if textArr := HanReg.FindAllString(ret, -1); len(textArr) > 0 {
|
|
|
+ // text := strings.Join(textArr, "")
|
|
|
+ // if len([]rune(text)) >= 50 {
|
|
|
+ // //result = "Text Ok"
|
|
|
+ // ok = true
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //if ok {
|
|
|
+ // UpdateHeart("", "", code, "", "findlist") //记录列表页实际采集数据量心跳
|
|
|
+ //}
|
|
|
S.Push(lua.LString(ret))
|
|
|
scookie, _ := json.Marshal(retcookie)
|
|
|
S.Push(lua.LString(scookie))
|