|
@@ -95,8 +95,8 @@ func NoQueueScript() {
|
|
code := info["code"]
|
|
code := info["code"]
|
|
script := info["script"]
|
|
script := info["script"]
|
|
sp := NewSpider(code, script)
|
|
sp := NewSpider(code, script)
|
|
- sp.Index = qu.IntAll(key)
|
|
|
|
if sp != nil && sp.Code != "nil" { //脚本加载成功
|
|
if sp != nil && sp.Code != "nil" { //脚本加载成功
|
|
|
|
+ sp.Index = qu.IntAll(key)
|
|
if info["createuser"] != "" {
|
|
if info["createuser"] != "" {
|
|
sp.UserName = info["createuser"]
|
|
sp.UserName = info["createuser"]
|
|
}
|
|
}
|
|
@@ -196,7 +196,7 @@ func NewSpider(code, luafile string) *Spider {
|
|
//qu.Debug("-------", spider.GetBoolVar("spiderIsHistoricalMend"), spider.GetBoolVar("spiderIsMustDownload"))
|
|
//qu.Debug("-------", spider.GetBoolVar("spiderIsHistoricalMend"), spider.GetBoolVar("spiderIsMustDownload"))
|
|
spider.IsHistoricalMend = spider.GetBoolVar("spiderIsHistoricalMend")
|
|
spider.IsHistoricalMend = spider.GetBoolVar("spiderIsHistoricalMend")
|
|
spider.IsMustDownload = spider.GetBoolVar("spiderIsMustDownload")
|
|
spider.IsMustDownload = spider.GetBoolVar("spiderIsMustDownload")
|
|
-
|
|
|
|
|
|
+ spider.IsCompete = spider.GetBoolVar("spiderIsCompete")
|
|
return spider
|
|
return spider
|
|
}
|
|
}
|
|
|
|
|
|
@@ -313,7 +313,7 @@ func GetScriptByTmp(luaconfig map[string]interface{}) string {
|
|
} else {
|
|
} else {
|
|
script_content = luaconfig["str_content"].(string)
|
|
script_content = luaconfig["str_content"].(string)
|
|
}
|
|
}
|
|
- script += fmt.Sprintf(util.Tmp_Other, luaconfig["spidertype"], luaconfig["spiderhistorymaxpage"], luaconfig["spidermovevent"])
|
|
|
|
|
|
+ script += fmt.Sprintf(util.Tmp_Other, luaconfig["spidertype"], luaconfig["spiderhistorymaxpage"], luaconfig["spidermovevent"], luaconfig["spidercompete"])
|
|
script += `
|
|
script += `
|
|
` + script_time + `
|
|
` + script_time + `
|
|
` + script_list + `
|
|
` + script_list + `
|