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 1/9] =?UTF-8?q?fix=20=E6=89=A7=E8=A1=8C=E7=88=AC=E8=99=AB?=
 =?UTF-8?q?=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 64f06cd7..b869b506 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 84d218bb..d76f1f9a 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 67c3396b..3cb1a12c 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 2/9] =?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 f4d7b134..7ff9324a 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 3a032b23..44a52517 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 3/9] =?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 00000000..3f0afc7e
--- /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 3f87125d..07adcb4e 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 ef758fb6..02f8a656 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 73b75323..1328f05e 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 38ca35bb..dfa5420e 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 52a6492e..7a8defde 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 4/9] =?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 65170117..c9e24806 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 44ab7218..caa1857d 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 44a52517..e8ed5cd5 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 5/9] =?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 07adcb4e..0d7b7cc1 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 1c63fc3e..a24b36e3 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 856e8589..299661ed 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 3d6edece..c8703ed4 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 22707159..9c5943f5 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 caa1857d..7c705ac3 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 bb182706..9de29000 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 e8ed5cd5..f07de8f9 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 3ab19fee..2c8b73bc 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 6/9] =?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 3f0afc7e..c3104601 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 bffc40be..54f716d0 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 02f8a656..39e1244f 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 1328f05e..d1c3affa 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 be916f10..26cd3b89 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 7/9] =?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 c9e24806..d8f1dbe2 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 f07de8f9..c7d5a4ad 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 2c8b73bc..8013c080 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 8/9] =?UTF-8?q?fix=20=E5=88=A0=E9=99=A4=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B2=A1=E6=9C=89=E7=A1=AE=E8=AE=A4=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

---
 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 c7d5a4ad..0259247e 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 9/9] =?UTF-8?q?fix=20=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=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 d1c3affa..e54c49a3 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 c8703ed4..6b91ed66 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)