Browse Source

新增listisfilter字段

maxiaoshan 3 years ago
parent
commit
6c692fc192
2 changed files with 5 additions and 2 deletions
  1. 3 2
      src/front/front.go
  2. 2 0
      src/front/spider.go

+ 3 - 2
src/front/front.go

@@ -31,7 +31,7 @@ type Front struct {
 	login        xweb.Mapper `xweb:"/"`
 	logout       xweb.Mapper `xweb:"/center/logout"`               //退出
 	loadIndex    xweb.Mapper `xweb:"/center"`                      //控制中心
-	spidernew    xweb.Mapper `xweb:"/center/spider"`               //爬虫保存
+	spidernew    xweb.Mapper `xweb:"/center/spider"`               //爬虫新建
 	reg          xweb.Mapper `xweb:"/center/reg"`                  //爬虫注册
 	assign       xweb.Mapper `xweb:"/center/user/assign"`          //分配爬虫
 	loadSpider   xweb.Mapper `xweb:"/center/spider/edit/(.*)"`     //爬虫加载
@@ -51,7 +51,7 @@ type Front struct {
 	runStep     xweb.Mapper `xweb:"/center/run"`             //方法测试
 	spiderPass  xweb.Mapper `xweb:"/center/spider/pass"`     //整体测试
 	runPinYin   xweb.Mapper `xweb:"/center/runpy"`           //获取拼音
-	saveStep    xweb.Mapper `xweb:"/center/save"`            //保存脚本
+	saveStep    xweb.Mapper `xweb:"/center/save"`            //脚本保存
 	loadModel   xweb.Mapper `xweb:"/center/gmodel/(.*)"`     //加载模型
 	importdata  xweb.Mapper `xweb:"/center/importdata"`      //导入脚本
 	importfile  xweb.Mapper `xweb:"/center/importfile"`      //批量导入爬虫
@@ -89,6 +89,7 @@ var SessMap map[string]*httpsession.Session
 var AutoTpl map[string]interface{}
 var Mails *util.Mail
 var Reg = regexp.MustCompile(`(http|https)://([\w]+\.)+[\w]+`)
+var ListFilterReg = regexp.MustCompile("关键词过滤")
 var Transfercode map[string]interface{}
 var LuaStateMap = map[int]string{
 	0:  "待完成",

+ 2 - 0
src/front/spider.go

@@ -377,6 +377,8 @@ func (f *Front) SaveStep() {
 			//三级页复制
 			param["str_recontent"] = f.StepRe3.Expert
 			param["iscopycontent"] = f.StepRe3.Checked
+			//
+			param["listisfilter"] = ListFilterReg.MatchString(f.Step2.Expert) //列表页校验是否含“--关键词过滤”
 			matchLua := LuaTextCheck(f.Step2.Expert, f.Step3.Expert)
 			if !matchLua {
 				issave := spider.SaveSpider(code, param) //保存脚本