From fa4d8ddc5051095d76f84862bf3ab60a22c6dd0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Tue, 26 Nov 2019 15:26:01 +0800
Subject: [PATCH 01/21] =?UTF-8?q?fix=20=E6=89=A7=E8=A1=8C=E7=88=AC?=
 =?UTF-8?q?=E8=99=AB=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/model/task.go      |  1 +
 backend/services/spider.go |  3 +--
 backend/services/task.go   | 18 +++++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/backend/model/task.go b/backend/model/task.go
index 64f06cd71..b869b506e 100644
--- a/backend/model/task.go
+++ b/backend/model/task.go
@@ -61,6 +61,7 @@ func (t *Task) Save() error {
 	defer s.Close()
 	t.UpdateTs = time.Now()
 	if err := c.UpdateId(t.Id, t); err != nil {
+		log.Errorf("update task error: %s", err.Error())
 		debug.PrintStack()
 		return err
 	}
diff --git a/backend/services/spider.go b/backend/services/spider.go
index 84d218bbd..d76f1f9ab 100644
--- a/backend/services/spider.go
+++ b/backend/services/spider.go
@@ -116,10 +116,9 @@ func PublishAllSpiders() {
 
 // 发布爬虫
 func PublishSpider(spider model.Spider) {
-	// 查询gf file，不存在则删除
+	// 可能爬虫文件不存在，则直接返回
 	gfFile := model.GetGridFs(spider.FileId)
 	if gfFile == nil {
-		_ = model.RemoveSpider(spider.Id)
 		return
 	}
 	spiderSync := spider_handler.SpiderSync{
diff --git a/backend/services/task.go b/backend/services/task.go
index 67c3396b1..3cb1a12ca 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -391,15 +391,23 @@ func ExecuteTask(id int) {
 	t.Status = constants.StatusRunning                   // 任务状态
 	t.WaitDuration = t.StartTs.Sub(t.CreateTs).Seconds() // 等待时长
 
+	// 判断爬虫文件是否存在
+	gfFile := model.GetGridFs(spider.FileId)
+	if gfFile == nil {
+		t.Error = "找不到爬虫文件，请重新上传"
+		t.Status = constants.StatusError
+		t.FinishTs = time.Now()                                 // 结束时间
+		t.RuntimeDuration = t.FinishTs.Sub(t.StartTs).Seconds() // 运行时长
+		t.TotalDuration = t.FinishTs.Sub(t.CreateTs).Seconds()  // 总时长
+		_ = t.Save()
+		return
+	}
+
 	// 开始执行任务
 	log.Infof(GetWorkerPrefix(id) + "开始执行任务(ID:" + t.Id + ")")
 
 	// 储存任务
-	if err := t.Save(); err != nil {
-		log.Errorf(err.Error())
-		HandleTaskError(t, err)
-		return
-	}
+	_ = t.Save()
 
 	// 起一个cron执行器来统计任务结果数
 	if spider.Col != "" {

From d5cfb045605d165a01240e1e56790e7a1bf544c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Sat, 7 Dec 2019 10:58:09 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/store/modules/spider.js         | 1 -
 frontend/src/views/schedule/ScheduleList.vue | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/store/modules/spider.js b/frontend/src/store/modules/spider.js
index f4d7b1349..7ff9324a4 100644
--- a/frontend/src/store/modules/spider.js
+++ b/frontend/src/store/modules/spider.js
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import request from '../../api/request'
-import axisModelCommonMixin from 'echarts/src/coord/axisModelCommonMixin'
 
 const state = {
   // list of spiders
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 3a032b230..44a525173 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -115,9 +115,11 @@
         </template>
         <el-table-column :label="$t('Action')" align="left" width="150px" fixed="right">
           <template slot-scope="scope">
+            <!-- 编辑 -->
             <el-tooltip :content="$t('Edit')" placement="top">
               <el-button type="warning" icon="el-icon-edit" size="mini" @click="onEdit(scope.row)"></el-button>
             </el-tooltip>
+            <!-- 删除 -->
             <el-tooltip :content="$t('Remove')" placement="top">
               <el-button type="danger" icon="el-icon-delete" size="mini" @click="onRemove(scope.row)"></el-button>
             </el-tooltip>
@@ -216,7 +218,7 @@ export default {
       })
       this.$st.sendEv('定时任务', '提交')
     },
-    isShowRun () {
+    isShowRun (row) {
     },
     onEdit (row) {
       this.$store.commit('schedule/SET_SCHEDULE_FORM', row)

From 58df4c4a96023ae78530f8233097a8b3d34f575a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Sat, 7 Dec 2019 14:02:54 +0800
Subject: [PATCH 03/21] =?UTF-8?q?Feature=20=E6=96=B0=E5=A2=9E=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8F=AF=E6=9A=82=E5=81=9C/?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/constants/schedule.go |  6 +++++
 backend/main.go               | 12 +++++----
 backend/model/schedule.go     |  2 ++
 backend/routes/schedule.go    | 48 +++++++++++++++++++----------------
 backend/routes/utils.go       | 23 +++++++++++++----
 backend/services/schedule.go  | 37 +++++++++++++++++++++++++++
 6 files changed, 96 insertions(+), 32 deletions(-)
 create mode 100644 backend/constants/schedule.go

diff --git a/backend/constants/schedule.go b/backend/constants/schedule.go
new file mode 100644
index 000000000..3f0afc7e1
--- /dev/null
+++ b/backend/constants/schedule.go
@@ -0,0 +1,6 @@
+package constants
+
+const (
+	ScheduleStatusStop    = "stop"
+	ScheduleStatusRunning = "running"
+)
diff --git a/backend/main.go b/backend/main.go
index 3f87125de..07adcb4e8 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -160,11 +160,13 @@ func main() {
 			authGroup.GET("/tasks/:id/results", routes.GetTaskResults)                  // 任务结果
 			authGroup.GET("/tasks/:id/results/download", routes.DownloadTaskResultsCsv) // 下载任务结果
 			// 定时任务
-			authGroup.GET("/schedules", routes.GetScheduleList)       // 定时任务列表
-			authGroup.GET("/schedules/:id", routes.GetSchedule)       // 定时任务详情
-			authGroup.PUT("/schedules", routes.PutSchedule)           // 创建定时任务
-			authGroup.POST("/schedules/:id", routes.PostSchedule)     // 修改定时任务
-			authGroup.DELETE("/schedules/:id", routes.DeleteSchedule) // 删除定时任务
+			authGroup.GET("/schedules", routes.GetScheduleList)        // 定时任务列表
+			authGroup.GET("/schedules/:id", routes.GetSchedule)        // 定时任务详情
+			authGroup.PUT("/schedules", routes.PutSchedule)            // 创建定时任务
+			authGroup.POST("/schedules/:id", routes.PostSchedule)      // 修改定时任务
+			authGroup.DELETE("/schedules/:id", routes.DeleteSchedule)  // 删除定时任务
+			authGroup.POST("/schedules/:id/stop", routes.StopSchedule) // 停止定时任务
+			authGroup.POST("/schedules/:id/run", routes.RunSchedule)   // 运行定时任务
 			// 统计数据
 			authGroup.GET("/stats/home", routes.GetHomeStats) // 首页统计数据
 			// 用户
diff --git a/backend/model/schedule.go b/backend/model/schedule.go
index ef758fb64..02f8a656b 100644
--- a/backend/model/schedule.go
+++ b/backend/model/schedule.go
@@ -21,6 +21,8 @@ type Schedule struct {
 	Cron        string        `json:"cron" bson:"cron"`
 	EntryId     cron.EntryID  `json:"entry_id" bson:"entry_id"`
 	Param       string        `json:"param" bson:"param"`
+	// 状态
+	Status string `json:"status" bson:"status"`
 
 	// 前端展示
 	SpiderName string `json:"spider_name" bson:"spider_name"`
diff --git a/backend/routes/schedule.go b/backend/routes/schedule.go
index 73b753236..1328f05ec 100644
--- a/backend/routes/schedule.go
+++ b/backend/routes/schedule.go
@@ -14,11 +14,7 @@ func GetScheduleList(c *gin.Context) {
 		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-		Data:    results,
-	})
+	HandleSuccessData(c, results)
 }
 
 func GetSchedule(c *gin.Context) {
@@ -29,11 +25,8 @@ func GetSchedule(c *gin.Context) {
 		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-		Data:    result,
-	})
+
+	HandleSuccessData(c, result)
 }
 
 func PostSchedule(c *gin.Context) {
@@ -65,10 +58,7 @@ func PostSchedule(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-	})
+	HandleSuccess(c)
 }
 
 func PutSchedule(c *gin.Context) {
@@ -98,10 +88,7 @@ func PutSchedule(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-	})
+	HandleSuccess(c)
 }
 
 func DeleteSchedule(c *gin.Context) {
@@ -119,8 +106,25 @@ func DeleteSchedule(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-	})
+	HandleSuccess(c)
+}
+
+// 停止定时任务
+func StopSchedule(c *gin.Context) {
+	id := c.Param("id")
+	if err := services.Sched.Stop(bson.ObjectIdHex(id)); err != nil {
+		HandleError(http.StatusOK, c, err)
+		return
+	}
+	HandleSuccess(c)
+}
+
+// 运行定时任务
+func RunSchedule(c *gin.Context) {
+	id := c.Param("id")
+	if err := services.Sched.Run(bson.ObjectIdHex(id)); err != nil {
+		HandleError(http.StatusOK, c, err)
+		return
+	}
+	HandleSuccess(c)
 }
diff --git a/backend/routes/utils.go b/backend/routes/utils.go
index 38ca35bb1..dfa5420eb 100644
--- a/backend/routes/utils.go
+++ b/backend/routes/utils.go
@@ -1,17 +1,15 @@
 package routes
 
 import (
-	"github.com/apex/log"
 	"github.com/gin-gonic/gin"
+	"net/http"
 	"runtime/debug"
 )
 
 func HandleError(statusCode int, c *gin.Context, err error) {
-	log.Errorf("handle error:" + err.Error())
-	debug.PrintStack()
 	c.AbortWithStatusJSON(statusCode, Response{
-		Status:  "ok",
-		Message: "error",
+		Status:  "error",
+		Message: "failure",
 		Error:   err.Error(),
 	})
 }
@@ -24,3 +22,18 @@ func HandleErrorF(statusCode int, c *gin.Context, err string) {
 		Error:   err,
 	})
 }
+
+func HandleSuccess(c *gin.Context) {
+	c.AbortWithStatusJSON(http.StatusOK, Response{
+		Status:  "ok",
+		Message: "success",
+	})
+}
+
+func HandleSuccessData(c *gin.Context, data interface{}) {
+	c.AbortWithStatusJSON(http.StatusOK, Response{
+		Status:  "ok",
+		Message: "success",
+		Data:    data,
+	})
+}
diff --git a/backend/services/schedule.go b/backend/services/schedule.go
index 52a6492e8..7a8defde6 100644
--- a/backend/services/schedule.go
+++ b/backend/services/schedule.go
@@ -4,7 +4,9 @@ import (
 	"crawlab/constants"
 	"crawlab/lib/cron"
 	"crawlab/model"
+	"errors"
 	"github.com/apex/log"
+	"github.com/globalsign/mgo/bson"
 	"github.com/satori/go.uuid"
 	"runtime/debug"
 )
@@ -106,6 +108,7 @@ func (s *Scheduler) AddJob(job model.Schedule) error {
 
 	// 更新EntryID
 	job.EntryId = eid
+	job.Status = constants.ScheduleStatusRunning
 	if err := job.Save(); err != nil {
 		log.Errorf("job save error: %s", err.Error())
 		debug.PrintStack()
@@ -134,6 +137,36 @@ func ParserCron(spec string) error {
 	return nil
 }
 
+// 停止定时任务
+func (s *Scheduler) Stop(id bson.ObjectId) error {
+	schedule, err := model.GetSchedule(id)
+	if err != nil {
+		return err
+	}
+	if schedule.EntryId == 0 {
+		return errors.New("entry id not found")
+	}
+	s.cron.Remove(schedule.EntryId)
+	// 更新状态
+	schedule.Status = constants.ScheduleStatusStop
+	if err = schedule.Save(); err != nil {
+		return err
+	}
+	return nil
+}
+
+// 运行任务
+func (s *Scheduler) Run(id bson.ObjectId) error {
+	schedule, err := model.GetSchedule(id)
+	if err != nil {
+		return err
+	}
+	if err := s.AddJob(schedule); err != nil {
+		return err
+	}
+	return nil
+}
+
 func (s *Scheduler) Update() error {
 	// 删除所有定时任务
 	s.RemoveAll()
@@ -151,6 +184,10 @@ func (s *Scheduler) Update() error {
 		// 单个任务
 		job := sList[i]
 
+		if job.Status == constants.ScheduleStatusStop {
+			continue
+		}
+
 		// 添加到定时任务
 		if err := s.AddJob(job); err != nil {
 			log.Errorf("add job error: %s, job: %s, cron: %s", err.Error(), job.Name, job.Cron)

From 18f34f1703ff76ee2752544c1532749911cdddf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Sat, 7 Dec 2019 14:03:23 +0800
Subject: [PATCH 04/21] =?UTF-8?q?Feature=20=E6=96=B0=E5=A2=9E=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8F=AF=E6=9A=82=E5=81=9C/?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                      |  2 +
 frontend/src/store/modules/schedule.js       | 14 ++++++
 frontend/src/views/schedule/ScheduleList.vue | 49 +++++++++++++++++---
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 651701173..c9e248069 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -212,6 +212,8 @@ export default {
   'Schedule Description': '定时任务描述',
   'Parameters': '参数',
   'Add Schedule': '添加定时任务',
+  'stop': '暂停',
+  'running': '运行',
 
   // 网站
   'Site': '网站',
diff --git a/frontend/src/store/modules/schedule.js b/frontend/src/store/modules/schedule.js
index 44ab7218f..caa1857dd 100644
--- a/frontend/src/store/modules/schedule.js
+++ b/frontend/src/store/modules/schedule.js
@@ -31,6 +31,20 @@ const actions = {
   },
   removeSchedule ({ state }, id) {
     request.delete(`/schedules/${id}`)
+  },
+  stopSchedule ({ state, dispatch }, id) {
+    request.post(`/schedules/${id}/stop`).then((resp) => {
+      if (resp.data.status === 'ok') {
+        dispatch(`getScheduleList`)
+      }
+    })
+  },
+  runSchedule ({ state, dispatch }, id) {
+    return request.post(`/schedules/${id}/run`).then((resp) => {
+      if (resp.data.status === 'ok') {
+        dispatch(`getScheduleList`)
+      }
+    })
   }
 }
 
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 44a525173..e8ed5cd54 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -102,18 +102,29 @@
                 :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
                 border>
         <template v-for="col in columns">
-          <el-table-column :key="col.name"
+          <el-table-column v-if="col.name === 'status'"
+                           :key="col.name"
                            :property="col.name"
                            :label="$t(col.label)"
                            :sortable="col.sortable"
                            :align="col.align"
                            :width="col.width">
             <template slot-scope="scope">
-              {{$t(scope.row[col.name])}}
+              {{ scope.row[col.name] ? $t(scope.row[col.name]) : $t('NA') }}
+            </template>
+          </el-table-column>
+          <el-table-column v-else :key="col.name"
+                           :property="col.name"
+                           :label="$t(col.label)"
+                           :sortable="col.sortable"
+                           :align="col.align"
+                           :width="col.width">
+            <template slot-scope="scope">
+              {{scope.row[col.name]}}
             </template>
           </el-table-column>
         </template>
-        <el-table-column :label="$t('Action')" align="left" width="150px" fixed="right">
+        <el-table-column :label="$t('Action')" align="left" width="180px" fixed="right">
           <template slot-scope="scope">
             <!-- 编辑 -->
             <el-tooltip :content="$t('Edit')" placement="top">
@@ -123,7 +134,7 @@
             <el-tooltip :content="$t('Remove')" placement="top">
               <el-button type="danger" icon="el-icon-delete" size="mini" @click="onRemove(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip v-if="isShowRun(scope.row)" :content="$t('Run')" placement="top">
+            <el-tooltip content="暂停/运行" placement="top">
               <el-button type="success" icon="fa fa-bug" size="mini" @click="onCrawl(scope.row)"></el-button>
             </el-tooltip>
           </template>
@@ -151,7 +162,8 @@ export default {
         { name: 'node_name', label: 'Node', width: '150' },
         { name: 'spider_name', label: 'Spider', width: '150' },
         { name: 'param', label: 'Parameters', width: '150' },
-        { name: 'description', label: 'Description', width: 'auto' }
+        { name: 'description', label: 'Description', width: 'auto' },
+        { name: 'status', label: 'Status', width: 'auto' }
       ],
       isEdit: false,
       dialogTitle: '',
@@ -236,7 +248,32 @@ export default {
         })
       this.$st.sendEv('定时任务', '删除', 'id', row._id)
     },
-    onCrawl () {
+    onCrawl (row) {
+      if (!row.status || row.status === 'running') {
+        this.$confirm('确定停止定时任务?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 停止定时任务
+          this.$store.dispatch('schedule/stopSchedule', row._id)
+            .then((resp) => {
+              this.$store.dispatch('schedule/getScheduleList')
+            })
+        }).catch(() => {})
+      }
+      if (row.status === 'stop') {
+        this.$confirm('确定运行定时任务?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$store.dispatch('schedule/runSchedule', row._id)
+            .then((resp) => {
+              this.$store.dispatch('schedule/getScheduleList')
+            })
+        }).catch(() => {})
+      }
     },
     onCrontabFill (value) {
       value = value.replace(/[?]/g, '*')

From f9f04093d91130d90276df324090724560876ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Sun, 8 Dec 2019 10:58:02 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4Task=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/main.go                              |   1 +
 backend/model/node.go                        |   2 +-
 backend/model/task.go                        |   3 +-
 backend/routes/task.go                       | 106 +++++++++----------
 frontend/src/api/request.js                  |   2 +-
 frontend/src/store/modules/schedule.js       |  13 +--
 frontend/src/store/modules/task.js           |   5 +
 frontend/src/views/schedule/ScheduleList.vue |  21 +++-
 frontend/src/views/task/TaskList.vue         |  84 ++++++++-------
 9 files changed, 124 insertions(+), 113 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index 07adcb4e8..0d7b7cc1c 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -154,6 +154,7 @@ func main() {
 			authGroup.GET("/tasks/:id", routes.GetTask)                                 // 任务详情
 			authGroup.PUT("/tasks", routes.PutTask)                                     // 派发任务
 			authGroup.DELETE("/tasks/:id", routes.DeleteTask)                           // 删除任务
+			authGroup.DELETE("/tasks_multiple", routes.DeleteMultipleTask)              // 删除多个任务
 			authGroup.DELETE("/tasks_by_status", routes.DeleteTaskByStatus)             //删除指定状态的任务
 			authGroup.POST("/tasks/:id/cancel", routes.CancelTask)                      // 取消任务
 			authGroup.GET("/tasks/:id/log", routes.GetTaskLog)                          // 任务日志
diff --git a/backend/model/node.go b/backend/model/node.go
index 1c63fc3e9..a24b36e33 100644
--- a/backend/model/node.go
+++ b/backend/model/node.go
@@ -169,7 +169,7 @@ func GetNode(id bson.ObjectId) (Node, error) {
 	defer s.Close()
 
 	if err := c.FindId(id).One(&node); err != nil {
-		log.Errorf(err.Error())
+		log.Errorf("get node error: %s, id: %s", err.Error(), id.Hex())
 		debug.PrintStack()
 		return node, err
 	}
diff --git a/backend/model/task.go b/backend/model/task.go
index 856e85894..299661edc 100644
--- a/backend/model/task.go
+++ b/backend/model/task.go
@@ -153,14 +153,13 @@ func GetTask(id string) (Task, error) {
 
 	var task Task
 	if err := c.FindId(id).One(&task); err != nil {
+		log.Infof("get task error: %s, id: %s", err.Error(), id)
 		debug.PrintStack()
 		return task, err
 	}
 	return task, nil
 }
 
-
-
 func AddTask(item Task) error {
 	s, c := database.GetCol("tasks")
 	defer s.Close()
diff --git a/backend/routes/task.go b/backend/routes/task.go
index 3d6edece1..c8703ed45 100644
--- a/backend/routes/task.go
+++ b/backend/routes/task.go
@@ -29,7 +29,7 @@ func GetTaskList(c *gin.Context) {
 	// 绑定数据
 	data := TaskListRequestData{}
 	if err := c.ShouldBindQuery(&data); err != nil {
-		HandleError(http.StatusBadRequest, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 	if data.PageNum == 0 {
@@ -55,14 +55,14 @@ func GetTaskList(c *gin.Context) {
 	// 获取任务列表
 	tasks, err := model.GetTaskList(query, (data.PageNum-1)*data.PageSize, data.PageSize, "-create_ts")
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
 	// 获取总任务数
 	total, err := model.GetTaskListTotal(query)
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
@@ -79,14 +79,10 @@ func GetTask(c *gin.Context) {
 
 	result, err := model.GetTask(id)
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-		Data:    result,
-	})
+	HandleSuccessData(c, result)
 }
 
 func PutTask(c *gin.Context) {
@@ -100,7 +96,7 @@ func PutTask(c *gin.Context) {
 	// 绑定数据
 	var reqBody TaskRequestBody
 	if err := c.ShouldBindJSON(&reqBody); err != nil {
-		HandleError(http.StatusBadRequest, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
@@ -108,7 +104,7 @@ func PutTask(c *gin.Context) {
 		// 所有节点
 		nodes, err := model.GetNodeList(nil)
 		if err != nil {
-			HandleError(http.StatusInternalServerError, c, err)
+			HandleError(http.StatusOK, c, err)
 			return
 		}
 		for _, node := range nodes {
@@ -119,7 +115,7 @@ func PutTask(c *gin.Context) {
 			}
 
 			if err := services.AddTask(t); err != nil {
-				HandleError(http.StatusInternalServerError, c, err)
+				HandleError(http.StatusOK, c, err)
 				return
 			}
 		}
@@ -131,7 +127,7 @@ func PutTask(c *gin.Context) {
 			Param:    reqBody.Param,
 		}
 		if err := services.AddTask(t); err != nil {
-			HandleError(http.StatusInternalServerError, c, err)
+			HandleError(http.StatusOK, c, err)
 			return
 		}
 
@@ -145,20 +141,16 @@ func PutTask(c *gin.Context) {
 			}
 
 			if err := services.AddTask(t); err != nil {
-				HandleError(http.StatusInternalServerError, c, err)
+				HandleError(http.StatusOK, c, err)
 				return
 			}
 		}
 
 	} else {
-		HandleErrorF(http.StatusBadRequest, c, "invalid run_type")
+		HandleErrorF(http.StatusOK, c, "invalid run_type")
 		return
 	}
-
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-	})
+	HandleSuccess(c)
 }
 
 func DeleteTaskByStatus(c *gin.Context) {
@@ -166,57 +158,65 @@ func DeleteTaskByStatus(c *gin.Context) {
 
 	//删除相应的日志文件
 	if err := services.RemoveLogByTaskStatus(status); err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
 	//删除该状态下的task
 	if err := model.RemoveTaskByStatus(status); err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-	})
+	HandleSuccess(c)
 }
 
+// 删除多个任务
+func DeleteMultipleTask(c *gin.Context) {
+	ids := make(map[string][]string)
+	if err := c.ShouldBindJSON(&ids); err != nil {
+		HandleError(http.StatusOK, c, err)
+		return
+	}
+	list := ids["ids"]
+	for _, id := range list {
+		if err := services.RemoveLogByTaskId(id); err != nil {
+			HandleError(http.StatusOK, c, err)
+			return
+		}
+		if err := model.RemoveTask(id); err != nil {
+			HandleError(http.StatusOK, c, err)
+			return
+		}
+	}
+	HandleSuccess(c)
+}
+
+// 删除单个任务
 func DeleteTask(c *gin.Context) {
 	id := c.Param("id")
 
 	// 删除日志文件
 	if err := services.RemoveLogByTaskId(id); err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
-
 	// 删除task
 	if err := model.RemoveTask(id); err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
-
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-	})
+	HandleSuccess(c)
 }
 
 func GetTaskLog(c *gin.Context) {
 	id := c.Param("id")
-
 	logStr, err := services.GetTaskLog(id)
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
-
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-		Data:    logStr,
-	})
+	HandleSuccessData(c, logStr)
 }
 
 func GetTaskResults(c *gin.Context) {
@@ -225,21 +225,21 @@ func GetTaskResults(c *gin.Context) {
 	// 绑定数据
 	data := TaskResultsRequestData{}
 	if err := c.ShouldBindQuery(&data); err != nil {
-		HandleError(http.StatusBadRequest, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
 	// 获取任务
 	task, err := model.GetTask(id)
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
 	// 获取结果
 	results, total, err := task.GetResults(data.PageNum, data.PageSize)
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
@@ -257,14 +257,14 @@ func DownloadTaskResultsCsv(c *gin.Context) {
 	// 获取任务
 	task, err := model.GetTask(id)
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
 	// 获取结果
 	results, _, err := task.GetResults(1, constants.Infinite)
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
@@ -289,7 +289,7 @@ func DownloadTaskResultsCsv(c *gin.Context) {
 
 	// 写入表头
 	if err := writer.Write(columns); err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
@@ -305,7 +305,7 @@ func DownloadTaskResultsCsv(c *gin.Context) {
 
 		// 写入数据
 		if err := writer.Write(values); err != nil {
-			HandleError(http.StatusInternalServerError, c, err)
+			HandleError(http.StatusOK, c, err)
 			return
 		}
 	}
@@ -324,12 +324,8 @@ func CancelTask(c *gin.Context) {
 	id := c.Param("id")
 
 	if err := services.CancelTask(id); err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
-
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-	})
+	HandleSuccess(c)
 }
diff --git a/frontend/src/api/request.js b/frontend/src/api/request.js
index 22707159c..9c5943f53 100644
--- a/frontend/src/api/request.js
+++ b/frontend/src/api/request.js
@@ -63,7 +63,7 @@ const put = (path, data) => {
 }
 
 const del = (path, data) => {
-  return request('DELETE', path)
+  return request('DELETE', path, {}, data)
 }
 
 export default {
diff --git a/frontend/src/store/modules/schedule.js b/frontend/src/store/modules/schedule.js
index caa1857dd..7c705ac3e 100644
--- a/frontend/src/store/modules/schedule.js
+++ b/frontend/src/store/modules/schedule.js
@@ -1,5 +1,4 @@
 import request from '../../api/request'
-
 const state = {
   scheduleList: [],
   scheduleForm: {}
@@ -33,18 +32,10 @@ const actions = {
     request.delete(`/schedules/${id}`)
   },
   stopSchedule ({ state, dispatch }, id) {
-    request.post(`/schedules/${id}/stop`).then((resp) => {
-      if (resp.data.status === 'ok') {
-        dispatch(`getScheduleList`)
-      }
-    })
+    return request.post(`/schedules/${id}/stop`)
   },
   runSchedule ({ state, dispatch }, id) {
-    return request.post(`/schedules/${id}/run`).then((resp) => {
-      if (resp.data.status === 'ok') {
-        dispatch(`getScheduleList`)
-      }
-    })
+    return request.post(`/schedules/${id}/run`)
   }
 }
 
diff --git a/frontend/src/store/modules/task.js b/frontend/src/store/modules/task.js
index bb182706f..9de290006 100644
--- a/frontend/src/store/modules/task.js
+++ b/frontend/src/store/modules/task.js
@@ -102,6 +102,11 @@ const actions = {
         dispatch('getTaskList')
       })
   },
+  deleteTaskMultiple ({ state }, ids) {
+    return request.delete(`/tasks_multiple`, {
+      ids: ids
+    })
+  },
   getTaskLog ({ state, commit }, id) {
     commit('SET_TASK_LOG', '')
     return request.get(`/tasks/${id}/log`)
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index e8ed5cd54..f07de8f9e 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -249,19 +249,27 @@ export default {
       this.$st.sendEv('定时任务', '删除', 'id', row._id)
     },
     onCrawl (row) {
+      // 停止定时任务
       if (!row.status || row.status === 'running') {
         this.$confirm('确定停止定时任务?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          // 停止定时任务
           this.$store.dispatch('schedule/stopSchedule', row._id)
             .then((resp) => {
-              this.$store.dispatch('schedule/getScheduleList')
+              if (resp.data.status === 'ok') {
+                this.$store.dispatch('schedule/getScheduleList')
+                return
+              }
+              this.$message({
+                type: 'error',
+                message: resp.data.error
+              })
             })
         }).catch(() => {})
       }
+      // 运行定时任务
       if (row.status === 'stop') {
         this.$confirm('确定运行定时任务?', '提示', {
           confirmButtonText: '确定',
@@ -270,7 +278,14 @@ export default {
         }).then(() => {
           this.$store.dispatch('schedule/runSchedule', row._id)
             .then((resp) => {
-              this.$store.dispatch('schedule/getScheduleList')
+              if (resp.data.status === 'ok') {
+                this.$store.dispatch('schedule/getScheduleList')
+                return
+              }
+              this.$message({
+                type: 'error',
+                message: resp.data.error
+              })
             })
         }).catch(() => {})
       }
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index 3ab19fee8..2c8b73bc1 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -4,31 +4,12 @@
       <!--filter-->
       <div class="filter">
         <div class="left">
-          <!--<el-select size="small" class="filter-select"-->
-                     <!--v-model="filter.node_id"-->
-                     <!--:placeholder="$t('Node')"-->
-                     <!--filterable-->
-                     <!--clearable-->
-                     <!--@change="onSelectNode">-->
-            <!--<el-option v-for="op in nodeList" :key="op._id" :value="op._id" :label="op.name"></el-option>-->
-          <!--</el-select>-->
-          <!--<el-select size="small" class="filter-select"-->
-                     <!--v-model="filter.spider_id"-->
-                     <!--:placeholder="$t('Spider')"-->
-                     <!--filterable-->
-                     <!--clearable-->
-                     <!--@change="onSelectSpider">-->
-            <!--<el-option v-for="op in spiderList" :key="op._id" :value="op._id" :label="op.name"></el-option>-->
-          <!--</el-select>-->
-          <!--<el-button size="small" type="success"-->
-                     <!--icon="el-icon-search"-->
-                     <!--class="refresh"-->
-                     <!--@click="onRefresh">-->
-            <!--{{$t('Search')}}-->
-          <!--</el-button>-->
         </div>
-        <!--<div class="right">-->
-        <!--</div>-->
+        <div class="right">
+          <el-button @click="onRemoveMultipleTask" size="small" type="danger">
+            删除任务
+          </el-button>
+        </div>
       </div>
       <!--./filter-->
 
@@ -38,7 +19,9 @@
                 :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
                 border
                 @row-click="onRowClick"
+                @selection-change="onSelectionChange">
       >
+        <el-table-column type="selection" width="55"/>
         <template v-for="col in columns">
           <el-table-column v-if="col.name === 'spider_name'"
                            :key="col.name"
@@ -181,7 +164,9 @@ export default {
         { name: 'total_duration', label: 'Total Duration (sec)', width: '80', align: 'right' },
         { name: 'result_count', label: 'Results Count', width: '80' }
         // { name: 'avg_num_results', label: 'Average Results Count per Second', width: '80' }
-      ]
+      ],
+
+      multipleSelection: []
     }
   },
   computed: {
@@ -228,12 +213,6 @@ export default {
           }
           return false
         })
-      // .filter((d, index) => {
-      //   // pagination
-      //   const pageNum = this.pageNum
-      //   const pageSize = this.pageSize
-      //   return (pageSize * (pageNum - 1) <= index) && (index < pageSize * pageNum)
-      // })
     }
   },
   methods: {
@@ -244,11 +223,34 @@ export default {
       this.$store.dispatch('task/getTaskList')
       this.$st.sendEv('任务', '搜索')
     },
-    onSelectNode () {
-      this.$st.sendEv('任务', '选择节点')
-    },
-    onSelectSpider () {
-      this.$st.sendEv('任务', '选择爬虫')
+    onRemoveMultipleTask () {
+      if (this.multipleSelection.length === 0) {
+        this.$message({
+          type: 'error',
+          message: '请选择要删除的任务'
+        })
+      }
+      this.$confirm('确定删除任务', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let ids = this.multipleSelection.map(item => item._id)
+        this.$store.dispatch('task/deleteTaskMultiple', ids).then((resp) => {
+          if (resp.data.status === 'ok') {
+            this.$message({
+              type: 'success',
+              message: '删除任务成功'
+            })
+            this.$store.dispatch('task/getTaskList')
+            return
+          }
+          this.$message({
+            type: 'error',
+            message: resp.data.error
+          })
+        })
+      }).catch(() => {})
     },
     onRemove (row, ev) {
       ev.stopPropagation()
@@ -304,6 +306,9 @@ export default {
       if (column.label !== this.$t('Action')) {
         this.onView(row)
       }
+    },
+    onSelectionChange (val) {
+      this.multipleSelection = val
     }
   },
   created () {
@@ -312,10 +317,9 @@ export default {
     this.$store.dispatch('node/getNodeList')
   },
   mounted () {
-    // request task list every 5 seconds
-    this.handle = setInterval(() => {
-      this.$store.dispatch('task/getTaskList')
-    }, 5000)
+    // this.handle = setInterval(() => {
+    //   this.$store.dispatch('task/getTaskList')
+    // }, 5000)
   },
   destroyed () {
     clearInterval(this.handle)

From 280877a0ae8047e14afd06325b35c5730b9bec88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Mon, 9 Dec 2019 10:28:48 +0800
Subject: [PATCH 06/21] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=B3=A8=E5=86=8C=E8=8A=82=E7=82=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/constants/schedule.go |  4 +++
 backend/database/redis.go     | 52 +++++++++++++++++++++++++++++++++++
 backend/model/schedule.go     | 17 +++++++-----
 backend/routes/schedule.go    |  4 +--
 backend/services/node.go      | 15 ++++------
 5 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/backend/constants/schedule.go b/backend/constants/schedule.go
index 3f0afc7e1..c31046011 100644
--- a/backend/constants/schedule.go
+++ b/backend/constants/schedule.go
@@ -3,4 +3,8 @@ package constants
 const (
 	ScheduleStatusStop    = "stop"
 	ScheduleStatusRunning = "running"
+	ScheduleStatusError   = "error"
+
+	ScheduleStatusErrorNotFoundNode   = "Not Found Node"
+	ScheduleStatusErrorNotFoundSpider = "Not Found Spider"
 )
diff --git a/backend/database/redis.go b/backend/database/redis.go
index bffc40be0..54f716d0c 100644
--- a/backend/database/redis.go
+++ b/backend/database/redis.go
@@ -4,10 +4,12 @@ import (
 	"context"
 	"crawlab/entity"
 	"crawlab/utils"
+	"errors"
 	"github.com/apex/log"
 	"github.com/gomodule/redigo/redis"
 	"github.com/spf13/viper"
 	"runtime/debug"
+	"strings"
 	"time"
 )
 
@@ -17,9 +19,18 @@ type Redis struct {
 	pool *redis.Pool
 }
 
+type Mutex struct {
+	Name   string
+	expiry time.Duration
+	tries  int
+	delay  time.Duration
+	value  string
+}
+
 func NewRedisClient() *Redis {
 	return &Redis{pool: NewRedisPool()}
 }
+
 func (r *Redis) RPush(collection string, value interface{}) error {
 	c := r.pool.Get()
 	defer utils.Close(c)
@@ -143,3 +154,44 @@ func Sub(channel string, consume ConsumeFunc) error {
 	}
 	return nil
 }
+
+func (r *Redis) getLockKey(lockKey string) string {
+	lockKey = strings.ReplaceAll(lockKey, ":", "-")
+	return "nodes:lock:" + lockKey
+}
+
+func (r *Redis) Lock(lockKey string) error {
+	c := r.pool.Get()
+	defer utils.Close(c)
+	lockKey = r.getLockKey(lockKey)
+
+	ts := time.Now()
+	v, err := c.Do("SET", lockKey, ts, "NX", "PX", 30000)
+	if err != nil {
+		log.Errorf("get lock fail with error: %s", err.Error())
+		debug.PrintStack()
+		return err
+	}
+	if err == nil && v == nil {
+		log.Errorf("the lockKey is locked: key=%s", lockKey)
+		return errors.New("the lockKey is locked")
+	}
+	return nil
+}
+
+func (r *Redis) UnLock(lockKey string) {
+	c := r.pool.Get()
+	defer utils.Close(c)
+	lockKey = r.getLockKey(lockKey)
+
+	v, err := c.Do("DEL", lockKey)
+	if err != nil {
+		log.Errorf("unlock failed, error: %s", err.Error())
+		debug.PrintStack()
+		return
+	}
+	if v.(int64) == 0 {
+		log.Errorf("unlock failed: key=%s", lockKey)
+		return
+	}
+}
diff --git a/backend/model/schedule.go b/backend/model/schedule.go
index 02f8a656b..39e1244fe 100644
--- a/backend/model/schedule.go
+++ b/backend/model/schedule.go
@@ -27,6 +27,7 @@ type Schedule struct {
 	// 前端展示
 	SpiderName string `json:"spider_name" bson:"spider_name"`
 	NodeName   string `json:"node_name" bson:"node_name"`
+	Message    string `json:"message" bson:"message"`
 
 	CreateTs time.Time `json:"create_ts" bson:"create_ts"`
 	UpdateTs time.Time `json:"update_ts" bson:"update_ts"`
@@ -88,21 +89,23 @@ func GetScheduleList(filter interface{}) ([]Schedule, error) {
 			// 选择单一节点
 			node, err := GetNode(schedule.NodeId)
 			if err != nil {
-				log.Errorf(err.Error())
-				continue
+				schedule.Status = constants.ScheduleStatusError
+				schedule.Message = constants.ScheduleStatusErrorNotFoundNode
+			} else {
+				schedule.NodeName = node.Name
 			}
-			schedule.NodeName = node.Name
 		}
 
 		// 获取爬虫名称
 		spider, err := GetSpider(schedule.SpiderId)
 		if err != nil && err == mgo.ErrNotFound {
 			log.Errorf("get spider by id: %s, error: %s", schedule.SpiderId.Hex(), err.Error())
-			debug.PrintStack()
-			_ = schedule.Delete()
-			continue
+			schedule.Status = constants.ScheduleStatusError
+			schedule.Message = constants.ScheduleStatusErrorNotFoundSpider
+		} else {
+			schedule.SpiderName = spider.Name
 		}
-		schedule.SpiderName = spider.Name
+
 		schs = append(schs, schedule)
 	}
 	return schs, nil
diff --git a/backend/routes/schedule.go b/backend/routes/schedule.go
index 1328f05ec..d1c3affa3 100644
--- a/backend/routes/schedule.go
+++ b/backend/routes/schedule.go
@@ -11,7 +11,7 @@ import (
 func GetScheduleList(c *gin.Context) {
 	results, err := model.GetScheduleList(nil)
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 	HandleSuccessData(c, results)
@@ -22,7 +22,7 @@ func GetSchedule(c *gin.Context) {
 
 	result, err := model.GetSchedule(bson.ObjectIdHex(id))
 	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
+		HandleError(http.StatusOK, c, err)
 		return
 	}
 
diff --git a/backend/services/node.go b/backend/services/node.go
index be916f104..26cd3b89c 100644
--- a/backend/services/node.go
+++ b/backend/services/node.go
@@ -95,19 +95,16 @@ func UpdateNodeStatus() {
 }
 
 func handleNodeInfo(key string, data Data) {
+	// 添加同步锁
+	if err := database.RedisClient.Lock(key); err != nil {
+		return
+	}
+	defer database.RedisClient.UnLock(key)
+
 	// 更新节点信息到数据库
 	s, c := database.GetCol("nodes")
 	defer s.Close()
 
-	// 同个key可能因为并发，被注册多次
-	var nodes []model.Node
-	_ = c.Find(bson.M{"key": key}).All(&nodes)
-	if len(nodes) > 1 {
-		for _, node := range nodes {
-			_ = c.RemoveId(node.Id)
-		}
-	}
-
 	var node model.Node
 	if err := c.Find(bson.M{"key": key}).One(&node); err != nil {
 		// 数据库不存在该节点

From dccc90e45125ad6e796d266cf6384abe355d71ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Mon, 9 Dec 2019 10:54:55 +0800
Subject: [PATCH 07/21] =?UTF-8?q?feature=20=E8=B0=83=E5=BA=A6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=AF=E4=BB=A5=E6=9A=82=E5=81=9C/=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=20feature=20=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                      |  3 ++
 frontend/src/views/schedule/ScheduleList.vue | 30 +++++++-------------
 frontend/src/views/task/TaskList.vue         |  1 +
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index c9e248069..d8f1dbe27 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -214,6 +214,9 @@ export default {
   'Add Schedule': '添加定时任务',
   'stop': '暂停',
   'running': '运行',
+  'error': '错误',
+  'Not Found Node': '节点配置错误',
+  'Not Found Spider': '爬虫配置错误',
 
   // 网站
   'Site': '网站',
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index f07de8f9e..c7d5a4ada 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -110,7 +110,14 @@
                            :align="col.align"
                            :width="col.width">
             <template slot-scope="scope">
-              {{ scope.row[col.name] ? $t(scope.row[col.name]) : $t('NA') }}
+              <el-tooltip v-if="scope.row[col.name] === 'error'" :content="$t(scope.row['message'])" placement="top">
+                <el-tag class="status-tag" type="danger">
+                  {{scope.row[col.name] ? $t(scope.row[col.name]) : $t('NA')}}
+                </el-tag>
+              </el-tooltip>
+              <el-tag class="status-tag" v-else>
+                {{scope.row[col.name] ? $t(scope.row[col.name]) : $t('NA')}}
+              </el-tag>
             </template>
           </el-table-column>
           <el-table-column v-else :key="col.name"
@@ -289,24 +296,6 @@ export default {
             })
         }).catch(() => {})
       }
-    },
-    onCrontabFill (value) {
-      value = value.replace(/[?]/g, '*')
-      this.$set(this.scheduleForm, 'cron', value)
-
-      this.$st.sendEv('定时任务', '提交生成Cron', 'cron', this.scheduleForm.cron)
-    },
-    onShowCronDialog () {
-      this.showCron = true
-      if (this.expression.split(' ').length < 7) {
-        // this.expression = (this.scheduleForm.cron + ' ').replace(/[?]/g, '*')
-        this.expression = this.scheduleForm.cron + ' '
-      } else {
-        // this.expression = this.scheduleForm.cron.replace(/[?]/g, '*')
-        this.expression = this.scheduleForm.cron
-      }
-
-      this.$st.sendEv('定时任务', '点击生成Cron', 'cron', this.scheduleForm.cron)
     }
   },
   created () {
@@ -343,4 +332,7 @@ export default {
     min-height: 360px;
     margin-top: 10px;
   }
+  .status-tag {
+    cursor: pointer;
+  }
 </style>
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index 2c8b73bc1..8013c0806 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -229,6 +229,7 @@ export default {
           type: 'error',
           message: '请选择要删除的任务'
         })
+        return
       }
       this.$confirm('确定删除任务', '提示', {
         confirmButtonText: '确定',

From fdea446a293abf5edad0a07d61466f616221ef25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Mon, 9 Dec 2019 11:06:38 +0800
Subject: [PATCH 08/21] =?UTF-8?q?fix=20=E5=88=A0=E9=99=A4=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B2=A1=E6=9C=89=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/schedule/ScheduleList.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index c7d5a4ada..0259247e9 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -246,13 +246,19 @@ export default {
       this.$st.sendEv('定时任务', '修改', 'id', row._id)
     },
     onRemove (row) {
-      this.$store.dispatch('schedule/removeSchedule', row._id)
-        .then(() => {
-          setTimeout(() => {
-            this.$store.dispatch('schedule/getScheduleList')
-            this.$message.success(`Schedule "${row.name}" has been removed`)
-          }, 100)
-        })
+      this.$confirm('确定删除定时任务?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('schedule/removeSchedule', row._id)
+          .then(() => {
+            setTimeout(() => {
+              this.$store.dispatch('schedule/getScheduleList')
+              this.$message.success(`Schedule "${row.name}" has been removed`)
+            }, 100)
+          })
+      }).catch(() => {})
       this.$st.sendEv('定时任务', '删除', 'id', row._id)
     },
     onCrawl (row) {

From 069d861be92c546ee053d2364ce7448dc6bc780d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Mon, 9 Dec 2019 11:23:30 +0800
Subject: [PATCH 09/21] =?UTF-8?q?fix=20=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/routes/schedule.go | 12 ++++-----
 backend/routes/task.go     | 52 +++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/backend/routes/schedule.go b/backend/routes/schedule.go
index d1c3affa3..e54c49a3c 100644
--- a/backend/routes/schedule.go
+++ b/backend/routes/schedule.go
@@ -11,7 +11,7 @@ import (
 func GetScheduleList(c *gin.Context) {
 	results, err := model.GetScheduleList(nil)
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	HandleSuccessData(c, results)
@@ -22,7 +22,7 @@ func GetSchedule(c *gin.Context) {
 
 	result, err := model.GetSchedule(bson.ObjectIdHex(id))
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -41,7 +41,7 @@ func PostSchedule(c *gin.Context) {
 
 	// 验证cron表达式
 	if err := services.ParserCron(newItem.Cron); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -72,7 +72,7 @@ func PutSchedule(c *gin.Context) {
 
 	// 验证cron表达式
 	if err := services.ParserCron(item.Cron); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -113,7 +113,7 @@ func DeleteSchedule(c *gin.Context) {
 func StopSchedule(c *gin.Context) {
 	id := c.Param("id")
 	if err := services.Sched.Stop(bson.ObjectIdHex(id)); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	HandleSuccess(c)
@@ -123,7 +123,7 @@ func StopSchedule(c *gin.Context) {
 func RunSchedule(c *gin.Context) {
 	id := c.Param("id")
 	if err := services.Sched.Run(bson.ObjectIdHex(id)); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	HandleSuccess(c)
diff --git a/backend/routes/task.go b/backend/routes/task.go
index c8703ed45..6b91ed66d 100644
--- a/backend/routes/task.go
+++ b/backend/routes/task.go
@@ -29,7 +29,7 @@ func GetTaskList(c *gin.Context) {
 	// 绑定数据
 	data := TaskListRequestData{}
 	if err := c.ShouldBindQuery(&data); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	if data.PageNum == 0 {
@@ -55,14 +55,14 @@ func GetTaskList(c *gin.Context) {
 	// 获取任务列表
 	tasks, err := model.GetTaskList(query, (data.PageNum-1)*data.PageSize, data.PageSize, "-create_ts")
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
 	// 获取总任务数
 	total, err := model.GetTaskListTotal(query)
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -79,7 +79,7 @@ func GetTask(c *gin.Context) {
 
 	result, err := model.GetTask(id)
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	HandleSuccessData(c, result)
@@ -96,7 +96,7 @@ func PutTask(c *gin.Context) {
 	// 绑定数据
 	var reqBody TaskRequestBody
 	if err := c.ShouldBindJSON(&reqBody); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -104,7 +104,7 @@ func PutTask(c *gin.Context) {
 		// 所有节点
 		nodes, err := model.GetNodeList(nil)
 		if err != nil {
-			HandleError(http.StatusOK, c, err)
+			HandleError(http.StatusInternalServerError, c, err)
 			return
 		}
 		for _, node := range nodes {
@@ -115,7 +115,7 @@ func PutTask(c *gin.Context) {
 			}
 
 			if err := services.AddTask(t); err != nil {
-				HandleError(http.StatusOK, c, err)
+				HandleError(http.StatusInternalServerError, c, err)
 				return
 			}
 		}
@@ -127,7 +127,7 @@ func PutTask(c *gin.Context) {
 			Param:    reqBody.Param,
 		}
 		if err := services.AddTask(t); err != nil {
-			HandleError(http.StatusOK, c, err)
+			HandleError(http.StatusInternalServerError, c, err)
 			return
 		}
 
@@ -141,13 +141,13 @@ func PutTask(c *gin.Context) {
 			}
 
 			if err := services.AddTask(t); err != nil {
-				HandleError(http.StatusOK, c, err)
+				HandleError(http.StatusInternalServerError, c, err)
 				return
 			}
 		}
 
 	} else {
-		HandleErrorF(http.StatusOK, c, "invalid run_type")
+		HandleErrorF(http.StatusInternalServerError, c, "invalid run_type")
 		return
 	}
 	HandleSuccess(c)
@@ -158,13 +158,13 @@ func DeleteTaskByStatus(c *gin.Context) {
 
 	//删除相应的日志文件
 	if err := services.RemoveLogByTaskStatus(status); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
 	//删除该状态下的task
 	if err := model.RemoveTaskByStatus(status); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -175,17 +175,17 @@ func DeleteTaskByStatus(c *gin.Context) {
 func DeleteMultipleTask(c *gin.Context) {
 	ids := make(map[string][]string)
 	if err := c.ShouldBindJSON(&ids); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	list := ids["ids"]
 	for _, id := range list {
 		if err := services.RemoveLogByTaskId(id); err != nil {
-			HandleError(http.StatusOK, c, err)
+			HandleError(http.StatusInternalServerError, c, err)
 			return
 		}
 		if err := model.RemoveTask(id); err != nil {
-			HandleError(http.StatusOK, c, err)
+			HandleError(http.StatusInternalServerError, c, err)
 			return
 		}
 	}
@@ -198,12 +198,12 @@ func DeleteTask(c *gin.Context) {
 
 	// 删除日志文件
 	if err := services.RemoveLogByTaskId(id); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	// 删除task
 	if err := model.RemoveTask(id); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	HandleSuccess(c)
@@ -213,7 +213,7 @@ func GetTaskLog(c *gin.Context) {
 	id := c.Param("id")
 	logStr, err := services.GetTaskLog(id)
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	HandleSuccessData(c, logStr)
@@ -225,21 +225,21 @@ func GetTaskResults(c *gin.Context) {
 	// 绑定数据
 	data := TaskResultsRequestData{}
 	if err := c.ShouldBindQuery(&data); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
 	// 获取任务
 	task, err := model.GetTask(id)
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
 	// 获取结果
 	results, total, err := task.GetResults(data.PageNum, data.PageSize)
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -257,14 +257,14 @@ func DownloadTaskResultsCsv(c *gin.Context) {
 	// 获取任务
 	task, err := model.GetTask(id)
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
 	// 获取结果
 	results, _, err := task.GetResults(1, constants.Infinite)
 	if err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -289,7 +289,7 @@ func DownloadTaskResultsCsv(c *gin.Context) {
 
 	// 写入表头
 	if err := writer.Write(columns); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 
@@ -305,7 +305,7 @@ func DownloadTaskResultsCsv(c *gin.Context) {
 
 		// 写入数据
 		if err := writer.Write(values); err != nil {
-			HandleError(http.StatusOK, c, err)
+			HandleError(http.StatusInternalServerError, c, err)
 			return
 		}
 	}
@@ -324,7 +324,7 @@ func CancelTask(c *gin.Context) {
 	id := c.Param("id")
 
 	if err := services.CancelTask(id); err != nil {
-		HandleError(http.StatusOK, c, err)
+		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
 	HandleSuccess(c)

From ef5e2108684688253c553cacd7478763ebe7d7c0 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 9 Dec 2019 15:24:16 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A0=E6=B3=95=E8=B7=91=E5=8F=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=88=AC=E8=99=AB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                      |  3 +-
 frontend/src/views/schedule/ScheduleList.vue | 63 +++++++++++---------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index d8f1dbe27..1c46b88ba 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -259,7 +259,7 @@ export default {
   'Executables': '执行文件',
 
   // 弹出框
-  Notification: '提示',
+  'Notification': '提示',
   'Are you sure to delete this node?': '你确定要删除该节点?',
   'Are you sure to run this spider?': '你确定要运行该爬虫?',
   'Node info has been saved successfully': '节点信息已成功保存',
@@ -279,6 +279,7 @@ export default {
   'Saved successfully': '成功保存',
   'Please zip your spider files from the root directory': '爬虫文件请从根目录下开始压缩。',
   'English': 'English',
+  'Are you sure to delete the schedule task?': '确定删除定时任务?',
   // 登录
   'Sign in': '登录',
   'Sign-in': '登录',
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 0259247e9..7a49f808e 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -14,9 +14,15 @@
         <el-form-item :label="$t('Schedule Name')" prop="name" required>
           <el-input v-model="scheduleForm.name" :placeholder="$t('Schedule Name')"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('Node')" prop="node_id" required>
+        <el-form-item :label="$t('Run Type')" prop="runType" required>
+          <el-select v-model="scheduleForm.runType" :placeholder="$t('Run Type')">
+            <el-option value="all-nodes" :label="$t('All Nodes')"/>
+            <el-option value="selected-nodes" :label="$t('Selected Nodes')"/>
+            <el-option value="random" :label="$t('Random')"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="scheduleForm.runType === 'selected-nodes'" :label="$t('Node')" prop="node_id" required>
           <el-select v-model="scheduleForm.node_id">
-            <!--<el-option :label="$t('All Nodes')" value="000000000000000000000000"></el-option>-->
             <el-option
               v-for="op in nodeList"
               :key="op._id"
@@ -33,22 +39,12 @@
               :key="op._id"
               :value="op._id"
               :label="op.name"
-              :disabled="!op.cmd"
+              :disabled="isDisabledSpider(op)"
             >
             </el-option>
           </el-select>
         </el-form-item>
-        <!--:rules="cronRules"-->
-        <el-form-item :label="$t('schedules.cron')" prop="cron"  required>
-          <!--<template slot="label">-->
-            <!--<el-tooltip :content="$t('schedules.cron_format')"-->
-                        <!--placement="top">-->
-              <!--<span>-->
-                <!--{{$t('schedules.cron')}}-->
-                <!--<i class="fa fa-exclamation-circle"></i>-->
-              <!--</span>-->
-            <!--</el-tooltip>-->
-          <!--</template>-->
+        <el-form-item :label="$t('Cron')" prop="cron" required>
           <el-input style="padding-right:10px"
                     v-model="scheduleForm.cron"
                     :placeholder="$t('schedules.cron')">
@@ -79,7 +75,7 @@
 
     <!--cron generation popup-->
     <!--<el-dialog title="生成 Cron" :visible.sync="showCron">-->
-      <!--<vcrontab @hide="showCron=false" @fill="onCrontabFill" :expression="expression"></vcrontab>-->
+    <!--<vcrontab @hide="showCron=false" @fill="onCrontabFill" :expression="expression"></vcrontab>-->
     <!--</el-dialog>-->
 
     <el-card style="border-radius: 0">
@@ -165,7 +161,7 @@ export default {
     return {
       columns: [
         { name: 'name', label: 'Name', width: '180' },
-        { name: 'cron', label: 'schedules.cron', width: '120' },
+        { name: 'cron', label: 'Cron', width: '120' },
         { name: 'node_name', label: 'Node', width: '150' },
         { name: 'spider_name', label: 'Spider', width: '150' },
         { name: 'param', label: 'Parameters', width: '150' },
@@ -246,9 +242,9 @@ export default {
       this.$st.sendEv('定时任务', '修改', 'id', row._id)
     },
     onRemove (row) {
-      this.$confirm('确定删除定时任务?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(this.$t('Are you sure to delete the schedule task?'), this.$t('Notification'), {
+        confirmButtonText: this.$t('Confirm'),
+        cancelButtonText: this.$t('Cancel'),
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('schedule/removeSchedule', row._id)
@@ -258,15 +254,16 @@ export default {
               this.$message.success(`Schedule "${row.name}" has been removed`)
             }, 100)
           })
-      }).catch(() => {})
+      }).catch(() => {
+      })
       this.$st.sendEv('定时任务', '删除', 'id', row._id)
     },
     onCrawl (row) {
       // 停止定时任务
       if (!row.status || row.status === 'running') {
-        this.$confirm('确定停止定时任务?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(this.$t('Are you sure to delete the schedule task?'), this.$t('Notification'), {
+          confirmButtonText: this.$t('Confirm'),
+          cancelButtonText: this.$t('Cancel'),
           type: 'warning'
         }).then(() => {
           this.$store.dispatch('schedule/stopSchedule', row._id)
@@ -280,13 +277,14 @@ export default {
                 message: resp.data.error
               })
             })
-        }).catch(() => {})
+        }).catch(() => {
+        })
       }
       // 运行定时任务
       if (row.status === 'stop') {
-        this.$confirm('确定运行定时任务?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(this.$t('Are you sure to delete the schedule task?'), this.$t('Notification'), {
+          confirmButtonText: this.$t('Confirm'),
+          cancelButtonText: this.$t('Cancel'),
           type: 'warning'
         }).then(() => {
           this.$store.dispatch('schedule/runSchedule', row._id)
@@ -300,7 +298,15 @@ export default {
                 message: resp.data.error
               })
             })
-        }).catch(() => {})
+        }).catch(() => {
+        })
+      }
+    },
+    isDisabledSpider (spider) {
+      if (spider.type === 'customized') {
+        return !spider.cmd
+      } else {
+        return false
       }
     }
   },
@@ -338,6 +344,7 @@ export default {
     min-height: 360px;
     margin-top: 10px;
   }
+
   .status-tag {
     cursor: pointer;
   }

From 91a43e34d6d0f8ad08ef6541b05860b3405927e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Tue, 10 Dec 2019 07:19:18 +0800
Subject: [PATCH 11/21] =?UTF-8?q?fix=20=E5=89=8D=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/request.js | 70 +++++++++++++++----------------------
 1 file changed, 28 insertions(+), 42 deletions(-)

diff --git a/frontend/src/api/request.js b/frontend/src/api/request.js
index 9c5943f53..5f91f2acc 100644
--- a/frontend/src/api/request.js
+++ b/frontend/src/api/request.js
@@ -1,53 +1,39 @@
 import axios from 'axios'
 import router from '../router'
+import { Message } from 'element-ui'
 
 let baseUrl = process.env.VUE_APP_BASE_URL ? process.env.VUE_APP_BASE_URL : 'http://localhost:8000'
 
-const request = async (method, path, params, data, others = {}) => {
-  try {
-    const url = baseUrl + path
-    const headers = {
-      'Authorization': window.localStorage.getItem('token')
+const request = (method, path, params, data, others = {}) => {
+  const url = baseUrl + path
+  const headers = {
+    'Authorization': window.localStorage.getItem('token')
+  }
+  return axios({
+    method,
+    url,
+    params,
+    data,
+    headers,
+    ...others
+  }).then((response) => {
+    if (response.status === 200) {
+      return Promise.resolve(response)
+    }
+    return Promise.reject(response)
+  }).catch((e) => {
+    let response = e.response
+    if (response.status === 400) {
+      Message.error(response.data.error)
     }
-    const response = await axios({
-      method,
-      url,
-      params,
-      data,
-      headers,
-      ...others
-    })
-    // console.log(response)
-    return response
-  } catch (e) {
-    if (e.response.status === 401 && router.currentRoute.path !== '/login') {
+    if (response.status === 401 && router.currentRoute.path !== '/login') {
+      console.log('login')
       router.push('/login')
     }
-    await Promise.reject(e)
-  }
-
-  // return new Promise((resolve, reject) => {
-  //   const url = baseUrl + path
-  //   const headers = {
-  //     'Authorization': window.localStorage.getItem('token')
-  //   }
-  //   axios({
-  //     method,
-  //     url,
-  //     params,
-  //     data,
-  //     headers,
-  //     ...others
-  //   })
-  //     .then(resolve)
-  //     .catch(error => {
-  //       console.log(error)
-  //       if (error.response.status === 401) {
-  //         router.push('/login')
-  //       }
-  //       reject(error)
-  //     })
-  // })
+    if (response.status === 500) {
+      Message.error(response.data.error)
+    }
+  })
 }
 
 const get = (path, params) => {

From c071a93c5b7884db456a53f410a05b1d3871d48a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Tue, 10 Dec 2019 09:22:09 +0800
Subject: [PATCH 12/21] =?UTF-8?q?fix=20=E5=90=8C=E6=AD=A5=E9=94=81?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=BC=82=E5=B8=B8=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/database/redis.go | 35 +++++++++++++++++++++++++----------
 backend/services/node.go  |  5 +++--
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/backend/database/redis.go b/backend/database/redis.go
index 54f716d0c..b165aaa36 100644
--- a/backend/database/redis.go
+++ b/backend/database/redis.go
@@ -155,42 +155,57 @@ func Sub(channel string, consume ConsumeFunc) error {
 	return nil
 }
 
+// 构建同步锁key
 func (r *Redis) getLockKey(lockKey string) string {
 	lockKey = strings.ReplaceAll(lockKey, ":", "-")
 	return "nodes:lock:" + lockKey
 }
 
-func (r *Redis) Lock(lockKey string) error {
+// 获得锁
+func (r *Redis) Lock(lockKey string) (int64, error) {
 	c := r.pool.Get()
 	defer utils.Close(c)
 	lockKey = r.getLockKey(lockKey)
 
-	ts := time.Now()
-	v, err := c.Do("SET", lockKey, ts, "NX", "PX", 30000)
+	ts := time.Now().Unix()
+	ok, err := c.Do("SET", lockKey, ts, "NX", "PX", 30000)
 	if err != nil {
 		log.Errorf("get lock fail with error: %s", err.Error())
 		debug.PrintStack()
-		return err
+		return 0, err
 	}
-	if err == nil && v == nil {
+	if err == nil && ok == nil {
 		log.Errorf("the lockKey is locked: key=%s", lockKey)
-		return errors.New("the lockKey is locked")
+		return 0, errors.New("the lockKey is locked")
 	}
-	return nil
+	return ts, nil
 }
 
-func (r *Redis) UnLock(lockKey string) {
+func (r *Redis) UnLock(lockKey string, value int64) {
 	c := r.pool.Get()
 	defer utils.Close(c)
 	lockKey = r.getLockKey(lockKey)
 
-	v, err := c.Do("DEL", lockKey)
+	getValue, err := redis.Int64(c.Do("GET", lockKey))
+	if err != nil {
+		log.Errorf("get lockKey error: %s", err.Error())
+		debug.PrintStack()
+		return
+	}
+
+	if getValue != value {
+		log.Errorf("the lockKey value diff: %d, %d", value, getValue)
+		return
+	}
+
+	v, err := redis.Int64(c.Do("DEL", lockKey))
 	if err != nil {
 		log.Errorf("unlock failed, error: %s", err.Error())
 		debug.PrintStack()
 		return
 	}
-	if v.(int64) == 0 {
+
+	if v == 0 {
 		log.Errorf("unlock failed: key=%s", lockKey)
 		return
 	}
diff --git a/backend/services/node.go b/backend/services/node.go
index 26cd3b89c..369347468 100644
--- a/backend/services/node.go
+++ b/backend/services/node.go
@@ -96,10 +96,11 @@ func UpdateNodeStatus() {
 
 func handleNodeInfo(key string, data Data) {
 	// 添加同步锁
-	if err := database.RedisClient.Lock(key); err != nil {
+	v, err := database.RedisClient.Lock(key)
+	if err != nil {
 		return
 	}
-	defer database.RedisClient.UnLock(key)
+	defer database.RedisClient.UnLock(key, v)
 
 	// 更新节点信息到数据库
 	s, c := database.GetCol("nodes")

From 26227dd0dc7fc0ae122b9f4f32d80527c9d63d79 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 12 Dec 2019 13:13:42 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/model/schedule.go                    | 110 +++++++++---------
 backend/routes/task.go                       |   3 -
 backend/services/schedule.go                 | 113 +++++++++++++------
 frontend/src/store/modules/schedule.js       |   4 +-
 frontend/src/views/schedule/ScheduleList.vue |  36 ++++--
 5 files changed, 162 insertions(+), 104 deletions(-)

diff --git a/backend/model/schedule.go b/backend/model/schedule.go
index 39e1244fe..c1923885f 100644
--- a/backend/model/schedule.go
+++ b/backend/model/schedule.go
@@ -12,15 +12,18 @@ import (
 )
 
 type Schedule struct {
-	Id          bson.ObjectId `json:"_id" bson:"_id"`
-	Name        string        `json:"name" bson:"name"`
-	Description string        `json:"description" bson:"description"`
-	SpiderId    bson.ObjectId `json:"spider_id" bson:"spider_id"`
-	NodeId      bson.ObjectId `json:"node_id" bson:"node_id"`
-	NodeKey     string        `json:"node_key" bson:"node_key"`
-	Cron        string        `json:"cron" bson:"cron"`
-	EntryId     cron.EntryID  `json:"entry_id" bson:"entry_id"`
-	Param       string        `json:"param" bson:"param"`
+	Id          bson.ObjectId   `json:"_id" bson:"_id"`
+	Name        string          `json:"name" bson:"name"`
+	Description string          `json:"description" bson:"description"`
+	SpiderId    bson.ObjectId   `json:"spider_id" bson:"spider_id"`
+	//NodeId      bson.ObjectId   `json:"node_id" bson:"node_id"`
+	//NodeKey     string          `json:"node_key" bson:"node_key"`
+	Cron        string          `json:"cron" bson:"cron"`
+	EntryId     cron.EntryID    `json:"entry_id" bson:"entry_id"`
+	Param       string          `json:"param" bson:"param"`
+	RunType     string          `json:"run_type" bson:"run_type"`
+	NodeIds     []bson.ObjectId `json:"node_ids" bson:"node_ids"`
+
 	// 状态
 	Status string `json:"status" bson:"status"`
 
@@ -49,26 +52,26 @@ func (sch *Schedule) Delete() error {
 	return c.RemoveId(sch.Id)
 }
 
-func (sch *Schedule) SyncNodeIdAndSpiderId(node Node, spider Spider) {
-	sch.syncNodeId(node)
-	sch.syncSpiderId(spider)
-}
-
-func (sch *Schedule) syncNodeId(node Node) {
-	if node.Id.Hex() == sch.NodeId.Hex() {
-		return
-	}
-	sch.NodeId = node.Id
-	_ = sch.Save()
-}
-
-func (sch *Schedule) syncSpiderId(spider Spider) {
-	if spider.Id.Hex() == sch.SpiderId.Hex() {
-		return
-	}
-	sch.SpiderId = spider.Id
-	_ = sch.Save()
-}
+//func (sch *Schedule) SyncNodeIdAndSpiderId(node Node, spider Spider) {
+//	sch.syncNodeId(node)
+//	sch.syncSpiderId(spider)
+//}
+
+//func (sch *Schedule) syncNodeId(node Node) {
+//	if node.Id.Hex() == sch.NodeId.Hex() {
+//		return
+//	}
+//	sch.NodeId = node.Id
+//	_ = sch.Save()
+//}
+
+//func (sch *Schedule) syncSpiderId(spider Spider) {
+//	if spider.Id.Hex() == sch.SpiderId.Hex() {
+//		return
+//	}
+//	sch.SpiderId = spider.Id
+//	_ = sch.Save()
+//}
 
 func GetScheduleList(filter interface{}) ([]Schedule, error) {
 	s, c := database.GetCol("schedules")
@@ -81,20 +84,20 @@ func GetScheduleList(filter interface{}) ([]Schedule, error) {
 
 	var schs []Schedule
 	for _, schedule := range schedules {
-		// 获取节点名称
-		if schedule.NodeId == bson.ObjectIdHex(constants.ObjectIdNull) {
-			// 选择所有节点
-			schedule.NodeName = "All Nodes"
-		} else {
-			// 选择单一节点
-			node, err := GetNode(schedule.NodeId)
-			if err != nil {
-				schedule.Status = constants.ScheduleStatusError
-				schedule.Message = constants.ScheduleStatusErrorNotFoundNode
-			} else {
-				schedule.NodeName = node.Name
-			}
-		}
+		// TODO: 获取节点名称
+		//if schedule.NodeId == bson.ObjectIdHex(constants.ObjectIdNull) {
+		//	// 选择所有节点
+		//	schedule.NodeName = "All Nodes"
+		//} else {
+		//	// 选择单一节点
+		//	node, err := GetNode(schedule.NodeId)
+		//	if err != nil {
+		//		schedule.Status = constants.ScheduleStatusError
+		//		schedule.Message = constants.ScheduleStatusErrorNotFoundNode
+		//	} else {
+		//		schedule.NodeName = node.Name
+		//	}
+		//}
 
 		// 获取爬虫名称
 		spider, err := GetSpider(schedule.SpiderId)
@@ -130,12 +133,13 @@ func UpdateSchedule(id bson.ObjectId, item Schedule) error {
 	if err := c.FindId(id).One(&result); err != nil {
 		return err
 	}
-	node, err := GetNode(item.NodeId)
-	if err != nil {
-		return err
-	}
+	//node, err := GetNode(item.NodeId)
+	//if err != nil {
+	//	return err
+	//}
 
-	item.NodeKey = node.Key
+	item.UpdateTs = time.Now()
+	//item.NodeKey = node.Key
 	if err := item.Save(); err != nil {
 		return err
 	}
@@ -146,15 +150,15 @@ func AddSchedule(item Schedule) error {
 	s, c := database.GetCol("schedules")
 	defer s.Close()
 
-	node, err := GetNode(item.NodeId)
-	if err != nil {
-		return err
-	}
+	//node, err := GetNode(item.NodeId)
+	//if err != nil {
+	//	return err
+	//}
 
 	item.Id = bson.NewObjectId()
 	item.CreateTs = time.Now()
 	item.UpdateTs = time.Now()
-	item.NodeKey = node.Key
+	//item.NodeKey = node.Key
 
 	if err := c.Insert(&item); err != nil {
 		debug.PrintStack()
diff --git a/backend/routes/task.go b/backend/routes/task.go
index 6b91ed66d..d5e3caccf 100644
--- a/backend/routes/task.go
+++ b/backend/routes/task.go
@@ -119,7 +119,6 @@ func PutTask(c *gin.Context) {
 				return
 			}
 		}
-
 	} else if reqBody.RunType == constants.RunTypeRandom {
 		// 随机
 		t := model.Task{
@@ -130,7 +129,6 @@ func PutTask(c *gin.Context) {
 			HandleError(http.StatusInternalServerError, c, err)
 			return
 		}
-
 	} else if reqBody.RunType == constants.RunTypeSelectedNodes {
 		// 指定节点
 		for _, nodeId := range reqBody.NodeIds {
@@ -145,7 +143,6 @@ func PutTask(c *gin.Context) {
 				return
 			}
 		}
-
 	} else {
 		HandleErrorF(http.StatusInternalServerError, c, "invalid run_type")
 		return
diff --git a/backend/services/schedule.go b/backend/services/schedule.go
index 7a8defde6..53938aea3 100644
--- a/backend/services/schedule.go
+++ b/backend/services/schedule.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"github.com/apex/log"
 	"github.com/globalsign/mgo/bson"
-	"github.com/satori/go.uuid"
+	uuid "github.com/satori/go.uuid"
 	"runtime/debug"
 )
 
@@ -19,48 +19,87 @@ type Scheduler struct {
 
 func AddScheduleTask(s model.Schedule) func() {
 	return func() {
-		node, err := model.GetNodeByKey(s.NodeKey)
-		if err != nil || node.Id.Hex() == "" {
-			log.Errorf("get node by key error: %s", err.Error())
-			debug.PrintStack()
-			return
-		}
-
-		spider := model.GetSpiderByName(s.SpiderName)
-		if spider == nil || spider.Id.Hex() == "" {
-			log.Errorf("get spider by name error: %s", err.Error())
-			debug.PrintStack()
-			return
-		}
-
-		// 同步ID到定时任务
-		s.SyncNodeIdAndSpiderId(node, *spider)
-
 		// 生成任务ID
 		id := uuid.NewV4()
 
-		// 生成任务模型
-		t := model.Task{
-			Id:       id.String(),
-			SpiderId: spider.Id,
-			NodeId:   node.Id,
-			Status:   constants.StatusPending,
-			Param:    s.Param,
-		}
-
-		// 将任务存入数据库
-		if err := model.AddTask(t); err != nil {
-			log.Errorf(err.Error())
-			debug.PrintStack()
+		if s.RunType == constants.RunTypeAllNodes {
+			// 所有节点
+			nodes, err := model.GetNodeList(nil)
+			if err != nil {
+				return
+			}
+			for _, node := range nodes {
+				t := model.Task{
+					Id:       id.String(),
+					SpiderId: s.SpiderId,
+					NodeId:   node.Id,
+					Param:    s.Param,
+				}
+
+				if err := AddTask(t); err != nil {
+					return
+				}
+				if err := AssignTask(t); err != nil {
+					log.Errorf(err.Error())
+					debug.PrintStack()
+					return
+				}
+			}
+		} else if s.RunType == constants.RunTypeRandom {
+			// 随机
+			t := model.Task{
+				Id:       id.String(),
+				SpiderId: s.SpiderId,
+				Param:    s.Param,
+			}
+			if err := AddTask(t); err != nil {
+				return
+			}
+			if err := AssignTask(t); err != nil {
+				log.Errorf(err.Error())
+				debug.PrintStack()
+				return
+			}
+		} else if s.RunType == constants.RunTypeSelectedNodes {
+			// 指定节点
+			for _, nodeId := range s.NodeIds {
+				t := model.Task{
+					Id:       id.String(),
+					SpiderId: s.SpiderId,
+					NodeId:   nodeId,
+					Param:    s.Param,
+				}
+
+				if err := AddTask(t); err != nil {
+					return
+				}
+
+				if err := AssignTask(t); err != nil {
+					log.Errorf(err.Error())
+					debug.PrintStack()
+					return
+				}
+			}
+		} else {
 			return
 		}
 
-		// 加入任务队列
-		if err := AssignTask(t); err != nil {
-			log.Errorf(err.Error())
-			debug.PrintStack()
-			return
-		}
+		//node, err := model.GetNodeByKey(s.NodeKey)
+		//if err != nil || node.Id.Hex() == "" {
+		//	log.Errorf("get node by key error: %s", err.Error())
+		//	debug.PrintStack()
+		//	return
+		//}
+		//
+		//spider := model.GetSpiderByName(s.SpiderName)
+		//if spider == nil || spider.Id.Hex() == "" {
+		//	log.Errorf("get spider by name error: %s", err.Error())
+		//	debug.PrintStack()
+		//	return
+		//}
+		//
+		//// 同步ID到定时任务
+		//s.SyncNodeIdAndSpiderId(node, *spider)
 	}
 }
 
diff --git a/frontend/src/store/modules/schedule.js b/frontend/src/store/modules/schedule.js
index 7c705ac3e..e71d5f03d 100644
--- a/frontend/src/store/modules/schedule.js
+++ b/frontend/src/store/modules/schedule.js
@@ -1,7 +1,9 @@
 import request from '../../api/request'
 const state = {
   scheduleList: [],
-  scheduleForm: {}
+  scheduleForm: {
+    node_ids: []
+  }
 }
 
 const getters = {}
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 7a49f808e..c54b292be 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -14,15 +14,15 @@
         <el-form-item :label="$t('Schedule Name')" prop="name" required>
           <el-input v-model="scheduleForm.name" :placeholder="$t('Schedule Name')"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('Run Type')" prop="runType" required>
-          <el-select v-model="scheduleForm.runType" :placeholder="$t('Run Type')">
+        <el-form-item :label="$t('Run Type')" prop="run_type" required>
+          <el-select v-model="scheduleForm.run_type" :placeholder="$t('Run Type')">
             <el-option value="all-nodes" :label="$t('All Nodes')"/>
             <el-option value="selected-nodes" :label="$t('Selected Nodes')"/>
             <el-option value="random" :label="$t('Random')"/>
           </el-select>
         </el-form-item>
-        <el-form-item v-if="scheduleForm.runType === 'selected-nodes'" :label="$t('Node')" prop="node_id" required>
-          <el-select v-model="scheduleForm.node_id">
+        <el-form-item v-if="scheduleForm.run_type === 'selected-nodes'" :label="$t('Nodes')" prop="node_ids" required>
+          <el-select v-model="scheduleForm.node_ids" :placeholder="$t('Nodes')" multiple filterable>
             <el-option
               v-for="op in nodeList"
               :key="op._id"
@@ -33,20 +33,19 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('Spider')" prop="spider_id" required>
-          <el-select v-model="scheduleForm.spider_id" filterable>
+          <el-select v-model="scheduleForm.spider_id" :placeholder="$t('Spider')" filterable>
             <el-option
               v-for="op in spiderList"
               :key="op._id"
               :value="op._id"
-              :label="op.name"
+              :label="`${op.display_name} (${op.name})`"
               :disabled="isDisabledSpider(op)"
             >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('Cron')" prop="cron" required>
-          <el-input style="padding-right:10px"
-                    v-model="scheduleForm.cron"
+          <el-input v-model="scheduleForm.cron"
                     :placeholder="$t('schedules.cron')">
           </el-input>
           <!--<el-button size="small" style="width:100px" type="primary" @click="onShowCronDialog">{{$t('schedules.add_cron')}}</el-button>-->
@@ -116,6 +115,13 @@
               </el-tag>
             </template>
           </el-table-column>
+          <el-table-column v-else-if="col.name === 'run_type'" :key="col.name" :label="$t(col.label)">
+            <template slot-scope="scope">
+              <template v-if="scope.row.run_type === 'all-nodes'">{{$t('All Nodes')}}</template>
+              <template v-else-if="scope.row.run_type === 'selected-nodes'">{{$t('Selected Nodes')}}</template>
+              <template v-else-if="scope.row.run_type === 'random'">{{$t('Random')}}</template>
+            </template>
+          </el-table-column>
           <el-table-column v-else :key="col.name"
                            :property="col.name"
                            :label="$t(col.label)"
@@ -137,7 +143,7 @@
             <el-tooltip :content="$t('Remove')" placement="top">
               <el-button type="danger" icon="el-icon-delete" size="mini" @click="onRemove(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip content="暂停/运行" placement="top">
+            <el-tooltip v-if="false" :content="$t(getStatusTooltip(scope.row))" placement="top">
               <el-button type="success" icon="fa fa-bug" size="mini" @click="onCrawl(scope.row)"></el-button>
             </el-tooltip>
           </template>
@@ -162,6 +168,7 @@ export default {
       columns: [
         { name: 'name', label: 'Name', width: '180' },
         { name: 'cron', label: 'Cron', width: '120' },
+        { name: 'run_type', label: 'Run Type', width: '150' },
         { name: 'node_name', label: 'Node', width: '150' },
         { name: 'spider_name', label: 'Spider', width: '150' },
         { name: 'param', label: 'Parameters', width: '150' },
@@ -204,7 +211,7 @@ export default {
     onAdd () {
       this.isEdit = false
       this.dialogVisible = true
-      this.$store.commit('schedule/SET_SCHEDULE_FORM', {})
+      this.$store.commit('schedule/SET_SCHEDULE_FORM', { node_ids: [] })
       this.$st.sendEv('定时任务', '添加')
     },
     onAddSubmit () {
@@ -308,6 +315,15 @@ export default {
       } else {
         return false
       }
+    },
+    getStatusTooltip (row) {
+      if (row.status === 'stop') {
+        return 'Start'
+      } else if (row.status === 'running') {
+        return 'Stop'
+      } else if (row.status === 'error') {
+        return 'Start'
+      }
     }
   },
   created () {

From be9598abbc2b0740f1b408f3cfc8da3ff812a9f4 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 12 Dec 2019 13:47:43 +0800
Subject: [PATCH 14/21] updated CHANGELOG.md

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95ef9cd76..93d315a2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 0.4.0 (2019-12-06)
+### Features / Enhancement
+- **Configurable Spider**. Allow users to add spiders using *Spiderfile* to configure crawling rules.
+- **Execution Mode**. Allow users to select 3 modes for task execution: *All Nodes*, *Selected Nodes* and *Random*.
+
+### Bug Fixes
+- **Task accidentally killed**. [#306](https://github.com/crawlab-team/crawlab/issues/306)
+- **Documentation fix**. [#301](https://github.com/crawlab-team/crawlab/issues/258) [#301](https://github.com/crawlab-team/crawlab/issues/258)
+- **Direct deploy incompatible with Windows**. [#288](https://github.com/crawlab-team/crawlab/issues/288)
+- **Log files lost**. [#269](https://github.com/crawlab-team/crawlab/issues/269)
+
 # 0.3.5 (2019-10-28)
 ### Features / Enhancement
 - **Graceful Showdown**. [detail](https://github.com/crawlab-team/crawlab/commit/63fab3917b5a29fd9770f9f51f1572b9f0420385)

From a067c1c1adfa4e2c476509894a34f92316b23ebd Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 13 Dec 2019 12:55:53 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E5=B0=86=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=88=AC=E8=99=ABstages=E8=B0=83=E6=95=B4=E4=B8=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/entity/config_spider.go               |  2 +-
 backend/model/config_spider/common.go         | 10 ++---
 backend/model/config_spider/scrapy.go         |  3 +-
 backend/model/spider.go                       |  6 ---
 backend/services/config_spider.go             | 10 ++---
 .../template/spiderfile/Spiderfile.163_news   | 22 +++++------
 backend/template/spiderfile/Spiderfile.baidu  | 26 ++++++-------
 .../spiderfile/Spiderfile.toscrapy_books      | 38 +++++++++----------
 8 files changed, 52 insertions(+), 65 deletions(-)

diff --git a/backend/entity/config_spider.go b/backend/entity/config_spider.go
index 3fe28bc95..d9e085d2e 100644
--- a/backend/entity/config_spider.go
+++ b/backend/entity/config_spider.go
@@ -5,7 +5,7 @@ type ConfigSpiderData struct {
 	Engine     string            `yaml:"engine" json:"engine"`
 	StartUrl   string            `yaml:"start_url" json:"start_url"`
 	StartStage string            `yaml:"start_stage" json:"start_stage"`
-	Stages     map[string]Stage  `yaml:"stages" json:"stages"`
+	Stages     []Stage           `yaml:"stages" json:"stages"`
 	Settings   map[string]string `yaml:"settings" json:"settings"`
 }
 
diff --git a/backend/model/config_spider/common.go b/backend/model/config_spider/common.go
index c803755ac..4d244fe19 100644
--- a/backend/model/config_spider/common.go
+++ b/backend/model/config_spider/common.go
@@ -15,16 +15,12 @@ func GetAllFields(data entity.ConfigSpiderData) []entity.Field {
 func GetStartStageName(data entity.ConfigSpiderData) string {
 	// 如果 start_stage 设置了且在 stages 里，则返回
 	if data.StartStage != "" {
-		for stageName := range data.Stages {
-			if stageName == data.StartStage {
-				return data.StartStage
-			}
-		}
+		return data.StartStage
 	}
 
 	// 否则返回第一个 stage
-	for stageName := range data.Stages {
-		return stageName
+	for _, stage := range data.Stages {
+		return stage.Name
 	}
 	return ""
 }
diff --git a/backend/model/config_spider/scrapy.go b/backend/model/config_spider/scrapy.go
index 6fcb77f02..ee24a3e78 100644
--- a/backend/model/config_spider/scrapy.go
+++ b/backend/model/config_spider/scrapy.go
@@ -83,7 +83,8 @@ func (g ScrapyGenerator) ProcessSpider() error {
 
 	// 替换 parsers
 	strParser := ""
-	for stageName, stage := range g.ConfigData.Stages {
+	for _, stage := range g.ConfigData.Stages {
+		stageName := stage.Name
 		stageStr := g.GetParserString(stageName, stage)
 		strParser += stageStr
 	}
diff --git a/backend/model/spider.go b/backend/model/spider.go
index a0d72c1cd..78adc4d0c 100644
--- a/backend/model/spider.go
+++ b/backend/model/spider.go
@@ -319,11 +319,5 @@ func GetConfigSpiderData(spider Spider) (entity.ConfigSpiderData, error) {
 		return configData, err
 	}
 
-	// 赋值 stage_name
-	for stageName, stage := range configData.Stages {
-		stage.Name = stageName
-		configData.Stages[stageName] = stage
-	}
-
 	return configData, nil
 }
diff --git a/backend/services/config_spider.go b/backend/services/config_spider.go
index 7c736cc71..fe0a3da14 100644
--- a/backend/services/config_spider.go
+++ b/backend/services/config_spider.go
@@ -61,7 +61,9 @@ func ValidateSpiderfile(configData entity.ConfigSpiderData) error {
 
 	// 校验stages
 	dict := map[string]int{}
-	for stageName, stage := range configData.Stages {
+	for _, stage := range configData.Stages {
+		stageName := stage.Name
+
 		// stage 名称不能为空
 		if stageName == "" {
 			return errors.New("spiderfile invalid: stage name is empty")
@@ -152,12 +154,6 @@ func IsUniqueConfigSpiderFields(fields []entity.Field) bool {
 func ProcessSpiderFilesFromConfigData(spider model.Spider, configData entity.ConfigSpiderData) error {
 	spiderDir := spider.Src
 
-	// 赋值 stage_name
-	for stageName, stage := range configData.Stages {
-		stage.Name = stageName
-		configData.Stages[stageName] = stage
-	}
-
 	// 删除已有的爬虫文件
 	for _, fInfo := range utils.ListDir(spiderDir) {
 		// 不删除Spiderfile
diff --git a/backend/template/spiderfile/Spiderfile.163_news b/backend/template/spiderfile/Spiderfile.163_news
index 29d58279a..c2a73be7c 100644
--- a/backend/template/spiderfile/Spiderfile.163_news
+++ b/backend/template/spiderfile/Spiderfile.163_news
@@ -4,17 +4,17 @@ start_url: "http://news.163.com/special/0001386F/rank_news.html"
 start_stage: "list"
 engine: "scrapy"
 stages:
-  list:
-    is_list: true
-    list_css: "table tr:not(:first-child)"
-    fields:
-      - name: "title"
-        css: "td:nth-child(1) > a"
-      - name: "url"
-        css: "td:nth-child(1) > a"
-        attr: "href"
-      - name: "clicks"
-        css: "td.cBlue"
+- name: list
+  is_list: true
+  list_css: "table tr:not(:first-child)"
+  fields:
+  - name: "title"
+    css: "td:nth-child(1) > a"
+  - name: "url"
+    css: "td:nth-child(1) > a"
+    attr: "href"
+  - name: "clicks"
+    css: "td.cBlue"
 settings:
   ROBOTSTXT_OBEY: false
   USER_AGENT: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36
diff --git a/backend/template/spiderfile/Spiderfile.baidu b/backend/template/spiderfile/Spiderfile.baidu
index fbf720e4b..5643c9801 100644
--- a/backend/template/spiderfile/Spiderfile.baidu
+++ b/backend/template/spiderfile/Spiderfile.baidu
@@ -4,19 +4,19 @@ start_url: http://www.baidu.com/s?wd=crawlab
 start_stage: list
 engine: scrapy
 stages:
-  list:
-    is_list: true
-    list_xpath: //*[contains(@class, "c-container")]
-    page_xpath: //*[@id="page"]//a[@class="n"][last()]
-    page_attr: href
-    fields:
-      - name: title
-        xpath: .//h3/a
-      - name: url
-        xpath: .//h3/a
-        attr: href
-      - name: abstract
-        xpath: .//*[@class="c-abstract"]
+- name: list
+  is_list: true
+  list_xpath: //*[contains(@class, "c-container")]
+  page_xpath: //*[@id="page"]//a[@class="n"][last()]
+  page_attr: href
+  fields:
+  - name: title
+    xpath: .//h3/a
+  - name: url
+    xpath: .//h3/a
+    attr: href
+  - name: abstract
+    xpath: .//*[@class="c-abstract"]
 settings:
   ROBOTSTXT_OBEY: false
   USER_AGENT: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36
diff --git a/backend/template/spiderfile/Spiderfile.toscrapy_books b/backend/template/spiderfile/Spiderfile.toscrapy_books
index 4bf18f617..247b4f40a 100644
--- a/backend/template/spiderfile/Spiderfile.toscrapy_books
+++ b/backend/template/spiderfile/Spiderfile.toscrapy_books
@@ -4,25 +4,25 @@ start_url: "http://books.toscrape.com"
 start_stage: "list"
 engine: "scrapy"
 stages:
-  list:
-    is_list: true
-    list_css: "section article.product_pod"
-    page_css: "ul.pager li.next a"
-    page_attr: "href"
-    fields:
-      - name: "title"
-        css: "h3 > a"
-      - name: "url"
-        css: "h3 > a"
-        attr: "href"
-        next_stage: "detail"
-      - name: "price"
-        css: ".product_price > .price_color"
-  detail:
-    is_list: false
-    fields:
-      - name: "description"
-        css: "#product_description + p"
+- name: list
+  is_list: true
+  list_css: "section article.product_pod"
+  page_css: "ul.pager li.next a"
+  page_attr: "href"
+  fields:
+  - name: "title"
+    css: "h3 > a"
+  - name: "url"
+    css: "h3 > a"
+    attr: "href"
+    next_stage: "detail"
+  - name: "price"
+    css: ".product_price > .price_color"
+- name: detail
+  is_list: false
+  fields:
+  - name: "description"
+    css: "#product_description + p"
 settings:
   ROBOTSTXT_OBEY: true
   AUTOTHROTTLE_ENABLED: true

From 3c5a882b75e91af4916d5b379a419ec31d61cb09 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 13 Dec 2019 13:01:00 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E5=B0=86=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=88=AC=E8=99=ABstages=E8=B0=83=E6=95=B4=E4=B8=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Config/ConfigList.vue | 96 +++++++++++--------
 1 file changed, 56 insertions(+), 40 deletions(-)

diff --git a/frontend/src/components/Config/ConfigList.vue b/frontend/src/components/Config/ConfigList.vue
index 5c7a9dc21..e7c799705 100644
--- a/frontend/src/components/Config/ConfigList.vue
+++ b/frontend/src/components/Config/ConfigList.vue
@@ -133,9 +133,9 @@
           :value="activeNames"
         >
           <el-collapse-item
-            v-for="(stage, stageName) in spiderForm.config.stages"
-            :key="stageName"
-            :name="stageName"
+            v-for="(stage, index) in spiderForm.config.stages"
+            :key="index"
+            :name="stage.name"
           >
             <template slot="title">
               <ul class="stage-list">
@@ -271,7 +271,7 @@
               title="List Page Fields"
               :fields="stage.fields"
               :stage="stage"
-              :stage-names="Object.keys(spiderForm.config.stages)"
+              :stage-names="spiderForm.config.stages.map(s => s.name)"
             />
           </el-collapse-item>
         </el-collapse>
@@ -479,13 +479,6 @@ export default {
       })
 
       return nodes
-      // const stages = Object.values(this.spiderForm.config.stages)
-      // return stages.map((stage, i) => {
-      //   return {
-      //     name: stage.name,
-      //     ...stage
-      //   }
-      // })
     },
     stageEdges () {
       const edges = []
@@ -512,12 +505,17 @@ export default {
       this.$st.sendEv('爬虫详情-配置', '保存')
       this.saveLoading = true
       try {
-        await this.$store.dispatch('spider/postConfigSpiderConfig')
-        this.$message.success(this.$t('Spider info has been saved successfully'))
+        const res = await this.$store.dispatch('spider/postConfigSpiderConfig')
+        if (!res.data.error) {
+          this.$message.success(this.$t('Spider info has been saved successfully'))
+          return true
+        }
+        return false
       } catch (e) {
-        this.$message.error(this.$t('Something wrong happened'))
+        return false
+      } finally {
+        this.saveLoading = false
       }
-      this.saveLoading = false
     },
     onDialogClose () {
       this.dialogVisible = false
@@ -550,9 +548,11 @@ export default {
       })
     },
     async onCrawl () {
-      await this.onSave()
-      this.crawlConfirmDialogVisible = true
       this.$st.sendEv('爬虫详情-配置', '点击运行')
+      const res = await this.onSave()
+      if (res) {
+        this.crawlConfirmDialogVisible = true
+      }
     },
     onExtractFields () {
       this.$refs['form'].validate(res => {
@@ -627,9 +627,7 @@ export default {
       })
     },
     onStageNameFocus (ev) {
-      console.log(ev)
       ev.stopPropagation()
-      // ev.preventDefault()
     },
     onEditStage (stage) {
       this.$set(stage, 'isEdit', !stage.isEdit)
@@ -638,29 +636,18 @@ export default {
       }, 0)
     },
     onCopyStage (stage) {
+      const stages = this.spiderForm.config.stages
       const ts = Math.floor(new Date().getTime()).toString()
       const newStage = JSON.parse(JSON.stringify(stage))
-      newStage.name = `stage_${ts}`
-      this.$set(this.spiderForm.config.stages, newStage.name, newStage)
-    },
-    onRemoveStage (stage) {
-      const stages = JSON.parse(JSON.stringify(this.spiderForm.config.stages))
-      delete stages[stage.name]
-      this.$set(this.spiderForm.config, 'stages', stages)
-      if (Object.keys(stages).length === 0) {
-        this.onAddStage()
+      newStage.name = `${stage.name}_copy_${ts}`
+      for (let i = 0; i < stages.length; i++) {
+        if (stage.name === stages[i].name) {
+          stages.splice(i + 1, 0, newStage)
+        }
       }
-      // 重置next_stage被设置为该stage的field
-      Object.values(this.spiderForm.config.stages).forEach(_stage => {
-        _stage.fields.forEach(field => {
-          if (field.next_stage === stage.name) {
-            this.$set(field, 'next_stage', '')
-          }
-        })
-      })
     },
-    onAddStage (stage) {
-      const stages = JSON.parse(JSON.stringify(this.spiderForm.config.stages))
+    addStage (index) {
+      const stages = this.spiderForm.config.stages
       const ts = Math.floor(new Date().getTime()).toString()
       const newStageName = `stage_${ts}`
       const newField = { name: `field_${ts}`, next_stage: '' }
@@ -671,15 +658,44 @@ export default {
       } else {
         newField['xpath'] = '//body'
       }
-      stages[newStageName] = {
+      stages.splice(index + 1, 0, {
         name: newStageName,
         list_css: this.isCss ? 'body' : '',
         list_xpath: this.isXpath ? '//body' : '',
         page_css: '',
         page_xpath: '',
         fields: [newField]
+      })
+    },
+    onRemoveStage (stage) {
+      const stages = this.spiderForm.config.stages
+      for (let i = 0; i < stages.length; i++) {
+        if (stage.name === stages[i].name) {
+          stages.splice(i, 1)
+          break
+        }
+      }
+      // 如果只剩一个stage，加入新的stage
+      if (stages.length === 0) {
+        this.addStage(0)
+      }
+      // 重置next_stage被设置为该stage的field
+      stages.forEach(_stage => {
+        _stage.fields.forEach(field => {
+          if (field.next_stage === stage.name) {
+            this.$set(field, 'next_stage', '')
+          }
+        })
+      })
+    },
+    onAddStage (stage) {
+      const stages = this.spiderForm.config.stages
+      for (let i = 0; i < stages.length; i++) {
+        if (stage.name === stages[i].name) {
+          this.addStage(i)
+          break
+        }
       }
-      this.$set(this.spiderForm.config, 'stages', stages)
     },
     renderProcessChart () {
       const option = {

From 2ff0ce6b62a284ae6e24e29a12072eca517a9ce0 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 13 Dec 2019 13:11:06 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E5=B0=86=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=88=AC=E8=99=ABstages=E8=B0=83=E6=95=B4=E4=B8=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Config/ConfigList.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/Config/ConfigList.vue b/frontend/src/components/Config/ConfigList.vue
index e7c799705..b1c93afc5 100644
--- a/frontend/src/components/Config/ConfigList.vue
+++ b/frontend/src/components/Config/ConfigList.vue
@@ -70,7 +70,7 @@
                   :class="startStageClass"
                 >
                   <el-option
-                    v-for="n in Object.keys(spiderForm.config.stages)"
+                    v-for="n in spiderForm.config.stages.map(s => s.name)"
                     :key="n"
                     :value="n"
                     :label="n"
@@ -397,7 +397,7 @@ export default {
     },
     isCss () {
       let i = 0
-      Object.values(this.spiderForm.config.stages).forEach(stage => {
+      this.spiderForm.config.stages.forEach(stage => {
         stage.fields.forEach(field => {
           if (!field.css) i++
         })
@@ -406,7 +406,7 @@ export default {
     },
     isXpath () {
       let i = 0
-      Object.values(this.spiderForm.config.stages).forEach(stage => {
+      this.spiderForm.config.stages.forEach(stage => {
         stage.fields.forEach(field => {
           if (!field.xpath) i++
         })
@@ -414,7 +414,7 @@ export default {
       return i === 0
     },
     activeNames () {
-      return Object.values(this.spiderForm.config.stages).map(d => d.name)
+      return this.spiderForm.config.stages.map(d => d.name)
     },
     startUrlClass () {
       if (!this.spiderForm.config.start_url) {
@@ -464,7 +464,7 @@ export default {
 
       // 加入剩余阶段
       i = 0
-      const restStages = Object.values(this.spiderForm.config.stages)
+      const restStages = this.spiderForm.config.stages
         .filter(stage => !allStageNames.has(stage.name))
       restStages.forEach(stage => {
         // 加入节点信息
@@ -482,7 +482,7 @@ export default {
     },
     stageEdges () {
       const edges = []
-      const stages = Object.values(this.spiderForm.config.stages)
+      const stages = this.spiderForm.config.stages
       stages.forEach(stage => {
         for (let i = 0; i < stage.fields.length; i++) {
           const field = stage.fields[i]
@@ -595,7 +595,7 @@ export default {
       return value
     },
     onClickSelectorType (selectorType) {
-      Object.values(this.spiderForm.config.stages).forEach(stage => {
+      this.spiderForm.config.stages.forEach(stage => {
         // 列表
         if (selectorType === 'css') {
           if (stage.list_xpath) stage.list_xpath = ''
@@ -868,7 +868,7 @@ ${f.css || f.xpath} ${f.attr ? ('(' + f.attr + ')') : ''} ${f.next_stage ? (' --
     }
   },
   mounted () {
-    this.activeNames = Object.keys(this.spiderForm.config.stages)
+    this.activeNames = this.spiderForm.config.stages.map(stage => stage.name)
   }
 }
 </script>

From a61f04755a6f4eee20486f1439519a2276afbdb5 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 13 Dec 2019 13:53:27 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BA=8B=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue                          |  4 +-
 .../components/Common/CrawlConfirmDialog.vue  |  2 +-
 frontend/src/components/Config/ConfigList.vue | 18 +++++++--
 .../Environment/EnvironmentList.vue           |  6 +--
 .../components/InfoView/SpiderInfoView.vue    |  4 +-
 .../src/components/Overview/TaskOverview.vue  |  4 +-
 .../components/TableView/FieldsTableView.vue  | 31 +++-----------
 .../TableView/SettingFieldsTableView.vue      | 40 +------------------
 .../src/views/layout/components/Navbar.vue    |  2 +-
 frontend/src/views/node/NodeList.vue          |  6 +--
 frontend/src/views/schedule/ScheduleList.vue  |  8 ++--
 frontend/src/views/spider/SpiderList.vue      | 18 ++++-----
 frontend/src/views/task/TaskDetail.vue        |  2 +-
 frontend/src/views/task/TaskList.vue          | 10 ++---
 frontend/src/views/user/UserList.vue          |  4 +-
 15 files changed, 54 insertions(+), 105 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 06a41cce6..2a91e61a2 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -30,10 +30,10 @@ export default {
       document.querySelector('.el-message__closeBtn').click()
       if (value === 1) {
         this.$st.sendPv('/allow_stats')
-        this.$st.sendEv('全局', '允许/禁止统计', 'value', 'allow')
+        this.$st.sendEv('全局', '允许/禁止统计', '允许')
       } else {
         this.$st.sendPv('/disallow_stats')
-        this.$st.sendEv('全局', '允许/禁止统计', 'value', 'disallow')
+        this.$st.sendEv('全局', '允许/禁止统计', '禁止')
       }
     }
 
diff --git a/frontend/src/components/Common/CrawlConfirmDialog.vue b/frontend/src/components/Common/CrawlConfirmDialog.vue
index f2ad70c22..42fc2b6f9 100644
--- a/frontend/src/components/Common/CrawlConfirmDialog.vue
+++ b/frontend/src/components/Common/CrawlConfirmDialog.vue
@@ -80,7 +80,7 @@ export default {
             this.$message.success(this.$t('A task has been scheduled successfully'))
           })
         this.$emit('close')
-        this.$st.sendEv('爬虫', '运行')
+        this.$st.sendEv('爬虫确认', '确认运行', this.form.runType)
       })
     }
   },
diff --git a/frontend/src/components/Config/ConfigList.vue b/frontend/src/components/Config/ConfigList.vue
index b1c93afc5..9b274b3b6 100644
--- a/frontend/src/components/Config/ConfigList.vue
+++ b/frontend/src/components/Config/ConfigList.vue
@@ -68,6 +68,7 @@
                   v-model="spiderForm.config.start_stage"
                   :placeholder="$t('Start Stage')"
                   :class="startStageClass"
+                  @change="$st.sendEv('爬虫详情', '配置', '改变起始阶段')"
                 >
                   <el-option
                     v-for="n in spiderForm.config.stages.map(s => s.name)"
@@ -502,7 +503,7 @@ export default {
       this.spiderForm.crawl_type = value
     },
     async onSave () {
-      this.$st.sendEv('爬虫详情-配置', '保存')
+      this.$st.sendEv('爬虫详情', '配置', '保存')
       this.saveLoading = true
       try {
         const res = await this.$store.dispatch('spider/postConfigSpiderConfig')
@@ -542,13 +543,13 @@ export default {
                 .finally(() => {
                   this.previewLoading = false
                 })
-              this.$st.sendEv('爬虫详情-配置', '预览')
+              this.$st.sendEv('爬虫详情', '配置', '预览')
             })
         }
       })
     },
     async onCrawl () {
-      this.$st.sendEv('爬虫详情-配置', '点击运行')
+      this.$st.sendEv('爬虫详情', '配置', '点击运行')
       const res = await this.onSave()
       if (res) {
         this.crawlConfirmDialogVisible = true
@@ -580,7 +581,7 @@ export default {
                 .finally(() => {
                   this.extractFieldsLoading = false
                 })
-              this.$st.sendEv('爬虫详情-配置', '提取字段')
+              this.$st.sendEv('爬虫详情', '配置', '提取字段')
             })
         }
       })
@@ -595,6 +596,7 @@ export default {
       return value
     },
     onClickSelectorType (selectorType) {
+      this.$st.sendEv('爬虫详情', '配置', `点击阶段选择器类别-${selectorType}`)
       this.spiderForm.config.stages.forEach(stage => {
         // 列表
         if (selectorType === 'css') {
@@ -630,12 +632,14 @@ export default {
       ev.stopPropagation()
     },
     onEditStage (stage) {
+      this.$st.sendEv('爬虫详情', '配置', '更改阶段名称')
       this.$set(stage, 'isEdit', !stage.isEdit)
       setTimeout(() => {
         this.$refs[`stage-name-${stage.name}`][0].focus()
       }, 0)
     },
     onCopyStage (stage) {
+      this.$st.sendEv('爬虫详情', '配置', '复制阶段')
       const stages = this.spiderForm.config.stages
       const ts = Math.floor(new Date().getTime()).toString()
       const newStage = JSON.parse(JSON.stringify(stage))
@@ -668,6 +672,7 @@ export default {
       })
     },
     onRemoveStage (stage) {
+      this.$st.sendEv('爬虫详情', '配置', '删除阶段')
       const stages = this.spiderForm.config.stages
       for (let i = 0; i < stages.length; i++) {
         if (stage.name === stages[i].name) {
@@ -689,6 +694,7 @@ export default {
       })
     },
     onAddStage (stage) {
+      this.$st.sendEv('爬虫详情', '配置', '添加阶段')
       const stages = this.spiderForm.config.stages
       for (let i = 0; i < stages.length; i++) {
         if (stage.name === stages[i].name) {
@@ -813,10 +819,12 @@ ${f.css || f.xpath} ${f.attr ? ('(' + f.attr + ')') : ''} ${f.next_stage ? (' --
     },
     onCheckIsList (value, stage) {
       if (value) {
+        this.$st('爬虫详情', '配置', '勾选列表页')
         if (!stage.list_css && !stage.list_xpath) {
           stage.list_xpath = '//body'
         }
       } else {
+        this.$st('爬虫详情', '配置', '取消勾选列表页')
         stage.list_css = ''
         stage.list_xpath = ''
       }
@@ -838,10 +846,12 @@ ${f.css || f.xpath} ${f.attr ? ('(' + f.attr + ')') : ''} ${f.next_stage ? (' --
     },
     onCheckIsPage (value, stage) {
       if (value) {
+        this.$st('爬虫详情', '配置', '勾选分页')
         if (!stage.page_css && !stage.page_xpath) {
           stage.page_xpath = '//body'
         }
       } else {
+        this.$st('爬虫详情', '配置', '取消勾选分页')
         stage.page_css = ''
         stage.page_xpath = ''
       }
diff --git a/frontend/src/components/Environment/EnvironmentList.vue b/frontend/src/components/Environment/EnvironmentList.vue
index e7c89a517..1b50715d7 100644
--- a/frontend/src/components/Environment/EnvironmentList.vue
+++ b/frontend/src/components/Environment/EnvironmentList.vue
@@ -49,11 +49,11 @@ export default {
         name: '',
         value: ''
       })
-      this.$st.sendEv('爬虫详情-环境', '添加')
+      this.$st.sendEv('爬虫详情', '环境', '添加')
     },
     deleteEnv (index) {
       this.spiderForm.envs.splice(index, 1)
-      this.$st.sendEv('爬虫详情-环境', '删除')
+      this.$st.sendEv('爬虫详情', '环境', '删除')
     },
     save () {
       this.$store.dispatch('spider/editSpider')
@@ -63,7 +63,7 @@ export default {
         .catch(error => {
           this.$message.error(error)
         })
-      this.$st.sendEv('爬虫详情-环境', '保存')
+      this.$st.sendEv('爬虫详情', '环境', '保存')
     }
   }
 }
diff --git a/frontend/src/components/InfoView/SpiderInfoView.vue b/frontend/src/components/InfoView/SpiderInfoView.vue
index bf05a2ba2..f804bca19 100644
--- a/frontend/src/components/InfoView/SpiderInfoView.vue
+++ b/frontend/src/components/InfoView/SpiderInfoView.vue
@@ -112,7 +112,7 @@ export default {
   methods: {
     onCrawl () {
       this.crawlConfirmDialogVisible = true
-      this.$st.sendEv('爬虫详情-概览', '点击运行')
+      this.$st.sendEv('爬虫详情', '概览', '点击运行')
     },
     onSave () {
       this.$refs['spiderForm'].validate(res => {
@@ -126,7 +126,7 @@ export default {
             })
         }
       })
-      this.$st.sendEv('爬虫详情-概览', '保存')
+      this.$st.sendEv('爬虫详情', '概览', '保存')
     },
     fetchSiteSuggestions (keyword, callback) {
       this.$request.get('/sites', {
diff --git a/frontend/src/components/Overview/TaskOverview.vue b/frontend/src/components/Overview/TaskOverview.vue
index 603f28ef7..cd3de0a8c 100644
--- a/frontend/src/components/Overview/TaskOverview.vue
+++ b/frontend/src/components/Overview/TaskOverview.vue
@@ -52,11 +52,11 @@ export default {
   methods: {
     onClickNodeTitle () {
       this.$router.push(`/nodes/${this.nodeForm._id}`)
-      this.$st.sendEv('任务详情-概览', '点击节点详情')
+      this.$st.sendEv('任务详情', '概览', '点击节点详情')
     },
     onClickSpiderTitle () {
       this.$router.push(`/spiders/${this.spiderForm._id}`)
-      this.$st.sendEv('任务详情-概览', '点击爬虫详情')
+      this.$st.sendEv('任务详情', '概览', '点击爬虫详情')
     }
   },
   created () {
diff --git a/frontend/src/components/TableView/FieldsTableView.vue b/frontend/src/components/TableView/FieldsTableView.vue
index 87bf88f1a..26b6010d1 100644
--- a/frontend/src/components/TableView/FieldsTableView.vue
+++ b/frontend/src/components/TableView/FieldsTableView.vue
@@ -1,11 +1,5 @@
 <template>
   <div class="fields-table-view">
-    <!--    <el-row class="button-group-container">-->
-    <!--      <label class="title">{{$t(this.title)}}</label>-->
-    <!--      <div class="button-group">-->
-    <!--        <el-button type="primary" size="small" @click="addField" icon="el-icon-plus">{{$t('Add Field')}}</el-button>-->
-    <!--      </div>-->
-    <!--    </el-row>-->
     <el-row>
       <el-table :data="fields"
                 class="table edit"
@@ -171,32 +165,14 @@ export default {
     }
   },
   methods: {
-    addField () {
-      this.fields.push({
-        type: 'css',
-        extract_type: 'text'
-      })
-      this.$st.sendEv('爬虫详情-配置', '添加字段')
-    },
-    deleteField (index) {
-      this.fields.splice(index, 1)
-      this.$st.sendEv('爬虫详情-配置', '删除字段')
-    },
     onNameChange (row) {
       if (this.fields.filter(d => d.name === row.name).length > 1) {
         this.$message.error(this.$t(`Duplicated field names for ${row.name}`))
       }
-      this.$st.sendEv('爬虫详情-配置', '更改字段')
-    },
-    onCheck (row) {
-      this.fields.forEach(d => {
-        if (row.name !== d.name) {
-          this.$set(d, 'is_detail', false)
-        }
-      })
-      this.$st.sendEv('爬虫详情-配置', '设置详情页URL')
+      this.$st.sendEv('爬虫详情', '配置', '更改字段')
     },
     onClickSelectorType (row, selectorType) {
+      this.$st.sendEv('爬虫详情', '配置', `点击字段选择器类别-${selectorType}`)
       if (selectorType === 'css') {
         if (row.xpath) this.$set(row, 'xpath', '')
         if (!row.css) this.$set(row, 'css', 'body')
@@ -206,6 +182,7 @@ export default {
       }
     },
     onClickIsAttribute (row, isAttribute) {
+      this.$st.sendEv('爬虫详情', '配置', '设置字段属性')
       if (!isAttribute) {
         // 文本
         if (row.attr) this.$set(row, 'attr', '')
@@ -224,6 +201,7 @@ export default {
       }
     },
     onRemoveField (row) {
+      this.$st.sendEv('爬虫详情', '配置', '删除字段')
       for (let i = 0; i < this.fields.length; i++) {
         if (row.name === this.fields[i].name) {
           this.fields.splice(i, 1)
@@ -238,6 +216,7 @@ export default {
       }
     },
     onAddField (row) {
+      this.$st.sendEv('爬虫详情', '配置', '添加字段')
       for (let i = 0; i < this.fields.length; i++) {
         if (row.name === this.fields[i].name) {
           this.fields.splice(i + 1, 0, {
diff --git a/frontend/src/components/TableView/SettingFieldsTableView.vue b/frontend/src/components/TableView/SettingFieldsTableView.vue
index 7ce8a46c3..3006c5942 100644
--- a/frontend/src/components/TableView/SettingFieldsTableView.vue
+++ b/frontend/src/components/TableView/SettingFieldsTableView.vue
@@ -77,51 +77,14 @@ export default {
     }
   },
   methods: {
-    addField () {
-      this.list.push({
-        type: 'css',
-        extract_type: 'text'
-      })
-      this.$st.sendEv('爬虫详情-配置', '添加字段')
-    },
-    deleteField (index) {
-      this.list.splice(index, 1)
-      this.$st.sendEv('爬虫详情-配置', '删除字段')
-    },
     onChange (row) {
       if (this.list.filter(d => d.name === row.name).length > 1) {
         this.$message.error(this.$t(`Duplicated field names for ${row.name}`))
       }
       this.$store.commit('spider/SET_SPIDER_FORM_CONFIG_SETTINGS', this.list)
-      this.$st.sendEv('爬虫详情-配置', '更改字段')
-    },
-    onCheck (row) {
-      this.list.forEach(d => {
-        if (row.name !== d.name) {
-          this.$set(d, 'is_detail', false)
-        }
-      })
-      this.$st.sendEv('爬虫详情-配置', '设置详情页URL')
-    },
-    onClickSelectorType (row, selectorType) {
-      if (selectorType === 'css') {
-        if (row.xpath) this.$set(row, 'xpath', '')
-        if (!row.css) this.$set(row, 'css', 'body')
-      } else {
-        if (row.css) this.$set(row, 'css', '')
-        if (!row.xpath) this.$set(row, 'xpath', '//body')
-      }
-    },
-    onClickIsAttribute (row, isAttribute) {
-      if (!isAttribute) {
-        // 文本
-        if (row.attr) this.$set(row, 'attr', '')
-      } else {
-        // 属性
-        if (!row.attr) this.$set(row, 'attr', 'href')
-      }
     },
     onRemoveField (row) {
+      this.$st.sendEv('爬虫详情', '配置', '删除设置')
       const list = JSON.parse(JSON.stringify(this.list))
       for (let i = 0; i < list.length; i++) {
         if (row.name === list[i].name) {
@@ -137,6 +100,7 @@ export default {
       this.$store.commit('spider/SET_SPIDER_FORM_CONFIG_SETTINGS', list)
     },
     onAddField (row) {
+      this.$st.sendEv('爬虫详情', '配置', '添加设置')
       const list = JSON.parse(JSON.stringify(this.list))
       for (let i = 0; i < list.length; i++) {
         if (row.name === list[i].name) {
diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue
index 0bd4c6d15..b9e919193 100644
--- a/frontend/src/views/layout/components/Navbar.vue
+++ b/frontend/src/views/layout/components/Navbar.vue
@@ -74,7 +74,7 @@ export default {
       this.$i18n.locale = lang
       this.$store.commit('lang/SET_LANG', lang)
 
-      this.$st.sendEv('全局', '切换中英文', 'lang', lang)
+      this.$st.sendEv('全局', '切换中英文', lang)
     }
   }
 }
diff --git a/frontend/src/views/node/NodeList.vue b/frontend/src/views/node/NodeList.vue
index 9ea515023..e032bcd42 100644
--- a/frontend/src/views/node/NodeList.vue
+++ b/frontend/src/views/node/NodeList.vue
@@ -202,7 +202,7 @@ export default {
     },
     onRefresh () {
       this.$store.dispatch('node/getNodeList')
-      this.$st.sendEv('节点', '刷新')
+      this.$st.sendEv('节点列表', '刷新')
     },
     onSubmit () {
       const vm = this
@@ -246,13 +246,13 @@ export default {
               message: 'Deleted successfully'
             })
           })
-        this.$st.sendEv('节点', '删除', 'id', row._id)
+        this.$st.sendEv('节点列表', '删除节点')
       })
     },
     onView (row) {
       this.$router.push(`/nodes/${row._id}`)
 
-      this.$st.sendEv('节点', '查看', 'id', row._id)
+      this.$st.sendEv('节点列表', '查看节点')
     },
     onPageChange () {
       this.$store.dispatch('node/getNodeList')
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index c54b292be..23d9fa976 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -212,7 +212,7 @@ export default {
       this.isEdit = false
       this.dialogVisible = true
       this.$store.commit('schedule/SET_SCHEDULE_FORM', { node_ids: [] })
-      this.$st.sendEv('定时任务', '添加')
+      this.$st.sendEv('定时任务', '添加定时任务')
     },
     onAddSubmit () {
       this.$refs.scheduleForm.validate(res => {
@@ -238,7 +238,7 @@ export default {
           }
         }
       })
-      this.$st.sendEv('定时任务', '提交')
+      this.$st.sendEv('定时任务', '提交定时任务')
     },
     isShowRun (row) {
     },
@@ -246,7 +246,7 @@ export default {
       this.$store.commit('schedule/SET_SCHEDULE_FORM', row)
       this.dialogVisible = true
       this.isEdit = true
-      this.$st.sendEv('定时任务', '修改', 'id', row._id)
+      this.$st.sendEv('定时任务', '修改定时任务')
     },
     onRemove (row) {
       this.$confirm(this.$t('Are you sure to delete the schedule task?'), this.$t('Notification'), {
@@ -263,7 +263,7 @@ export default {
           })
       }).catch(() => {
       })
-      this.$st.sendEv('定时任务', '删除', 'id', row._id)
+      this.$st.sendEv('定时任务', '删除定时任务')
     },
     onCrawl (row) {
       // 停止定时任务
diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index 78c87a362..74177b62c 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -370,17 +370,17 @@ export default {
         }
         await this.$store.dispatch('spider/getSpiderList')
         this.$router.push(`/spiders/${res2.data.data._id}`)
-        this.$st.sendEv('爬虫', '添加爬虫-可配置爬虫')
+        this.$st.sendEv('爬虫列表', '添加爬虫', '可配置爬虫')
       })
     },
     onAddCustomized () {
       this.addDialogVisible = false
       this.addCustomizedDialogVisible = true
-      this.$st.sendEv('爬虫', '添加爬虫-自定义爬虫')
+      this.$st.sendEv('爬虫列表', '添加爬虫', '自定义爬虫')
     },
     onRefresh () {
       this.getList()
-      this.$st.sendEv('爬虫', '刷新')
+      this.$st.sendEv('爬虫列表', '刷新')
     },
     onSubmit () {
       const vm = this
@@ -434,19 +434,19 @@ export default {
               message: 'Deleted successfully'
             })
           })
-        this.$st.sendEv('爬虫', '删除')
+        this.$st.sendEv('爬虫列表', '删除爬虫')
       })
     },
     onCrawl (row, ev) {
       ev.stopPropagation()
       this.crawlConfirmDialogVisible = true
       this.activeSpiderId = row._id
-      this.$st.sendEv('爬虫', '点击运行')
+      this.$st.sendEv('爬虫列表', '点击运行')
     },
     onView (row, ev) {
       ev.stopPropagation()
       this.$router.push('/spiders/' + row._id)
-      this.$st.sendEv('爬虫', '查看')
+      this.$st.sendEv('爬虫列表', '查看爬虫')
     },
     onImport () {
       this.$refs.importForm.validate(valid => {
@@ -467,7 +467,7 @@ export default {
             })
         }
       })
-      this.$st.sendEv('爬虫', '导入爬虫')
+      this.$st.sendEv('爬虫列表', '导入爬虫')
     },
     openImportDialog () {
       this.dialogVisible = true
@@ -495,10 +495,6 @@ export default {
         callback(data)
       })
     },
-    onSiteSelect (item) {
-      this.$store.commit('spider/SET_FILTER_SITE', item._id)
-      this.$st.sendEv('爬虫', '搜索网站')
-    },
     onAddConfigurableSiteSelect (item) {
       this.spiderForm.site = item._id
     },
diff --git a/frontend/src/views/task/TaskDetail.vue b/frontend/src/views/task/TaskDetail.vue
index d61394e85..9097344e7 100644
--- a/frontend/src/views/task/TaskDetail.vue
+++ b/frontend/src/views/task/TaskDetail.vue
@@ -97,7 +97,7 @@ export default {
     },
     downloadCSV () {
       this.$store.dispatch('task/getTaskResultExcel', this.$route.params.id)
-      this.$st.sendEv('任务详情-结果', '下载CSV')
+      this.$st.sendEv('任务详情', '结果', '下载CSV')
     },
     getTaskLog () {
       if (this.$route.params.id) {
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index 8013c0806..becc7d0b5 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -221,7 +221,7 @@ export default {
     },
     onRefresh () {
       this.$store.dispatch('task/getTaskList')
-      this.$st.sendEv('任务', '搜索')
+      this.$st.sendEv('任务列表', '搜索')
     },
     onRemoveMultipleTask () {
       if (this.multipleSelection.length === 0) {
@@ -267,20 +267,20 @@ export default {
               message: 'Deleted successfully'
             })
           })
-        this.$st.sendEv('任务', '删除', 'id', row._id)
+        this.$st.sendEv('任务列表', '删除任务')
       })
     },
     onView (row) {
       this.$router.push(`/tasks/${row._id}`)
-      this.$st.sendEv('任务', '搜索', 'id', row._id)
+      this.$st.sendEv('任务列表', '查看任务')
     },
     onClickSpider (row) {
       this.$router.push(`/spiders/${row.spider_id}`)
-      this.$st.sendEv('任务', '点击爬虫详情', 'id', row.spider_id)
+      this.$st.sendEv('任务列表', '点击爬虫详情')
     },
     onClickNode (row) {
       this.$router.push(`/nodes/${row.node_id}`)
-      this.$st.sendEv('任务', '点击节点详情', 'id', row.node_id)
+      this.$st.sendEv('任务列表', '点击节点详情')
     },
     onPageChange () {
       setTimeout(() => {
diff --git a/frontend/src/views/user/UserList.vue b/frontend/src/views/user/UserList.vue
index a0e2029f3..269bd7f8a 100644
--- a/frontend/src/views/user/UserList.vue
+++ b/frontend/src/views/user/UserList.vue
@@ -161,7 +161,7 @@ export default {
               message: this.$t('Deleted successfully')
             })
           })
-        this.$st.sendEv('用户', '删除', 'id', row._id)
+        this.$st.sendEv('用户列表', '删除用户')
       })
       // this.$store.commit('user/SET_USER_FORM', row)
     },
@@ -178,7 +178,7 @@ export default {
             })
         }
       })
-      this.$st.sendEv('用户', '编辑')
+      this.$st.sendEv('用户列表', '编辑用户')
     }
   },
   created () {

From 35e24ba7130752612b4201f1e7ecaa1ae53011dd Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 13 Dec 2019 13:57:59 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json                           | 2 +-
 frontend/src/views/layout/components/Navbar.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 724b5e365..c01ad67e9 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crawlab",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --ip=0.0.0.0 --mode=development",
diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue
index b9e919193..3da8bd3e6 100644
--- a/frontend/src/views/layout/components/Navbar.vue
+++ b/frontend/src/views/layout/components/Navbar.vue
@@ -9,7 +9,7 @@
       </span>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
         <el-dropdown-item>
-          <span style="display:block;">v0.3.5</span>
+          <span style="display:block;">v0.4.1</span>
         </el-dropdown-item>
         <el-dropdown-item>
           <span style="display:block;" @click="logout">{{$t('Logout')}}</span>

From 6d5a17a2c407d9aff392ae6fd67f2f295a8349e8 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 13 Dec 2019 14:02:28 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/layout/components/Navbar.vue     |  6 +++---
 .../src/views/layout/components/Sidebar/index.vue   | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue
index 3da8bd3e6..7a38dc6f9 100644
--- a/frontend/src/views/layout/components/Navbar.vue
+++ b/frontend/src/views/layout/components/Navbar.vue
@@ -8,9 +8,9 @@
         <i class="el-icon-arrow-down el-icon--right"></i>
       </span>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <el-dropdown-item>
-          <span style="display:block;">v0.4.1</span>
-        </el-dropdown-item>
+<!--        <el-dropdown-item>-->
+<!--          <span style="display:block;">v0.4.1</span>-->
+<!--        </el-dropdown-item>-->
         <el-dropdown-item>
           <span style="display:block;" @click="logout">{{$t('Logout')}}</span>
         </el-dropdown-item>
diff --git a/frontend/src/views/layout/components/Sidebar/index.vue b/frontend/src/views/layout/components/Sidebar/index.vue
index 614e6780b..1367cadd7 100644
--- a/frontend/src/views/layout/components/Sidebar/index.vue
+++ b/frontend/src/views/layout/components/Sidebar/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-scrollbar wrap-class="scrollbar-wrapper">
     <div class="sidebar-logo" :class="isCollapse ? 'collapsed' : ''">
-      <span>C</span><span v-show="!isCollapse">rawlab</span>
+      <span>C</span><span v-show="!isCollapse">rawlab<span class="version">v{{version}}</span></span>
     </div>
     <el-menu
       :show-timeout="200"
@@ -48,6 +48,11 @@ export default {
     isCollapse () {
       return !this.sidebar.opened
     }
+  },
+  data () {
+    return {
+      version: '0.4.1'
+    }
   }
 }
 </script>
@@ -73,4 +78,10 @@ export default {
   .sidebar-container .sidebar-logo.collapsed {
     padding-left: 8px;
   }
+
+  .sidebar-container .sidebar-logo .version {
+    margin-left: 5px;
+    font-weight: normal;
+    font-size: 12px;
+  }
 </style>

From ce7d5232b8f906b96f140084124b67c78aef3ecb Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 13 Dec 2019 14:21:32 +0800
Subject: [PATCH 21/21] updated CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93d315a2f..6dd14e2c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 0.4.1 (2019-12-13)
+### Features / Enhancement
+- **Spiderfile Optimization**. Stages changed from dictionary to array. [#358](https://github.com/crawlab-team/crawlab/issues/358)
+- **Baidu Tongji Update**.
+
+### Bug Fixes
+- **Unable to display schedule tasks**. [#353](https://github.com/crawlab-team/crawlab/issues/353)
+- **Duplicate node registration**. [#334](https://github.com/crawlab-team/crawlab/issues/334)
+
 # 0.4.0 (2019-12-06)
 ### Features / Enhancement
 - **Configurable Spider**. Allow users to add spiders using *Spiderfile* to configure crawling rules.