historyevent字段更新为incrementevent

src/front/front.go

@@ -553,7 +553,7 @@ func (f *Front) Importfile() {
 						o["status"] = 1
 						o["next"] = cells[4].Value
 						o["event"] = cells[5].Value
-						o["historyevent"] = cells[6].Value
+						o["incrementevent"] = cells[6].Value
 						if cells[7].Value == "是" {
 							o["isflow"] = 1
 						} else {
@@ -686,13 +686,13 @@ func savelua(o map[string]interface{}) (bool, string) {
 	param["urgency"] = o["urgency"]
 	param["isflow"] = o["isflow"]
 	param["spidertype"] = "history"
-	historyevent := qu.ObjToString(o["historyevent"])
-	if movevent, ok := util.Config.Uploadevents[historyevent].(string); ok && movevent != "" {
+	incrementevent := qu.ObjToString(o["incrementevent"])
+	if movevent, ok := util.Config.Uploadevents[incrementevent].(string); ok && movevent != "" {
 		param["spidermovevent"] = movevent
 	} else {
 		param["spidermovevent"] = "7700"
 	}
-	param["historyevent"] = qu.IntAll(o["historyevent"])
+	param["incrementevent"] = qu.IntAll(o["incrementevent"])
 	param["platform"] = o["platform"]
 	param["weight"] = o["weight"]
 	//默认字段
@@ -721,7 +721,7 @@ func savelua(o map[string]interface{}) (bool, string) {
 				"p_site":        "",
 				"s_site":        "",
 				"remarktime":    time.Now().Unix(),
-				"event":         fmt.Sprint(historyevent),
+				"event":         incrementevent,
 				"platform":      o["platform"],
 				"spider_status": "0/1",
 				"updatetime":    time.Now().Unix(),
@@ -957,8 +957,8 @@ func (f *Front) UpdateESP() {
 	} else if w == "state" { //无效爬虫改为待完成
 		tmpEvent := qu.IntAll((*one)["event"])
 		if one != nil && len(*one) > 0 {
-			if (*one)["historyevent"] == nil && tmpEvent != 7000 { //除7000节点外没有historyevent的要重新设置
-				set["historyevent"] = tmpEvent
+			if (*one)["incrementevent"] == nil && tmpEvent != 7000 { //除7000节点外没有incrementevent的要重新设置
+				set["incrementevent"] = tmpEvent
 			}
 		}
 		set["state"] = 0
@@ -1007,8 +1007,8 @@ func (f *Front) UpdateESP() {
 			b, err := spider.UpdateSpiderByCodeState(code, "6", qu.IntAll((*one)["event"])) //下架
 			if b && err == nil {
 				//历史节点下架为了避免线上运行爬虫待完成时改为7000采集历史，但是又转到其他平台，导致原线上运行节点爬虫并未下线，心跳异常
-				if historyevent := (*one)["historyevent"]; historyevent != nil {
-					b, err = spider.UpdateSpiderByCodeState(code, "6", qu.IntAll(historyevent))
+				if incrementevent := (*one)["incrementevent"]; incrementevent != nil {
+					b, err = spider.UpdateSpiderByCodeState(code, "6", qu.IntAll(incrementevent))
 				}
 				//关闭任务
 				u.MgoEB.Update("task", map[string]interface{}{"s_code": code, "i_state": map[string]interface{}{"$in": []int{0, 1, 2, 3, 5}}}, map[string]interface{}{"$set": map[string]interface{}{"i_state": 6}}, false, true)
@@ -1042,7 +1042,7 @@ func (f *Front) UpdateESP() {
 	} else { //修改节点
 		event, _ := strconv.Atoi(val)
 		set["event"] = event
-		set["historyevent"] = event
+		set["incrementevent"] = event
 		//state := f.GetString("s")
 		//if state == "5" { //已上架状态改为下架
 		code := f.GetString("c")

src/front/luamove.go

@@ -163,7 +163,7 @@ func SpiderMoveLua(codes []string, events []string) bool {
 				upresult, err = spider.UpdateSpiderByCodeState(code, "6", event) //脚本下架
 				if upresult && err == nil {                                      //下架成功，更新节点
 					re := qu.IntAll(resultEvent)
-					u.MgoEB.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": map[string]interface{}{"event": re, "historyevent": re}}, false, false)
+					u.MgoEB.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": map[string]interface{}{"event": re, "incrementevent": re}}, false, false)
 					//上架
 					upresult, err = spider.UpdateSpiderByCodeState(code, "5", re) //脚本上架
 					if !upresult || err != nil {
@@ -259,8 +259,8 @@ func SendMail(text string) {
 func GetEvent(code string, lua map[string]interface{}) int {
 	defer qu.Catch()
 	//1、历史节点
-	if lua["historyevent"] != nil {
-		return qu.IntAll(lua["historyevent"])
+	if lua["incrementevent"] != nil {
+		return qu.IntAll(lua["incrementevent"])
 	}
 	//2、根据站点找节点
 	param_common := lua["param_common"].([]interface{})

src/front/spider.go

@@ -393,9 +393,9 @@ func (f *Front) SaveStep() {
 			if f.OtherBase.SpiderType == "history" {                   //爬虫类型是history的放到7000节点,并记录历史节点
 				param["event"] = 7000
 				if err == nil {
-					param["historyevent"] = tmpEvent //开发人员切换增量节点
+					param["incrementevent"] = tmpEvent //开发人员切换增量节点
 				} else if event := qu.IntAll((*one)["event"]); event != 7000 { //默认增量节点
-					param["historyevent"] = event
+					param["incrementevent"] = event
 				}
 			} else if f.OtherBase.SpiderType == "increment" && err == nil { //增量
 				param["event"] = tmpEvent //开发人员切换增量节点

src/timetask/timetask.go

@@ -232,8 +232,8 @@ func SpiderMoveEvent() {
 func GetEvent(code string, lua map[string]interface{}) int {
 	defer qu.Catch()
 	//1、历史节点
-	if lua["historyevent"] != nil {
-		return qu.IntAll(lua["historyevent"])
+	if lua["incrementevent"] != nil {
+		return qu.IntAll(lua["incrementevent"])
 	}
 	//2、根据站点找节点
 	query := map[string]interface{}{

src/web/templates/spiderbase.html

@@ -214,7 +214,7 @@
 									}
 									if ({{.T.spidertype}} == "increment" && event == {{.T.lua.event}}) {//增量爬虫展示event
 										midtext = midtext + " selected";
-									} else if({{.T.spidertype}} == "history" && event == {{.T.lua.historyevent}}){//历史展示historyevent
+									} else if({{.T.spidertype}} == "history" && event == {{.T.lua.incrementevent}}){//历史展示incrementevent
 										midtext = midtext + " selected";
 									}
 									var resultext = startext+midtext+endtext