From 9a748fc5cd0dac511e363f2dd340363fe41e2679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Thu, 23 Jan 2020 11:09:35 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/conf/config.yml   | 20 ++++++++++----------
 frontend/.env.development |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/backend/conf/config.yml b/backend/conf/config.yml
index 90fa8fe1..6b10a6e2 100644
--- a/backend/conf/config.yml
+++ b/backend/conf/config.yml
@@ -1,25 +1,25 @@
 api:
   address: "localhost:8000"
 mongo:
-  host: localhost
+  host: "192.168.235.26"
   port: 27017
-  db: crawlab_test
-  username: ""
-  password: ""
+  db: crawlab_local
+  username: "root"
+  password: "example"
   authSource: "admin"
 redis:
-  address: localhost
-  password: ""
+  address: 127.0.0.1
+  password:
   database: 1
   port: 6379
 log:
   level: info
-  path: "/var/logs/crawlab"
+  path: "./logs/crawlab"
   isDeletePeriodically: "N"
   deleteFrequency: "@hourly"
 server:
   host: 0.0.0.0
-  port: 8000
+  port: 8001
   master: "Y"
   secret: "crawlab"
   register:
@@ -30,11 +30,11 @@ server:
     python: "Y"
     node: "N"
 spider:
-  path: "/app/spiders"
+  path: "./spiders"
 task:
   workers: 4
 other:
-  tmppath: "/tmp"
+  tmppath: "./tmp"
 version: 0.4.4
 setting:
   allowRegister: "N"
diff --git a/frontend/.env.development b/frontend/.env.development
index 580de54d..a66b7b00 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -1,3 +1,4 @@
 NODE_ENV='development'
 VUE_APP_BASE_URL=http://localhost:8000
 VUE_APP_CRAWLAB_BASE_URL=http://api.crawlab.cn
+

From 092c1a2617426ab6a76ace9c66c8f35b63ac8fd8 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, 28 Jan 2020 15:12:12 +0800
Subject: [PATCH 02/17] =?UTF-8?q?feature=20=E6=96=B0=E5=A2=9E=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/main.go            | 152 +++++++++++++++++++++----------------
 backend/model/variable.go  |  97 +++++++++++++++++++++++
 backend/routes/variable.go |  62 +++++++++++++++
 backend/services/task.go   |   6 +-
 4 files changed, 250 insertions(+), 67 deletions(-)
 create mode 100644 backend/model/variable.go
 create mode 100644 backend/routes/variable.go

diff --git a/backend/main.go b/backend/main.go
index 20d70b22..8841c3f4 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -136,81 +136,101 @@ func main() {
 		}
 		authGroup := app.Group("/", middlewares.AuthorizationMiddleware())
 		{
-			// 路由
 			// 节点
-			authGroup.GET("/nodes", routes.GetNodeList)                            // 节点列表
-			authGroup.GET("/nodes/:id", routes.GetNode)                            // 节点详情
-			authGroup.POST("/nodes/:id", routes.PostNode)                          // 修改节点
-			authGroup.GET("/nodes/:id/tasks", routes.GetNodeTaskList)              // 节点任务列表
-			authGroup.GET("/nodes/:id/system", routes.GetSystemInfo)               // 节点任务列表
-			authGroup.DELETE("/nodes/:id", routes.DeleteNode)                      // 删除节点
-			authGroup.GET("/nodes/:id/langs", routes.GetLangList)                  // 节点语言环境列表
-			authGroup.GET("/nodes/:id/deps", routes.GetDepList)                    // 节点第三方依赖列表
-			authGroup.GET("/nodes/:id/deps/installed", routes.GetInstalledDepList) // 节点已安装第三方依赖列表
-			authGroup.POST("/nodes/:id/deps/install", routes.InstallDep)           // 节点安装依赖
-			authGroup.POST("/nodes/:id/deps/uninstall", routes.UninstallDep)       // 节点卸载依赖
-			authGroup.POST("/nodes/:id/langs/install", routes.InstallLang)         // 节点安装语言
+			{
+				authGroup.GET("/nodes", routes.GetNodeList)                            // 节点列表
+				authGroup.GET("/nodes/:id", routes.GetNode)                            // 节点详情
+				authGroup.POST("/nodes/:id", routes.PostNode)                          // 修改节点
+				authGroup.GET("/nodes/:id/tasks", routes.GetNodeTaskList)              // 节点任务列表
+				authGroup.GET("/nodes/:id/system", routes.GetSystemInfo)               // 节点任务列表
+				authGroup.DELETE("/nodes/:id", routes.DeleteNode)                      // 删除节点
+				authGroup.GET("/nodes/:id/langs", routes.GetLangList)                  // 节点语言环境列表
+				authGroup.GET("/nodes/:id/deps", routes.GetDepList)                    // 节点第三方依赖列表
+				authGroup.GET("/nodes/:id/deps/installed", routes.GetInstalledDepList) // 节点已安装第三方依赖列表
+				authGroup.POST("/nodes/:id/deps/install", routes.InstallDep)           // 节点安装依赖
+				authGroup.POST("/nodes/:id/deps/uninstall", routes.UninstallDep)       // 节点卸载依赖
+				authGroup.POST("/nodes/:id/langs/install", routes.InstallLang)         // 节点安装语言
+			}
 			// 爬虫
-			authGroup.GET("/spiders", routes.GetSpiderList)                     // 爬虫列表
-			authGroup.GET("/spiders/:id", routes.GetSpider)                     // 爬虫详情
-			authGroup.PUT("/spiders", routes.PutSpider)                         // 添加爬虫
-			authGroup.POST("/spiders", routes.UploadSpider)                     // 上传爬虫
-			authGroup.POST("/spiders/:id", routes.PostSpider)                   // 修改爬虫
-			authGroup.POST("/spiders/:id/publish", routes.PublishSpider)        // 发布爬虫
-			authGroup.POST("/spiders/:id/upload", routes.UploadSpiderFromId)    // 上传爬虫（ID）
-			authGroup.DELETE("/spiders/:id", routes.DeleteSpider)               // 删除爬虫
-			authGroup.GET("/spiders/:id/tasks", routes.GetSpiderTasks)          // 爬虫任务列表
-			authGroup.GET("/spiders/:id/file/tree", routes.GetSpiderFileTree)   // 爬虫文件目录树读取
-			authGroup.GET("/spiders/:id/file", routes.GetSpiderFile)            // 爬虫文件读取
-			authGroup.POST("/spiders/:id/file", routes.PostSpiderFile)          // 爬虫文件更改
-			authGroup.PUT("/spiders/:id/file", routes.PutSpiderFile)            // 爬虫文件创建
-			authGroup.PUT("/spiders/:id/dir", routes.PutSpiderDir)              // 爬虫目录创建
-			authGroup.DELETE("/spiders/:id/file", routes.DeleteSpiderFile)      // 爬虫文件删除
-			authGroup.POST("/spiders/:id/file/rename", routes.RenameSpiderFile) // 爬虫文件重命名
-			authGroup.GET("/spiders/:id/dir", routes.GetSpiderDir)              // 爬虫目录
-			authGroup.GET("/spiders/:id/stats", routes.GetSpiderStats)          // 爬虫统计数据
-			authGroup.GET("/spiders/:id/schedules", routes.GetSpiderSchedules)  // 爬虫定时任务
+			{
+				authGroup.GET("/spiders", routes.GetSpiderList)                     // 爬虫列表
+				authGroup.GET("/spiders/:id", routes.GetSpider)                     // 爬虫详情
+				authGroup.PUT("/spiders", routes.PutSpider)                         // 添加爬虫
+				authGroup.POST("/spiders", routes.UploadSpider)                     // 上传爬虫
+				authGroup.POST("/spiders/:id", routes.PostSpider)                   // 修改爬虫
+				authGroup.POST("/spiders/:id/publish", routes.PublishSpider)        // 发布爬虫
+				authGroup.POST("/spiders/:id/upload", routes.UploadSpiderFromId)    // 上传爬虫（ID）
+				authGroup.DELETE("/spiders/:id", routes.DeleteSpider)               // 删除爬虫
+				authGroup.GET("/spiders/:id/tasks", routes.GetSpiderTasks)          // 爬虫任务列表
+				authGroup.GET("/spiders/:id/file/tree", routes.GetSpiderFileTree)   // 爬虫文件目录树读取
+				authGroup.GET("/spiders/:id/file", routes.GetSpiderFile)            // 爬虫文件读取
+				authGroup.POST("/spiders/:id/file", routes.PostSpiderFile)          // 爬虫文件更改
+				authGroup.PUT("/spiders/:id/file", routes.PutSpiderFile)            // 爬虫文件创建
+				authGroup.PUT("/spiders/:id/dir", routes.PutSpiderDir)              // 爬虫目录创建
+				authGroup.DELETE("/spiders/:id/file", routes.DeleteSpiderFile)      // 爬虫文件删除
+				authGroup.POST("/spiders/:id/file/rename", routes.RenameSpiderFile) // 爬虫文件重命名
+				authGroup.GET("/spiders/:id/dir", routes.GetSpiderDir)              // 爬虫目录
+				authGroup.GET("/spiders/:id/stats", routes.GetSpiderStats)          // 爬虫统计数据
+				authGroup.GET("/spiders/:id/schedules", routes.GetSpiderSchedules)  // 爬虫定时任务
+			}
 			// 可配置爬虫
-			authGroup.GET("/config_spiders/:id/config", routes.GetConfigSpiderConfig)           // 获取可配置爬虫配置
-			authGroup.POST("/config_spiders/:id/config", routes.PostConfigSpiderConfig)         // 更改可配置爬虫配置
-			authGroup.PUT("/config_spiders", routes.PutConfigSpider)                            // 添加可配置爬虫
-			authGroup.POST("/config_spiders/:id", routes.PostConfigSpider)                      // 修改可配置爬虫
-			authGroup.POST("/config_spiders/:id/upload", routes.UploadConfigSpider)             // 上传可配置爬虫
-			authGroup.POST("/config_spiders/:id/spiderfile", routes.PostConfigSpiderSpiderfile) // 上传可配置爬虫
-			authGroup.GET("/config_spiders_templates", routes.GetConfigSpiderTemplateList)      // 获取可配置爬虫模版列表
+			{
+				authGroup.GET("/config_spiders/:id/config", routes.GetConfigSpiderConfig)           // 获取可配置爬虫配置
+				authGroup.POST("/config_spiders/:id/config", routes.PostConfigSpiderConfig)         // 更改可配置爬虫配置
+				authGroup.PUT("/config_spiders", routes.PutConfigSpider)                            // 添加可配置爬虫
+				authGroup.POST("/config_spiders/:id", routes.PostConfigSpider)                      // 修改可配置爬虫
+				authGroup.POST("/config_spiders/:id/upload", routes.UploadConfigSpider)             // 上传可配置爬虫
+				authGroup.POST("/config_spiders/:id/spiderfile", routes.PostConfigSpiderSpiderfile) // 上传可配置爬虫
+				authGroup.GET("/config_spiders_templates", routes.GetConfigSpiderTemplateList)      // 获取可配置爬虫模版列表
+			}
 			// 任务
-			authGroup.GET("/tasks", routes.GetTaskList)                                 // 任务列表
-			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)                          // 任务日志
-			authGroup.GET("/tasks/:id/results", routes.GetTaskResults)                  // 任务结果
-			authGroup.GET("/tasks/:id/results/download", routes.DownloadTaskResultsCsv) // 下载任务结果
+			{
+				authGroup.GET("/tasks", routes.GetTaskList)                                 // 任务列表
+				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)                          // 任务日志
+				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.POST("/schedules/:id/disable", routes.DisableSchedule) // 禁用定时任务
-			authGroup.POST("/schedules/:id/enable", routes.EnableSchedule)   // 启用定时任务
+			{
+				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/disable", routes.DisableSchedule) // 禁用定时任务
+				authGroup.POST("/schedules/:id/enable", routes.EnableSchedule)   // 启用定时任务
+			}
+			// 用户
+			{
+				authGroup.GET("/users", routes.GetUserList)       // 用户列表
+				authGroup.GET("/users/:id", routes.GetUser)       // 用户详情
+				authGroup.POST("/users/:id", routes.PostUser)     // 更改用户
+				authGroup.DELETE("/users/:id", routes.DeleteUser) // 删除用户
+				authGroup.GET("/me", routes.GetMe)                // 获取自己账户
+				authGroup.POST("/me", routes.PostMe)              // 修改自己账户
+			}
+			// 系统
+			{
+				authGroup.GET("/system/deps/:lang", routes.GetAllDepList)             // 节点所有第三方依赖列表
+				authGroup.GET("/system/deps/:lang/:dep_name/json", routes.GetDepJson) // 节点第三方依赖JSON
+			}
+			// 全局变量
+			{
+				authGroup.POST("/variable", routes.PostVariable)         // 新增
+				authGroup.PUT("/variable/:id", routes.PutVariable)       //修改
+				authGroup.DELETE("/variable/:id", routes.DeleteVariable) //删除
+				authGroup.GET("/variables", routes.GetVariableList)      // 列表
+			}
 			// 统计数据
 			authGroup.GET("/stats/home", routes.GetHomeStats) // 首页统计数据
-			// 用户
-			authGroup.GET("/users", routes.GetUserList)       // 用户列表
-			authGroup.GET("/users/:id", routes.GetUser)       // 用户详情
-			authGroup.POST("/users/:id", routes.PostUser)     // 更改用户
-			authGroup.DELETE("/users/:id", routes.DeleteUser) // 删除用户
-			authGroup.GET("/me", routes.GetMe)                // 获取自己账户
-			authGroup.POST("/me", routes.PostMe)              // 修改自己账户
 			// release版本
 			authGroup.GET("/version", routes.GetVersion) // 获取发布的版本
-			// 系统
-			authGroup.GET("/system/deps/:lang", routes.GetAllDepList)             // 节点所有第三方依赖列表
-			authGroup.GET("/system/deps/:lang/:dep_name/json", routes.GetDepJson) // 节点第三方依赖JSON
 			// 文件
 			authGroup.GET("/file", routes.GetFile) // 获取文件
 		}
diff --git a/backend/model/variable.go b/backend/model/variable.go
new file mode 100644
index 00000000..3af2188e
--- /dev/null
+++ b/backend/model/variable.go
@@ -0,0 +1,97 @@
+package model
+
+import (
+	"crawlab/database"
+	"errors"
+	"github.com/apex/log"
+	"github.com/globalsign/mgo/bson"
+	"runtime/debug"
+)
+
+/**
+全局变量
+*/
+
+type Variable struct {
+	Id     bson.ObjectId `json:"_id" bson:"_id"`
+	Key    string        `json:"key" bson:"key"`
+	Value  string        `json:"value" bson:"value"`
+	Remark string        `json:"remark" bson:"remark"`
+}
+
+func (model *Variable) Save() error {
+	s, c := database.GetCol("variable")
+	defer s.Close()
+
+	if err := c.UpdateId(model.Id, model); err != nil {
+		log.Errorf("update variable error: %s", err.Error())
+		return err
+	}
+	return nil
+}
+
+func (model *Variable) Add() error {
+	s, c := database.GetCol("variable")
+	defer s.Close()
+
+	// key 去重
+	_, err := GetByKey(model.Key)
+	if err == nil {
+		return errors.New("key already exists")
+	}
+
+	model.Id = bson.NewObjectId()
+	if err := c.Insert(model); err != nil {
+		log.Errorf("add variable error: %s", err.Error())
+		debug.PrintStack()
+		return err
+	}
+	return nil
+}
+
+func (model *Variable) Delete() error {
+	s, c := database.GetCol("variable")
+	defer s.Close()
+
+	if err := c.RemoveId(model.Id); err != nil {
+		log.Errorf("remove variable error: %s", err.Error())
+		debug.PrintStack()
+		return err
+	}
+	return nil
+}
+
+func GetByKey(key string) (Variable, error) {
+	s, c := database.GetCol("variable")
+	defer s.Close()
+
+	var model Variable
+	if err := c.Find(bson.M{"key": key}).One(&model); err != nil {
+		log.Errorf("variable found error: %s, key: %s", err.Error(), key)
+		return model, err
+	}
+	return model, nil
+}
+
+func GetVariable(id bson.ObjectId) (Variable, error) {
+	s, c := database.GetCol("variable")
+	defer s.Close()
+
+	var model Variable
+	if err := c.FindId(id).One(&model); err != nil {
+		log.Errorf("variable found error: %s", err.Error())
+		return model, err
+	}
+	return model, nil
+}
+
+func GetVariableList() []Variable {
+	s, c := database.GetCol("variable")
+	defer s.Close()
+
+	var list []Variable
+	if err := c.Find(nil).All(&list); err != nil {
+
+	}
+	return list
+}
diff --git a/backend/routes/variable.go b/backend/routes/variable.go
new file mode 100644
index 00000000..56f51ed7
--- /dev/null
+++ b/backend/routes/variable.go
@@ -0,0 +1,62 @@
+package routes
+
+import (
+	"crawlab/model"
+	"github.com/gin-gonic/gin"
+	"github.com/globalsign/mgo/bson"
+	"net/http"
+)
+
+// 新增
+func PostVariable(c *gin.Context) {
+	var variable model.Variable
+	if err := c.ShouldBindJSON(&variable); err != nil {
+		HandleError(http.StatusBadRequest, c, err)
+		return
+	}
+	if err := variable.Add(); err != nil {
+		HandleError(http.StatusInternalServerError, c, err)
+		return
+	}
+	HandleSuccess(c)
+}
+
+// 修改
+func PutVariable(c *gin.Context) {
+	var id = c.Param("id")
+	var variable model.Variable
+	if err := c.ShouldBindJSON(&variable); err != nil {
+		HandleError(http.StatusBadRequest, c, err)
+		return
+	}
+	variable.Id = bson.ObjectIdHex(id)
+	if err := variable.Save(); err != nil {
+		HandleError(http.StatusInternalServerError, c, err)
+		return
+	}
+	HandleSuccess(c)
+}
+
+// 删除
+func DeleteVariable(c *gin.Context) {
+	var idStr = c.Param("id")
+	var id = bson.ObjectIdHex(idStr)
+	variable, err := model.GetVariable(id)
+	if err != nil {
+		HandleError(http.StatusInternalServerError, c, err)
+		return
+	}
+	variable.Id = id
+	if err := variable.Delete(); err != nil {
+		HandleError(http.StatusInternalServerError, c, err)
+		return
+	}
+	HandleSuccess(c)
+
+}
+
+// 列表
+func GetVariableList(c *gin.Context) {
+	list := model.GetVariableList()
+	HandleSuccessData(c, list)
+}
diff --git a/backend/services/task.go b/backend/services/task.go
index da4eabc8..b41f0d81 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -144,7 +144,11 @@ func SetEnv(cmd *exec.Cmd, envs []model.Env, taskId string, dataCol string) *exe
 		cmd.Env = append(cmd.Env, env.Name+"="+env.Value)
 	}
 
-	// TODO 全局环境变量
+	// 全局环境变量
+	variables := model.GetVariableList()
+	for _, variable := range variables {
+		cmd.Env = append(cmd.Env, variable.Key+"="+variable.Value)
+	}
 	return cmd
 }
 

From 123e3835d25a874659e484c3706f7eb7db63fe01 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, 28 Jan 2020 15:12:33 +0800
Subject: [PATCH 03/17] =?UTF-8?q?feature=20=E6=96=B0=E5=A2=9E=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                |   5 +
 frontend/src/store/modules/user.js     |  22 +++
 frontend/src/views/setting/Setting.vue | 181 +++++++++++++++++++------
 3 files changed, 164 insertions(+), 44 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index a5dddfcc..fc8b7303 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -361,6 +361,11 @@ export default {
   'Never': '从不',
   'DingTalk Robot Webhook': '钉钉机器人 Webhook',
   'Wechat Robot Webhook': '微信机器人 Webhook',
+  'Password Settings': '密码设置',
+  'Notify Settings': '通知设置',
+  'Global Variable': '全局变量',
+  'Add Global Variable': '新增全局变量',
+  'Are you sure to delete this global variable': '确定删除该全局变量？',
 
   // 其他
   tagsView: {
diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js
index af778816..3324ba15 100644
--- a/frontend/src/store/modules/user.js
+++ b/frontend/src/store/modules/user.js
@@ -9,6 +9,8 @@ const user = {
     avatar: '',
     roles: [],
     userList: [],
+    globalVariableList: [],
+    globalVariableForm: {},
     userForm: {},
     userInfo: undefined,
     adminPaths: [
@@ -61,6 +63,9 @@ const user = {
     },
     SET_TOTAL_COUNT: (state, value) => {
       state.totalCount = value
+    },
+    SET_GLOBAL_VARIABLE_LIST: (state, value) => {
+      state.globalVariableList = value
     }
   },
 
@@ -148,6 +153,23 @@ const user = {
     // 添加用户
     addUser ({ dispatch, commit, state }) {
       return request.put('/users', state.userForm)
+    },
+    // 新增全局变量
+    addGlobalVariable ({ commit, state }) {
+      return request.post(`/variable`, state.globalVariableForm)
+        .then(() => {
+          state.globalVariableForm = {}
+        })
+    },
+    // 获取全局变量列表
+    getGlobalVariable ({ commit, state }) {
+      request.get('/variables').then((response) => {
+        commit('SET_GLOBAL_VARIABLE_LIST', response.data.data)
+      })
+    },
+    // 删除全局变量
+    deleteGlobalVariable ({ commit, state }, id) {
+      return request.delete(`/variable/${id}`)
     }
   }
 }
diff --git a/frontend/src/views/setting/Setting.vue b/frontend/src/views/setting/Setting.vue
index e82d47b6..0eade556 100644
--- a/frontend/src/views/setting/Setting.vue
+++ b/frontend/src/views/setting/Setting.vue
@@ -1,47 +1,98 @@
 <template>
   <div class="app-container">
+    <!-- 新增全局变量 -->
+    <el-dialog :title="$t('Add Global Variable')"
+               :visible.sync="addDialogVisible">
+      <el-form label-width="80px" ref="globalVariableForm">
+        <el-form-item label="Key">
+          <el-input size="small" v-model="globalVariableForm.key"/>
+        </el-form-item>
+        <el-form-item label="Value">
+          <el-input size="small" v-model="globalVariableForm.value"/>
+        </el-form-item>
+        <el-form-item label="Remark">
+          <el-input size="small" v-model="globalVariableForm.remark"/>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="addDialogVisible = false" type="danger" size="small">{{$t('Cancel')}}</el-button>
+          <el-button @click="addGlobalVariableHandle(false)" type="success" size="small">{{$t('Save')}}</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
+    <el-tabs v-model="activeName" @tab-click="tabActiveHandle">
+      <el-tab-pane :label="$t('Password Settings')" name="passwordSetting">
+        <el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="200px" :rules="rules"
+                 inline-message>
+          <el-form-item prop="username" :label="$t('Username')">
+            <el-input v-model="userInfo.username" disabled></el-input>
+          </el-form-item>
+          <el-form-item prop="password" :label="$t('Password')">
+            <el-input v-model="userInfo.password" type="password" :placeholder="$t('Password')"></el-input>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('Notify Settings')" name="notifySetting">
+        <el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="200px" :rules="rules"
+                 inline-message>
+          <el-form-item :label="$t('Notification Trigger Timing')">
+            <el-radio-group v-model="userInfo.setting.notification_trigger">
+              <el-radio label="notification_trigger_on_task_end">
+                {{$t('On Task End')}}
+              </el-radio>
+              <el-radio label="notification_trigger_on_task_error">
+                {{$t('On Task Error')}}
+              </el-radio>
+              <el-radio label="notification_trigger_never">
+                {{$t('Never')}}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item prop="enabledNotifications" :label="$t('消息通知方式')">
+            <el-checkbox-group v-model="userInfo.setting.enabled_notifications">
+              <el-checkbox label="notification_type_mail">{{$t('邮件')}}</el-checkbox>
+              <el-checkbox label="notification_type_ding_talk">{{$t('钉钉')}}</el-checkbox>
+              <el-checkbox label="notification_type_wechat">{{$t('企业微信')}}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item prop="email" :label="$t('Email')">
+            <el-input v-model="userInfo.email" :placeholder="$t('Email')"></el-input>
+          </el-form-item>
+          <el-form-item prop="setting.ding_talk_robot_webhook" :label="$t('DingTalk Robot Webhook')">
+            <el-input v-model="userInfo.setting.ding_talk_robot_webhook"
+                      :placeholder="$t('DingTalk Robot Webhook')"></el-input>
+          </el-form-item>
+          <el-form-item prop="setting.wechat_robot_webhook" :label="$t('Wechat Robot Webhook')">
+            <el-input v-model="userInfo.setting.wechat_robot_webhook" :placeholder="$t('Wechat Robot Webhook')"></el-input>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('Global Variable')" name="globalVariable">
+        <el-form :inline="true">
+          <el-form-item>
+            <el-button size="mini" @click="addGlobalVariableHandle(true)"
+                       type="success">
+              {{$t('Add')}}
+            </el-button>
+          </el-form-item>
+        </el-form>
+        <el-table :data="globalVariableList" border>
+          <el-table-column prop="key" label="Key"/>
+          <el-table-column prop="value" label="Value"/>
+          <el-table-column prop="remark" label="Remark"/>
+          <el-table-column prop="" :label="$t('Action')" width="80">
+            <template slot-scope="scope">
+              <el-button @click="deleteGlobalVariableHandle(scope.row._id)" icon="el-icon-delete" type="danger" size="mini"></el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
     <el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="200px" :rules="rules"
-             inline-message>
-      <el-form-item prop="username" :label="$t('Username')">
-        <el-input v-model="userInfo.username" disabled></el-input>
-      </el-form-item>
-      <el-form-item prop="password" :label="$t('Password')">
-        <el-input v-model="userInfo.password" type="password" :placeholder="$t('Password')"></el-input>
-      </el-form-item>
-      <div style="border-bottom: 1px solid #DCDFE6"></div>
-      <el-form-item :label="$t('Notification Trigger Timing')">
-        <el-radio-group v-model="userInfo.setting.notification_trigger">
-          <el-radio label="notification_trigger_on_task_end">
-            {{$t('On Task End')}}
-          </el-radio>
-          <el-radio label="notification_trigger_on_task_error">
-            {{$t('On Task Error')}}
-          </el-radio>
-          <el-radio label="notification_trigger_never">
-            {{$t('Never')}}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item prop="enabledNotifications" :label="$t('消息通知方式')">
-        <el-checkbox-group v-model="userInfo.setting.enabled_notifications">
-          <el-checkbox label="notification_type_mail">{{$t('邮件')}}</el-checkbox>
-          <el-checkbox label="notification_type_ding_talk">{{$t('钉钉')}}</el-checkbox>
-          <el-checkbox label="notification_type_wechat">{{$t('企业微信')}}</el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item prop="email" :label="$t('Email')">
-        <el-input v-model="userInfo.email" :placeholder="$t('Email')"></el-input>
-      </el-form-item>
-      <el-form-item prop="setting.ding_talk_robot_webhook" :label="$t('DingTalk Robot Webhook')">
-        <el-input v-model="userInfo.setting.ding_talk_robot_webhook"
-                  :placeholder="$t('DingTalk Robot Webhook')"></el-input>
-      </el-form-item>
-      <el-form-item prop="setting.wechat_robot_webhook" :label="$t('Wechat Robot Webhook')">
-        <el-input v-model="userInfo.setting.wechat_robot_webhook" :placeholder="$t('Wechat Robot Webhook')"></el-input>
-      </el-form-item>
+             inline-message v-if="activeName !== 'globalVariable'">
       <el-form-item>
         <div class="buttons">
-          <el-button type="success" @click="saveUserInfo">{{$t('Save')}}</el-button>
+          <el-button size="small" type="success" @click="saveUserInfo">{{$t('Save')}}</el-button>
         </div>
       </el-form-item>
     </el-form>
@@ -49,6 +100,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: 'Setting',
   data () {
@@ -92,16 +144,55 @@ export default {
         'setting.ding_talk_robot_webhook': [{ trigger: 'blur', validator: validateDingTalkRobotWebhook }],
         'setting.wechat_robot_webhook': [{ trigger: 'blur', validator: validateWechatRobotWebhook }]
       },
-      isShowDingTalkAppSecret: false
+      isShowDingTalkAppSecret: false,
+      activeName: 'passwordSetting',
+      addDialogVisible: false
     }
   },
+  computed: {
+    ...mapState('user', [
+      'globalVariableList',
+      'globalVariableForm'
+    ])
+  },
   methods: {
+    deleteGlobalVariableHandle (id) {
+      this.$confirm(this.$t('Are you sure to delete this global variable'), this.$t('Notification'), {
+        confirmButtonText: this.$t('Confirm'),
+        cancelButtonText: this.$t('Cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('user/deleteGlobalVariable', id).then(() => {
+          this.$store.dispatch('user/getGlobalVariable')
+        })
+      }).catch(() => {})
+    },
+    addGlobalVariableHandle (isShow) {
+      if (isShow) {
+        this.addDialogVisible = true
+        return
+      }
+      this.$store.dispatch('user/addGlobalVariable')
+        .then(() => {
+          this.addDialogVisible = false
+          this.$st.sendEv('设置', '添加全局变量')
+        })
+        .then(() => {
+          this.$store.dispatch('user/getGlobalVariable')
+        })
+    },
     getUserInfo () {
       const data = localStorage.getItem('user_info')
-      if (!data) return {}
+      if (!data) {
+        return {}
+      }
       this.userInfo = JSON.parse(data)
-      if (!this.userInfo.setting) this.userInfo.setting = {}
-      if (!this.userInfo.setting.enabled_notifications) this.userInfo.setting.enabled_notifications = []
+      if (!this.userInfo.setting) {
+        this.userInfo.setting = {}
+      }
+      if (!this.userInfo.setting.enabled_notifications) {
+        this.userInfo.setting.enabled_notifications = []
+      }
     },
     saveUserInfo () {
       this.$refs['setting-form'].validate(async valid => {
@@ -114,10 +205,12 @@ export default {
         }
       })
       this.$st.sendEv('设置', '保存')
-    }
+    },
+    tabActiveHandle () {}
   },
   async created () {
     await this.$store.dispatch('user/getInfo')
+    this.$store.dispatch('user/getGlobalVariable')
     this.getUserInfo()
   }
 }

From 81edf9ab7240db5dee03a78ab47765f991951111 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, 28 Jan 2020 15:43:57 +0800
Subject: [PATCH 04/17] =?UTF-8?q?fix=20=E6=97=A0=E6=B3=95=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=AD=A5=E7=88=AC=E8=99=AB=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/services/spider.go                | 16 ++------
 backend/services/spider_handler/spider.go |  6 +++
 backend/services/task.go                  | 50 +++++++++++++----------
 backend/utils/file.go                     |  7 ++++
 4 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/backend/services/spider.go b/backend/services/spider.go
index e97c7992..fe162f12 100644
--- a/backend/services/spider.go
+++ b/backend/services/spider.go
@@ -12,12 +12,11 @@ import (
 	"github.com/apex/log"
 	"github.com/globalsign/mgo"
 	"github.com/globalsign/mgo/bson"
-	uuid "github.com/satori/go.uuid"
+	"github.com/satori/go.uuid"
 	"github.com/spf13/viper"
 	"os"
 	"path/filepath"
 	"runtime/debug"
-	"strings"
 )
 
 type SpiderFileData struct {
@@ -192,21 +191,14 @@ func PublishSpider(spider model.Spider) {
 	md5 := filepath.Join(path, spider_handler.Md5File)
 	if !utils.Exists(md5) {
 		log.Infof("md5 file not found: %s", md5)
-		spiderSync.RemoveSpiderFile()
-		spiderSync.Download()
-		spiderSync.CreateMd5File(gfFile.Md5)
+		spiderSync.RemoveDownCreate(gfFile.Md5)
 		return
 	}
 	// md5值不一样，则下载
-	md5Str := utils.ReadFileOneLine(md5)
-	// 去掉空格以及换行符
-	md5Str = strings.Replace(md5Str, " ", "", -1)
-	md5Str = strings.Replace(md5Str, "\n", "", -1)
+	md5Str := utils.GetSpiderMd5Str(md5)
 	if gfFile.Md5 != md5Str {
 		log.Infof("md5 is different, gf-md5:%s, file-md5:%s", gfFile.Md5, md5Str)
-		spiderSync.RemoveSpiderFile()
-		spiderSync.Download()
-		spiderSync.CreateMd5File(gfFile.Md5)
+		spiderSync.RemoveDownCreate(gfFile.Md5)
 		return
 	}
 }
diff --git a/backend/services/spider_handler/spider.go b/backend/services/spider_handler/spider.go
index c3a2500d..cd8a1dbe 100644
--- a/backend/services/spider_handler/spider.go
+++ b/backend/services/spider_handler/spider.go
@@ -38,6 +38,12 @@ func (s *SpiderSync) CreateMd5File(md5 string) {
 	}
 }
 
+func (s *SpiderSync) RemoveDownCreate(md5 string) {
+	s.RemoveSpiderFile()
+	s.Download()
+	s.CreateMd5File(md5)
+}
+
 // 获得下载锁的key
 func (s *SpiderSync) GetLockDownloadKey(spiderId string) string {
 	node, _ := model.GetCurrentNode()
diff --git a/backend/services/task.go b/backend/services/task.go
index b41f0d81..15513977 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -7,6 +7,7 @@ import (
 	"crawlab/lib/cron"
 	"crawlab/model"
 	"crawlab/services/notification"
+	"crawlab/services/spider_handler"
 	"crawlab/utils"
 	"encoding/json"
 	"errors"
@@ -450,15 +451,9 @@ 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()
+	// 文件检查
+	if err := SpiderFileCheck(t, spider); err != nil {
+		log.Errorf("spider file check error: %s", err.Error())
 		return
 	}
 
@@ -538,6 +533,30 @@ func ExecuteTask(id int) {
 	log.Infof(GetWorkerPrefix(id) + "任务(ID:" + t.Id + ")" + "执行完毕. 消耗时间:" + durationStr + "秒")
 }
 
+func SpiderFileCheck(t model.Task, spider model.Spider) error {
+	// 判断爬虫文件是否存在
+	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 errors.New(t.Error)
+	}
+
+	// 判断md5值是否一致
+	path := filepath.Join(viper.GetString("spider.path"), spider.Name)
+	md5File := filepath.Join(path, spider_handler.Md5File)
+	md5 := utils.GetSpiderMd5Str(md5File)
+	if gfFile.Md5 != md5 {
+		spiderSync := spider_handler.SpiderSync{Spider: spider}
+		spiderSync.RemoveDownCreate(gfFile.Md5)
+	}
+	return nil
+}
+
 func GetTaskLog(id string) (logStr string, err error) {
 	task, err := model.GetTask(id)
 
@@ -680,19 +699,6 @@ func AddTask(t model.Task) error {
 	return nil
 }
 
-func HandleTaskError(t model.Task, err error) {
-	log.Error("handle task error:" + err.Error())
-	t.Status = constants.StatusError
-	t.Error = err.Error()
-	t.FinishTs = time.Now()
-	if err := t.Save(); err != nil {
-		log.Errorf(err.Error())
-		debug.PrintStack()
-		return
-	}
-	debug.PrintStack()
-}
-
 func GetTaskEmailMarkdownContent(t model.Task, s model.Spider) string {
 	n, _ := model.GetNode(t.NodeId)
 	errMsg := ""
diff --git a/backend/utils/file.go b/backend/utils/file.go
index c71b2cb0..bfe92bd3 100644
--- a/backend/utils/file.go
+++ b/backend/utils/file.go
@@ -33,7 +33,14 @@ func ReadFileOneLine(fileName string) string {
 		return ""
 	}
 	return line
+}
 
+func GetSpiderMd5Str(file string) string {
+	md5Str := ReadFileOneLine(file)
+	// 去掉空格以及换行符
+	md5Str = strings.Replace(md5Str, " ", "", -1)
+	md5Str = strings.Replace(md5Str, "\n", "", -1)
+	return md5Str
 }
 
 // 创建文件

From af190f36cc1d7c8b23e0b1949f0f7a8a8795bad9 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, 28 Jan 2020 15:46:15 +0800
Subject: [PATCH 05/17] =?UTF-8?q?fix=20=E5=9B=9E=E9=80=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/conf/config.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/conf/config.yml b/backend/conf/config.yml
index 6b10a6e2..e5dcb1f9 100644
--- a/backend/conf/config.yml
+++ b/backend/conf/config.yml
@@ -1,25 +1,25 @@
 api:
   address: "localhost:8000"
 mongo:
-  host: "192.168.235.26"
+  host: localhost
   port: 27017
-  db: crawlab_local
-  username: "root"
-  password: "example"
+  db: crawlab_test
+  username: ""
+  password: ""
   authSource: "admin"
 redis:
-  address: 127.0.0.1
-  password:
+  address: localhost
+  password: ""
   database: 1
   port: 6379
 log:
   level: info
-  path: "./logs/crawlab"
+  path: "/var/logs/crawlab"
   isDeletePeriodically: "N"
   deleteFrequency: "@hourly"
 server:
   host: 0.0.0.0
-  port: 8001
+  port: 8000
   master: "Y"
   secret: "crawlab"
   register:
@@ -30,11 +30,11 @@ server:
     python: "Y"
     node: "N"
 spider:
-  path: "./spiders"
+  path: "/app/spiders"
 task:
   workers: 4
 other:
-  tmppath: "./tmp"
+  tmppath: "/tmp"
 version: 0.4.4
 setting:
   allowRegister: "N"
@@ -46,4 +46,4 @@ notification:
     senderIdentity: ''
     smtp:
       user: ''
-      password: ''
+      password: ''
\ No newline at end of file

From 29959c9e7555f4d92d0df4634d1cc20a44ee37b1 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 11:58:12 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=99=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/task/TaskList.vue | 58 ++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index b6001a5e..51b52547 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -1,10 +1,19 @@
 <template>
   <div class="app-container">
+    <!--tour-->
+    <v-tour
+      name="task-list"
+      :steps="tourSteps"
+      :callbacks="tourCallbacks"
+      :options="$utils.tour.getOptions(true)"
+    />
+    <!--./tour-->
+
     <el-card style="border-radius: 0">
       <!--filter-->
       <div class="filter">
         <div class="left">
-          <el-form :model="filter" label-width="100px" label-position="right" inline>
+          <el-form class="filter-form" :model="filter" label-width="100px" label-position="right" inline>
             <el-form-item prop="node_id" :label="$t('Node')">
               <el-select v-model="filter.node_id" size="small" :placeholder="$t('Node')" @change="onFilterChange">
                 <el-option value="" :label="$t('All')"/>
@@ -29,7 +38,7 @@
           </el-form>
         </div>
         <div class="right">
-          <el-button @click="onRemoveMultipleTask" size="small" type="danger">
+          <el-button class="btn-delete" @click="onRemoveMultipleTask" size="small" type="danger">
             删除任务
           </el-button>
         </div>
@@ -191,7 +200,46 @@ export default {
         // { name: 'avg_num_results', label: 'Average Results Count per Second', width: '80' }
       ],
 
-      multipleSelection: []
+      multipleSelection: [],
+
+      // tutorial
+      tourSteps: [
+        {
+          target: '.filter-form',
+          content: this.$t('You can filter tasks from this area.')
+        },
+        {
+          target: '.table',
+          content: this.$t('This is a list of spider tasks executed sorted in a descending order.')
+        },
+        {
+          target: '.table .el-table__body-wrapper tr:nth-child(1)',
+          content: this.$t('Click the row to or the view button to view the task detail.')
+        },
+        {
+          target: '.table tr td:nth-child(1)',
+          content: this.$t('Tick and select the tasks you would like to delete in batches.'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '.btn-delete',
+          content: this.$t('Click this button to delete selected tasks.'),
+          params: {
+            placement: 'left'
+          }
+        }
+      ],
+      tourCallbacks: {
+        onStop: () => {
+          this.$utils.tour.finishTour('task-list')
+        },
+        onPreviousStep: (currentStep) => {
+        },
+        onNextStep: (currentStep) => {
+        }
+      }
     }
   },
   computed: {
@@ -350,6 +398,10 @@ export default {
     this.handle = setInterval(() => {
       this.$store.dispatch('task/getTaskList')
     }, 5000)
+
+    if (!this.$utils.tour.isFinishedTour('task-list')) {
+      this.$tours['task-list'].start()
+    }
   },
   destroyed () {
     clearInterval(this.handle)

From 5cba21894eebadf1d2f2a03eae9a69702f20dd9d Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 12:20:04 +0800
Subject: [PATCH 07/17] code cleanup

---
 frontend/src/views/result/ResultDetail.vue | 95 ----------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 frontend/src/views/result/ResultDetail.vue

diff --git a/frontend/src/views/result/ResultDetail.vue b/frontend/src/views/result/ResultDetail.vue
deleted file mode 100644
index df8487ef..00000000
--- a/frontend/src/views/result/ResultDetail.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--selector-->
-    <div class="selector">
-      <label class="label">Spider: </label>
-      <el-select v-model="spiderForm._id" @change="onSpiderChange">
-        <el-option v-for="op in spiderList" :key="op._id" :value="op._id" :label="op.name"></el-option>
-      </el-select>
-    </div>
-
-    <!--tabs-->
-    <el-tabs v-model="activeTabName" @tab-click="onTabClick" type="card">
-      <el-tab-pane label="Overview" name="overview">
-        <spider-overview/>
-      </el-tab-pane>
-      <el-tab-pane label="Files" name="files">
-        <file-list/>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import {
-  mapState
-} from 'vuex'
-import FileList from '../../components/File/FileList'
-import SpiderOverview from '../../components/Overview/SpiderOverview'
-
-export default {
-  name: 'ResultDetail',
-  components: {
-    FileList,
-    SpiderOverview
-  },
-  data () {
-    return {
-      activeTabName: 'overview'
-    }
-  },
-  computed: {
-    ...mapState('spider', [
-      'spiderList',
-      'spiderForm'
-    ]),
-    ...mapState('file', [
-      'currentPath'
-    ]),
-    ...mapState('deploy', [
-      'deployList'
-    ])
-  },
-  methods: {
-    onTabClick () {
-    },
-    onSpiderChange (id) {
-      this.$router.push(`/spiders/${id}`)
-    }
-  },
-  created () {
-    // get the list of the spiders
-    // this.$store.dispatch('spider/getSpiderList')
-
-    // get spider basic info
-    this.$store.dispatch('spider/getSpiderData', this.$route.params.id)
-      .then(() => {
-        // get spider file info
-        this.$store.dispatch('file/getFileList', this.spiderForm.src)
-      })
-
-    // get spider deploys
-    this.$store.dispatch('spider/getDeployList', this.$route.params.id)
-
-    // get spider tasks
-    this.$store.dispatch('spider/getTaskList', this.$route.params.id)
-  }
-}
-</script>
-
-<style scoped>
-
-  .selector {
-    display: flex;
-    align-items: center;
-    position: absolute;
-    right: 20px;
-    /*float: right;*/
-    z-index: 999;
-    margin-top: -7px;
-  }
-
-  .selector .el-select {
-    padding-left: 10px;
-  }
-</style>

From 7e5d4c64504f659858c18d2c41ed8d1edb7ad8d3 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 12:22:05 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=99=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Overview/TaskOverview.vue  | 34 +++++--
 frontend/src/views/task/TaskDetail.vue        | 91 ++++++++++++++++++-
 2 files changed, 113 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Overview/TaskOverview.vue b/frontend/src/components/Overview/TaskOverview.vue
index cd3de0a8..ad929159 100644
--- a/frontend/src/components/Overview/TaskOverview.vue
+++ b/frontend/src/components/Overview/TaskOverview.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row>
     <el-col :span="12" style="padding-right: 20px;">
-      <el-row>
+      <el-row class="task-info-overview-wrapper wrapper">
         <h4 class="title">{{$t('Task Info')}}</h4>
         <task-info-view/>
       </el-row>
@@ -9,12 +9,16 @@
     </el-col>
 
     <el-col :span="12">
-      <el-row>
-        <h4 class="title spider-title" @click="onClickSpiderTitle">{{$t('Spider Info')}}</h4>
+      <el-row class="task-info-spider-wrapper wrapper">
+        <h4 class="title spider-title" @click="onClickSpiderTitle">
+          <i class="fa fa-search" style="margin-right: 5px"></i>
+          {{$t('Spider Info')}}</h4>
         <spider-info-view :is-view="true"/>
       </el-row>
-      <el-row>
-        <h4 class="title node-title" @click="onClickNodeTitle">{{$t('Node Info')}}</h4>
+      <el-row class="task-info-node-wrapper wrapper">
+        <h4 class="title node-title" @click="onClickNodeTitle">
+          <i class="fa fa-search" style="margin-right: 5px"></i>
+          {{$t('Node Info')}}</h4>
         <node-info-view :is-view="true"/>
       </el-row>
     </el-col>
@@ -67,6 +71,12 @@ export default {
 <style scoped>
   .title {
     margin: 10px 0 3px 0;
+    text-align: center;
+    display: inline-block;
+  }
+
+  .wrapper {
+    text-align: center;
   }
 
   .spider-form {
@@ -79,13 +89,17 @@ export default {
     text-align: right;
   }
 
-  .title {
-    text-align: center;
-  }
-
   .node-title,
   .spider-title {
-    text-decoration: underline;
     cursor: pointer;
   }
+
+  .node-title:hover,
+  .spider-title:hover {
+    text-decoration: underline;
+  }
+
+  .title > i {
+    color: grey;
+  }
 </style>
diff --git a/frontend/src/views/task/TaskDetail.vue b/frontend/src/views/task/TaskDetail.vue
index 9097344e..05217c1c 100644
--- a/frontend/src/views/task/TaskDetail.vue
+++ b/frontend/src/views/task/TaskDetail.vue
@@ -1,5 +1,14 @@
 <template>
   <div class="app-container">
+    <!--tour-->
+    <v-tour
+      name="task-detail"
+      :steps="tourSteps"
+      :callbacks="tourCallbacks"
+      :options="$utils.tour.getOptions(true)"
+    />
+    <!--./tour-->
+
     <!--tabs-->
     <el-tabs v-model="activeTabName" @tab-click="onTabClick" type="card">
       <el-tab-pane :label="$t('Overview')" name="overview">
@@ -12,7 +21,7 @@
       </el-tab-pane>
       <el-tab-pane :label="$t('Results')" name="results">
         <div class="button-group">
-          <el-button type="primary" icon="el-icon-download" @click="downloadCSV">
+          <el-button class="btn-download" type="primary" icon="el-icon-download" @click="downloadCSV">
             {{$t('Download CSV')}}
           </el-button>
         </div>
@@ -48,7 +57,80 @@ export default {
     return {
       activeTabName: 'overview',
       handle: undefined,
-      taskLog: ''
+      taskLog: '',
+
+      // tutorial
+      tourSteps: [
+        // overview
+        {
+          target: '.task-info-overview-wrapper',
+          content: this.$t('This is the info of the task detail.'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '.task-info-spider-wrapper',
+          content: this.$t('This is the spider info of the task.'),
+          params: {
+            placement: 'left'
+          }
+        },
+        {
+          target: '.spider-title',
+          content: this.$t('You can click to view the spider detail for the task.'),
+          params: {
+            placement: 'left'
+          }
+        },
+        {
+          target: '.task-info-node-wrapper',
+          content: this.$t('This is the node info of the task.'),
+          params: {
+            placement: 'left'
+          }
+        },
+        {
+          target: '.node-title',
+          content: this.$t('You can click to view the node detail for the task.'),
+          params: {
+            placement: 'left'
+          }
+        },
+        // log
+        {
+          target: '#tab-log',
+          content: this.$t('Here you can view the log<br> details for the task. The<br> log is automatically updated.')
+        },
+        // results
+        {
+          target: '#tab-results',
+          content: this.$t('Here you can view the results scraped by the spider.<br><br><strong>Note:</strong> If you find your results here are empty, please refer to the <a href="https://docs.crawlab.cn/Integration/" target="_blank" style="color: #409EFF">Documentation (Chinese)</a> about how to integrate your spider into Crawlab.')
+        },
+        {
+          target: '.btn-download',
+          content: this.$t('You can download your results as a CSV file by clicking this button.')
+        }
+      ],
+      tourCallbacks: {
+        onStop: () => {
+          this.$utils.tour.finishTour('task-detail')
+        },
+        onPreviousStep: (currentStep) => {
+          if (currentStep === 5) {
+            this.activeTabName = 'overview'
+          } else if (currentStep === 6) {
+            this.activeTabName = 'log'
+          }
+        },
+        onNextStep: (currentStep) => {
+          if (currentStep === 4) {
+            this.activeTabName = 'log'
+          } else if (currentStep === 5) {
+            this.activeTabName = 'results'
+          }
+        }
+      }
     }
   },
   computed: {
@@ -116,6 +198,11 @@ export default {
       this.getTaskLog()
     }, 5000)
   },
+  mounted () {
+    if (!this.$utils.tour.isFinishedTour('task-detail')) {
+      this.$tours['task-detail'].start()
+    }
+  },
   destroyed () {
     clearInterval(this.handle)
   }

From a9a3fcee03bc8ddbeb828e7ea003a4e2a28d6f8b Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 12:46:49 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=99=E7=A8=8B=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                  | 15 ++++++++++++++-
 frontend/src/views/spider/SpiderList.vue |  2 +-
 frontend/src/views/task/TaskList.vue     |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 41585438..96932d44 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -411,7 +411,7 @@ docker run -d --restart always --name crawlab_worker \\
   'Previous': '上一步',
   'Next': '下一步',
   'Finish': '结束',
-  'Click to add a new spider': '点击并添加爬虫',
+  'Click to add a new spider.<br><br>You can also add a <strong>Customized Spider</strong> through <a href="https://docs.crawlab.cn/Usage/SDK/CLI.html" target="_blank" style="color: #409EFF">CLI Tool</a>.': '点击并添加爬虫<br><br>您也可以通过 <a href="https://docs.crawlab.cn/Usage/SDK/CLI.html" target="_blank" style="color: #409EFF">CLI 工具</a> 添加<strong>自定义爬虫</strong>',
   'You can view your created spiders here.<br>Click a table row to view <strong>spider details</strong>.': '您可以查看创建的爬虫<br>点击行来查看<strong>爬虫详情</strong>',
   'View a list of <strong>Configurable Spiders</strong>': '查看<strong>可配置爬虫</strong>列表',
   'View a list of <strong>Customized Spiders</strong>': '查看<strong>自定义爬虫</strong>列表',
@@ -447,6 +447,19 @@ docker run -d --restart always --name crawlab_worker \\
   'You can view the<br> visualization of the stage<br> workflow.': '您可以查看阶段工作流的<br>可视化界面',
   'You can add the settings here, which will be loaded in the Scrapy\'s <code>settings.py</code> file.<br><br>JSON and Array data are supported.': '您可以在这里添加设置，它们会在 Scrapy 中的 <code>settings.py</code> 中被加载<br><br>JSON 和数组都支持',
   'You can edit the <code>Spiderfile</code> here.<br><br>For more information, please refer to the <a href="https://docs.crawlab.cn/Usage/Spider/ConfigurableSpider.html" target="_blank" style="color: #409EFF">Documentation (Chinese)</a>.': '您可以在这里编辑 <code>Spiderfile</code><br><br>更多信息, 请参考 <a href="https://docs.crawlab.cn/Usage/Spider/ConfigurableSpider.html" target="_blank" style="color: #409EFF">文档</a>.',
+  'You can filter tasks from this area.': '您可以在这个区域筛选任务',
+  'This is a list of spider tasks executed sorted in a time descending order.': '这是执行过的爬虫任务的列表，按时间降序排列',
+  'Click the row to or the view button to view the task detail.': '点击行或查看按钮来查看任务详情',
+  'Tick and select the tasks you would like to delete in batches.': '勾选您想批量删除的任务',
+  'Click this button to delete selected tasks.': '点击并删除勾选的任务',
+  'This is the info of the task detail.': '这是任务详情信息',
+  'This is the spider info of the task.': '这是任务的爬虫信息',
+  'You can click to view the spider detail for the task.': '您可以点击查看该任务的爬虫详情',
+  'This is the node info of the task.': '这是任务的节点信息',
+  'You can click to view the node detail for the task.': '您可以点击查看该任务的节点详情',
+  'Here you can view the log<br> details for the task. The<br> log is automatically updated.': '这里您可以查看该任务<br>的日志详情，日志是<br>自动更新的',
+  'Here you can view the results scraped by the spider.<br><br><strong>Note:</strong> If you find your results here are empty, please refer to the <a href="https://docs.crawlab.cn/Integration/" target="_blank" style="color: #409EFF">Documentation (Chinese)</a> about how to integrate your spider into Crawlab.': '这里您可以查看爬虫抓取下来的结果<br><br><strong>注意:</strong> 如果这里结果是空的，请参考 <a href="https://docs.crawlab.cn/Integration/" target="_blank" style="color: #409EFF">相关文档</a> 来集成您的爬虫到 Crawlab',
+  'You can download your results as a CSV file by clicking this button.': '您可以点击下载结果为 CSV 文件',
 
   // 其他
   'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧'
diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index 45372b7d..29c9e479 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -380,7 +380,7 @@ export default {
         },
         {
           target: '.btn.add',
-          content: this.$t('Click to add a new spider')
+          content: this.$t('Click to add a new spider.<br><br>You can also add a <strong>Customized Spider</strong> through <a href="https://docs.crawlab.cn/Usage/SDK/CLI.html" target="_blank" style="color: #409EFF">CLI Tool</a>.')
         }
       ],
       tourCallbacks: {
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index 51b52547..0b600f8b 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -210,7 +210,7 @@ export default {
         },
         {
           target: '.table',
-          content: this.$t('This is a list of spider tasks executed sorted in a descending order.')
+          content: this.$t('This is a list of spider tasks executed sorted in a time descending order.')
         },
         {
           target: '.table .el-table__body-wrapper tr:nth-child(1)',

From c3096a541e1044698fcd1271bd084351103d601a Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 12:50:15 +0800
Subject: [PATCH 10/17] default show installed dependencies in installation tab

---
 .../src/components/Node/NodeInstallation.vue  | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/Node/NodeInstallation.vue b/frontend/src/components/Node/NodeInstallation.vue
index 1ec9894a..9ed3cfc1 100644
--- a/frontend/src/components/Node/NodeInstallation.vue
+++ b/frontend/src/components/Node/NodeInstallation.vue
@@ -3,13 +3,13 @@
     <el-form inline>
       <el-form-item>
         <el-autocomplete size="small" clearable @clear="onSearch"
-          v-if="activeLang.executable_name === 'python'"
-          v-model="depName"
-          style="width: 240px"
-          :placeholder="$t('Search Dependencies')"
-          :fetchSuggestions="fetchAllDepList"
-          :minlength="2"
-          @select="onSearch"
+                         v-if="activeLang.executable_name === 'python'"
+                         v-model="depName"
+                         style="width: 240px"
+                         :placeholder="$t('Search Dependencies')"
+                         :fetchSuggestions="fetchAllDepList"
+                         :minlength="2"
+                         @select="onSearch"
         ></el-autocomplete>
         <el-input
           v-else
@@ -20,9 +20,9 @@
       </el-form-item>
       <el-form-item>
         <el-button size="small"
-          icon="el-icon-search"
-          type="success"
-          @click="onSearch"
+                   icon="el-icon-search"
+                   type="success"
+                   @click="onSearch"
         >
           {{$t('Search')}}
         </el-button>
@@ -116,7 +116,7 @@ export default {
       depName: '',
       depList: [],
       loading: false,
-      isShowInstalled: false,
+      isShowInstalled: true,
       installedDepList: [],
       depLoadingDict: {},
       isLoadingInstallLang: false
@@ -289,6 +289,7 @@ export default {
     const res = await this.$request.get(`/nodes/${id}/langs`)
     this.langList = res.data.data
     this.activeTab = this.langList[0].executable_name || ''
+    await this.getInstalledDepList()
   }
 }
 </script>

From 100e7631fb7dc4a7d5a0709ca04347124255f35f 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, 1 Feb 2020 12:53:44 +0800
Subject: [PATCH 11/17] =?UTF-8?q?fix=20=E5=90=AF=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=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/conf/config.yml      | 20 ++++++++++----------
 backend/main.go              |  2 --
 backend/services/schedule.go | 11 +++++++++++
 frontend/.env.development    |  4 ++++
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/backend/conf/config.yml b/backend/conf/config.yml
index e5dcb1f9..dda27a8e 100644
--- a/backend/conf/config.yml
+++ b/backend/conf/config.yml
@@ -1,25 +1,25 @@
 api:
   address: "localhost:8000"
 mongo:
-  host: localhost
+  host: "192.168.235.26"
   port: 27017
-  db: crawlab_test
-  username: ""
-  password: ""
+  db: crawlab_dev
+  username: "root"
+  password: "example"
   authSource: "admin"
 redis:
-  address: localhost
-  password: ""
+  address: 127.0.0.1
+  password:
   database: 1
   port: 6379
 log:
   level: info
-  path: "/var/logs/crawlab"
+  path: "./logs/crawlab"
   isDeletePeriodically: "N"
   deleteFrequency: "@hourly"
 server:
   host: 0.0.0.0
-  port: 8000
+  port: 8001
   master: "Y"
   secret: "crawlab"
   register:
@@ -30,11 +30,11 @@ server:
     python: "Y"
     node: "N"
 spider:
-  path: "/app/spiders"
+  path: "./spiders"
 task:
   workers: 4
 other:
-  tmppath: "/tmp"
+  tmppath: "./tmp"
 version: 0.4.4
 setting:
   allowRegister: "N"
diff --git a/backend/main.go b/backend/main.go
index ca9f1bf2..4a84462d 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -231,8 +231,6 @@ func main() {
 			}
 			// 统计数据
 			authGroup.GET("/stats/home", routes.GetHomeStats) // 首页统计数据
-			// release版本
-			authGroup.GET("/version", routes.GetVersion) // 获取发布的版本
 			// 文件
 			authGroup.GET("/file", routes.GetFile) // 获取文件
 		}
diff --git a/backend/services/schedule.go b/backend/services/schedule.go
index b5268a88..a179b50f 100644
--- a/backend/services/schedule.go
+++ b/backend/services/schedule.go
@@ -200,6 +200,12 @@ func (s *Scheduler) Update() error {
 		return err
 	}
 
+	user, err := model.GetUserByUsername("admin")
+	if err != nil {
+		log.Errorf("get admin user error: %s", err.Error())
+		return err
+	}
+
 	// 遍历任务列表
 	for i := 0; i < len(sList); i++ {
 		// 单个任务
@@ -209,6 +215,11 @@ func (s *Scheduler) Update() error {
 			continue
 		}
 
+		// 兼容以前版本
+		if job.UserId.Hex() == "" {
+			job.UserId = user.Id
+		}
+
 		// 添加到定时任务
 		if err := s.AddJob(job); err != nil {
 			log.Errorf("add job error: %s, job: %s, cron: %s", err.Error(), job.Name, job.Cron)
diff --git a/frontend/.env.development b/frontend/.env.development
index 73ca1a55..8d7c68bc 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -1,3 +1,7 @@
 NODE_ENV='development'
+<<<<<<< Updated upstream
 VUE_APP_BASE_URL=http://localhost:8000
 VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn
+=======
+VUE_APP_BASE_URL=http://localhost:8001
+>>>>>>> Stashed changes

From e772807ad2859b0dec9d059a12f733f64007c145 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 13:05:54 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=99=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Node/NodeInstallation.vue  | 24 +++++---
 .../src/components/Overview/NodeOverview.vue  |  8 ++-
 frontend/src/i18n/zh.js                       |  5 ++
 frontend/src/views/node/NodeDetail.vue        | 61 ++++++++++++++++++-
 4 files changed, 84 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Node/NodeInstallation.vue b/frontend/src/components/Node/NodeInstallation.vue
index 9ed3cfc1..2d466ab7 100644
--- a/frontend/src/components/Node/NodeInstallation.vue
+++ b/frontend/src/components/Node/NodeInstallation.vue
@@ -1,16 +1,20 @@
 <template>
   <div class="node-installation">
-    <el-form inline>
+    <el-form class="search-form" inline>
       <el-form-item>
-        <el-autocomplete size="small" clearable @clear="onSearch"
-                         v-if="activeLang.executable_name === 'python'"
-                         v-model="depName"
-                         style="width: 240px"
-                         :placeholder="$t('Search Dependencies')"
-                         :fetchSuggestions="fetchAllDepList"
-                         :minlength="2"
-                         @select="onSearch"
-        ></el-autocomplete>
+        <el-autocomplete
+          class="search-box"
+          size="small"
+          clearable
+          v-if="activeLang.executable_name === 'python'"
+          v-model="depName"
+          style="width: 240px"
+          :placeholder="$t('Search Dependencies')"
+          :fetchSuggestions="fetchAllDepList"
+          :minlength="2"
+          @select="onSearch"
+          @clear="onSearch"
+        />
         <el-input
           v-else
           v-model="depName"
diff --git a/frontend/src/components/Overview/NodeOverview.vue b/frontend/src/components/Overview/NodeOverview.vue
index 65773c74..8d874f1c 100644
--- a/frontend/src/components/Overview/NodeOverview.vue
+++ b/frontend/src/components/Overview/NodeOverview.vue
@@ -2,14 +2,16 @@
   <el-row>
     <el-col :span="12">
       <!--last tasks-->
-      <el-row>
+      <el-row class="latest-tasks-wrapper">
         <task-table-view :title="$t('Latest Tasks')"/>
       </el-row>
     </el-col>
 
     <el-col :span="12">
-      <!--basic info-->
-      <node-info-view/>
+      <el-row class="node-info-view-wrapper">
+        <!--basic info-->
+        <node-info-view/>
+      </el-row>
     </el-col>
   </el-row>
 </template>
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 96932d44..e2f32565 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -460,6 +460,11 @@ docker run -d --restart always --name crawlab_worker \\
   'Here you can view the log<br> details for the task. The<br> log is automatically updated.': '这里您可以查看该任务<br>的日志详情，日志是<br>自动更新的',
   'Here you can view the results scraped by the spider.<br><br><strong>Note:</strong> If you find your results here are empty, please refer to the <a href="https://docs.crawlab.cn/Integration/" target="_blank" style="color: #409EFF">Documentation (Chinese)</a> about how to integrate your spider into Crawlab.': '这里您可以查看爬虫抓取下来的结果<br><br><strong>注意:</strong> 如果这里结果是空的，请参考 <a href="https://docs.crawlab.cn/Integration/" target="_blank" style="color: #409EFF">相关文档</a> 来集成您的爬虫到 Crawlab',
   'You can download your results as a CSV file by clicking this button.': '您可以点击下载结果为 CSV 文件',
+  'Switch between different nodes.': '在节点间切换',
+  'You can view the latest executed spider tasks.': '您可以查看最近执行过的爬虫任务',
+  'This is the detailed node info.': '这是节点详情',
+  'Here you can install<br> dependencies and modules<br> that are required<br> in your spiders.': '这里您可以安装您爬虫中<br>需要的依赖或模块',
+  'You can search dependencies in the search box and install them by clicking the "Install" button below.': '您可以在搜索框中搜索依赖并点击下面的"安装"按钮来进行安装',
 
   // 其他
   'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧'
diff --git a/frontend/src/views/node/NodeDetail.vue b/frontend/src/views/node/NodeDetail.vue
index 7d8f5c67..1ce3170d 100644
--- a/frontend/src/views/node/NodeDetail.vue
+++ b/frontend/src/views/node/NodeDetail.vue
@@ -1,5 +1,14 @@
 <template>
   <div class="app-container">
+    <!--tour-->
+    <v-tour
+      name="node-detail"
+      :steps="tourSteps"
+      :callbacks="tourCallbacks"
+      :options="$utils.tour.getOptions(true)"
+    />
+    <!--./tour-->
+
     <!--selector-->
     <div class="selector">
       <label class="label">{{$t('Node')}}: </label>
@@ -38,7 +47,52 @@ export default {
   },
   data () {
     return {
-      activeTabName: 'overview'
+      activeTabName: 'overview',
+      tourSteps: [
+        // overview
+        {
+          target: '.selector',
+          content: this.$t('Switch between different nodes.')
+        },
+        {
+          target: '.latest-tasks-wrapper',
+          content: this.$t('You can view the latest executed spider tasks.'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '.node-info-view-wrapper',
+          content: this.$t('This is the detailed node info.'),
+          params: {
+            placement: 'left'
+          }
+        },
+        // installation
+        {
+          target: '#tab-installation',
+          content: this.$t('Here you can install<br> dependencies and modules<br> that are required<br> in your spiders.')
+        },
+        {
+          target: '.search-box',
+          content: this.$t('You can search dependencies in the search box and install them by clicking the "Install" button below.')
+        }
+      ],
+      tourCallbacks: {
+        onStop: () => {
+          this.$utils.tour.finishTour('node-detail')
+        },
+        onPreviousStep: (currentStep) => {
+          if (currentStep === 3) {
+            this.activeTabName = 'overview'
+          }
+        },
+        onNextStep: (currentStep) => {
+          if (currentStep === 2) {
+            this.activeTabName = 'installation'
+          }
+        }
+      }
     }
   },
   computed: {
@@ -65,6 +119,11 @@ export default {
 
     // get node task list
     this.$store.dispatch('node/getTaskList', this.$route.params.id)
+  },
+  mounted () {
+    if (!this.$utils.tour.isFinishedTour('node-detail')) {
+      this.$tours['node-detail'].start()
+    }
   }
 }
 </script>

From ec5afd79850144dacc4ca6caebbbcdd05f4970a0 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, 1 Feb 2020 13:08:15 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/conf/config.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/conf/config.yml b/backend/conf/config.yml
index dda27a8e..e5dcb1f9 100644
--- a/backend/conf/config.yml
+++ b/backend/conf/config.yml
@@ -1,25 +1,25 @@
 api:
   address: "localhost:8000"
 mongo:
-  host: "192.168.235.26"
+  host: localhost
   port: 27017
-  db: crawlab_dev
-  username: "root"
-  password: "example"
+  db: crawlab_test
+  username: ""
+  password: ""
   authSource: "admin"
 redis:
-  address: 127.0.0.1
-  password:
+  address: localhost
+  password: ""
   database: 1
   port: 6379
 log:
   level: info
-  path: "./logs/crawlab"
+  path: "/var/logs/crawlab"
   isDeletePeriodically: "N"
   deleteFrequency: "@hourly"
 server:
   host: 0.0.0.0
-  port: 8001
+  port: 8000
   master: "Y"
   secret: "crawlab"
   register:
@@ -30,11 +30,11 @@ server:
     python: "Y"
     node: "N"
 spider:
-  path: "./spiders"
+  path: "/app/spiders"
 task:
   workers: 4
 other:
-  tmppath: "./tmp"
+  tmppath: "/tmp"
 version: 0.4.4
 setting:
   allowRegister: "N"

From 363ca0eb346d5fdb4121eef5da8351278eaf777f 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, 1 Feb 2020 13:08:49 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/.env.development | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/.env.development b/frontend/.env.development
index 8d7c68bc..ba21c0c6 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -1,7 +1,3 @@
 NODE_ENV='development'
-<<<<<<< Updated upstream
 VUE_APP_BASE_URL=http://localhost:8000
-VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn
-=======
-VUE_APP_BASE_URL=http://localhost:8001
->>>>>>> Stashed changes
+VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn
\ No newline at end of file

From 0560cd600766efc7afa43096db35eb03bb341272 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 15:58:44 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=99=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Cron/index.vue       |   4 +-
 frontend/src/i18n/zh.js                      |   9 +
 frontend/src/views/schedule/ScheduleList.vue | 183 +++++++++++++++++--
 3 files changed, 179 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Cron/index.vue b/frontend/src/components/Cron/index.vue
index d2a6313b..642a2092 100644
--- a/frontend/src/components/Cron/index.vue
+++ b/frontend/src/components/Cron/index.vue
@@ -1,5 +1,5 @@
 <style lang="scss" scoped>
-  #changeContab {
+  #change-crontab {
     .language {
       position: absolute;
       right: 25px;
@@ -40,7 +40,7 @@
   }
 </style>
 <template>
-  <div id="changeContab">
+  <div id="change-crontab">
     <!--        <el-button class="language" type="text" @click="i18n=(i18n==='en'?'cn':'en')">{{i18n}}</el-button>-->
     <el-tabs type="border-card">
       <el-tab-pane>
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index e2f32565..82b52d27 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -465,6 +465,15 @@ docker run -d --restart always --name crawlab_worker \\
   'This is the detailed node info.': '这是节点详情',
   'Here you can install<br> dependencies and modules<br> that are required<br> in your spiders.': '这里您可以安装您爬虫中<br>需要的依赖或模块',
   'You can search dependencies in the search box and install them by clicking the "Install" button below.': '您可以在搜索框中搜索依赖并点击下面的"安装"按钮来进行安装',
+  'You should fill the form before adding the new schedule.': '在添加新定时任务前，您需要填写这个表单',
+  'The name of the schedule': '定时任务名称',
+  'The type of how to run the task.<br><br>Please refer to the <a href="https://docs.crawlab.cn/Usage/Spider/Run.html" target="_blank" style="color: #409EFF">Documentation (Chinese)</a> for detailed explanation for the options.<br><br>Let\'s select <strong>Selected Nodes</strong> for example.': '表示以哪种方式运行任务，<br><br>请参考 <a href="https://docs.crawlab.cn/Usage/Spider/Run.html" target="_blank" style="color: #409EFF">文档</a> 参考选项解释<br><br>让我们选择 <strong>指定节点</strong> 这个选项',
+  'The spider to run': '运行的爬虫',
+  '<strong>Cron</strong> expression for the schedule.<br><br>If you are not sure what a cron expression is, please refer to this <a href="https://baike.baidu.com/item/crontab/8819388" target="_blank" style="color: #409EFF">Article</a>.': '定时任务的 <strong>Cron</strong> 表达式<br><br>如果您不清楚什么是 Cron 表达式，请参考这篇 <a href="https://baike.baidu.com/item/crontab/8819388" target="_blank" style="color: #409EFF">文章（英文）</a>.',
+  'You can select the correct options in the cron config box to configure the cron expression.': '您可以在 Cron 配置栏里选择正确的选项来配置 Cron 表达式',
+  'The parameters which will be passed into the spider program.': '将被传入爬虫程序里的参数',
+  'The description for the schedule': '定时任务的描述',
+  'Once you have filled all fields, click this button to submit.': '当您填完所有字段，请点击这个按钮来提交定时任务',
 
   // 其他
   'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧'
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 0fb2a7ab..253ac057 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -1,28 +1,44 @@
 <template>
   <div class="app-container">
+    <!--tour-->
+    <v-tour
+      name="schedule-list"
+      :steps="tourSteps"
+      :callbacks="tourCallbacks"
+      :options="$utils.tour.getOptions(true)"
+    />
+    <v-tour
+      name="schedule-list-add"
+      :steps="tourAddSteps"
+      :callbacks="tourAddCallbacks"
+      :options="$utils.tour.getOptions(true)"
+    />
+    <!--./tour-->
+
     <!--add popup-->
     <el-dialog
       :title="$t(dialogTitle)"
       :visible.sync="dialogVisible"
-      width="60%"
+      width="640px"
       :before-close="onDialogClose">
       <el-form label-width="180px"
+               class="add-form"
                :model="scheduleForm"
                :inline-message="true"
                ref="scheduleForm"
                label-position="right">
         <el-form-item :label="$t('Schedule Name')" prop="name" required>
-          <el-input v-model="scheduleForm.name" :placeholder="$t('Schedule Name')"></el-input>
+          <el-input id="schedule-name" v-model="scheduleForm.name" :placeholder="$t('Schedule Name')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('Run Type')" prop="run_type" required>
-          <el-select v-model="scheduleForm.run_type" :placeholder="$t('Run Type')">
+          <el-select id="run-type" 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.run_type === 'selected-nodes'" :label="$t('Nodes')" prop="node_ids" required>
-          <el-select v-model="scheduleForm.node_ids" :placeholder="$t('Nodes')" multiple filterable>
+          <el-select id="node-ids" v-model="scheduleForm.node_ids" :placeholder="$t('Nodes')" multiple filterable>
             <el-option
               v-for="op in nodeList"
               :key="op._id"
@@ -34,6 +50,7 @@
         </el-form-item>
         <el-form-item v-if="!isDisabledSpiderSchedule" :label="$t('Spider')" prop="spider_id" required>
           <el-select
+            id="spider-id"
             v-model="scheduleForm.spider_id"
             :placeholder="$t('Spider')"
             filterable
@@ -67,14 +84,18 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('Cron')" prop="cron" required>
-          <el-popover>
+          <el-popover v-model="isShowCron" trigger="manual">
             <template>
               <vue-cron-linux :data="scheduleForm.cron" :i18n="lang" @change="onCronChange"/>
             </template>
             <template slot="reference">
               <el-input
+                id="cron"
+                ref="cron"
                 v-model="scheduleForm.cron"
                 :placeholder="`${$t('[minute] [hour] [day] [month] [day of week]')}`"
+                @focus="isShowCron = true"
+                @blur="isShowCron = false"
               >
               </el-input>
             </template>
@@ -82,24 +103,29 @@
           <!--<el-button size="small" style="width:100px" type="primary" @click="onShowCronDialog">{{$t('schedules.add_cron')}}</el-button>-->
         </el-form-item>
         <el-form-item :label="$t('Execute Command')" prop="params">
-          <el-input v-model="spider.cmd"
-                    :placeholder="$t('Execute Command')"
-                    disabled>
-          </el-input>
+          <el-input
+            id="cmd"
+            v-model="spider.cmd"
+            :placeholder="$t('Execute Command')"
+            disabled
+          />
         </el-form-item>
         <el-form-item :label="$t('Parameters')" prop="param">
-          <el-input v-model="scheduleForm.param"
-                    :placeholder="$t('Parameters')"></el-input>
+          <el-input
+            id="param"
+            v-model="scheduleForm.param"
+            :placeholder="$t('Parameters')"
+          />
         </el-form-item>
         <el-form-item :label="$t('Schedule Description')" prop="description">
-          <el-input v-model="scheduleForm.description" type="textarea"
+          <el-input id="schedule-description" v-model="scheduleForm.description" type="textarea"
                     :placeholder="$t('Schedule Description')"></el-input>
         </el-form-item>
       </el-form>
       <!--取消、保存-->
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="onCancel">{{$t('Cancel')}}</el-button>
-        <el-button size="small" type="primary" @click="onAddSubmit">{{$t('Submit')}}</el-button>
+        <el-button id="btn-submit" size="small" type="primary" @click="onAddSubmit">{{$t('Submit')}}</el-button>
       </span>
     </el-dialog>
 
@@ -114,7 +140,7 @@
         <div class="right">
           <el-button size="small" type="primary"
                      icon="el-icon-plus"
-                     class="refresh"
+                     class="btn-add"
                      @click="onAdd">
             {{$t('Add Schedule')}}
           </el-button>
@@ -233,7 +259,121 @@ export default {
       showCron: false,
       expression: '',
       spiderList: [],
-      nodeList: []
+      nodeList: [],
+      isShowCron: false,
+
+      // tutorial
+      tourSteps: [
+        {
+          target: '.table',
+          content: this.$t('This is a list of schedules (cron jobs) to periodically run spider tasks. You can add/modify/edit your schedules here.<br><br>For more information, please refer to the <a href="https://docs.crawlab.cn/Usage/Schedule/" target="_blank" style="color: #409EFF">Documentation (Chinese)</a> for detail.')
+        },
+        {
+          target: '.btn-add',
+          content: this.$t('You can add a new schedule by clicking this button.')
+        }
+      ],
+      tourCallbacks: {
+        onStop: () => {
+          this.$utils.tour.finishTour('schedule-list')
+        },
+        onPreviousStep: (currentStep) => {
+          if (currentStep === 2) {
+            this.dialogVisible = false
+          }
+        },
+        onNextStep: (currentStep) => {
+          if (currentStep === 1) {
+            this.isEdit = false
+            this.dialogVisible = true
+            this.$store.commit('schedule/SET_SCHEDULE_FORM', { node_ids: [] })
+          }
+        }
+      },
+      tourAddSteps: [
+        {
+          target: '.add-form',
+          content: this.$t('You should fill the form before adding the new schedule.'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '#schedule-name',
+          content: this.$t('The name of the schedule'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '#run-type',
+          content: this.$t('The type of how to run the task.<br><br>Please refer to the <a href="https://docs.crawlab.cn/Usage/Spider/Run.html" target="_blank" style="color: #409EFF">Documentation (Chinese)</a> for detailed explanation for the options.<br><br>Let\'s select <strong>Selected Nodes</strong> for example.'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '#spider-id',
+          content: this.$t('The spider to run'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '#cron',
+          content: this.$t('<strong>Cron</strong> expression for the schedule.<br><br>If you are not sure what a cron expression is, please refer to this <a href="https://baike.baidu.com/item/crontab/8819388" target="_blank" style="color: #409EFF">Article</a>.'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '#change-crontab',
+          content: this.$t('You can select the correct options in the cron config box to configure the cron expression.'),
+          params: {
+            placement: 'top'
+          }
+        },
+        {
+          target: '#param',
+          content: this.$t('The parameters which will be passed into the spider program.'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '#schedule-description',
+          content: this.$t('The description for the schedule'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '#btn-submit',
+          content: this.$t('Once you have filled all fields, click this button to submit.'),
+          params: {
+            placement: 'right'
+          }
+        }
+      ],
+      tourAddCallbacks: {
+        onStop: () => {
+          this.$utils.tour.finishTour('schedule-list-add')
+        },
+        onPreviousStep: (currentStep) => {
+          if (currentStep === 4) {
+            this.isShowCron = false
+          } else if (currentStep === 6) {
+            this.isShowCron = true
+          }
+        },
+        onNextStep: (currentStep) => {
+          if (currentStep === 3) {
+            this.isShowCron = true
+          } else if (currentStep === 5) {
+            this.isShowCron = false
+          }
+        }
+      }
     }
   },
   computed: {
@@ -274,6 +414,12 @@ export default {
       this.dialogVisible = true
       this.$store.commit('schedule/SET_SCHEDULE_FORM', { node_ids: [] })
       this.$st.sendEv('定时任务', '添加定时任务')
+
+      if (!this.$utils.tour.isFinishedTour('schedule-list-add')) {
+        setTimeout(() => {
+          this.$tours['schedule-list-add'].start()
+        }, 500)
+      }
     },
     onAddSubmit () {
       this.$refs.scheduleForm.validate(res => {
@@ -377,6 +523,13 @@ export default {
       .then(response => {
         this.spiderList = response.data.data.list || []
       })
+  },
+  mounted () {
+    if (!this.isDisabledSpiderSchedule) {
+      if (!this.$utils.tour.isFinishedTour('schedule-list')) {
+        this.$tours['schedule-list'].start()
+      }
+    }
   }
 }
 </script>

From 1654f0346d16a467c7fb46de6493f77069d83388 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 17:12:09 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=95=99=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                |   1 +
 frontend/src/views/setting/Setting.vue | 117 ++++++++++++++++++-------
 2 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 254d3dcd..20feddc9 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -370,6 +370,7 @@ export default {
   'Global Variable': '全局变量',
   'Add Global Variable': '新增全局变量',
   'Are you sure to delete this global variable': '确定删除该全局变量？',
+  'Key': '设置',
 
   // 其他
   tagsView: {
diff --git a/frontend/src/views/setting/Setting.vue b/frontend/src/views/setting/Setting.vue
index 0eade556..95abeb81 100644
--- a/frontend/src/views/setting/Setting.vue
+++ b/frontend/src/views/setting/Setting.vue
@@ -1,27 +1,38 @@
 <template>
   <div class="app-container">
+    <!--tour-->
+    <v-tour
+      name="setting"
+      :steps="tourSteps"
+      :callbacks="tourCallbacks"
+      :options="$utils.tour.getOptions(true)"
+    />
+    <!--./tour-->
+
     <!-- 新增全局变量 -->
     <el-dialog :title="$t('Add Global Variable')"
                :visible.sync="addDialogVisible">
       <el-form label-width="80px" ref="globalVariableForm">
-        <el-form-item label="Key">
+        <el-form-item :label="$t('Key')">
           <el-input size="small" v-model="globalVariableForm.key"/>
         </el-form-item>
-        <el-form-item label="Value">
+        <el-form-item :label="$t('Value')">
           <el-input size="small" v-model="globalVariableForm.value"/>
         </el-form-item>
-        <el-form-item label="Remark">
+        <el-form-item :label="$t('Remark')">
           <el-input size="small" v-model="globalVariableForm.remark"/>
         </el-form-item>
         <el-form-item>
-          <el-button @click="addDialogVisible = false" type="danger" size="small">{{$t('Cancel')}}</el-button>
-          <el-button @click="addGlobalVariableHandle(false)" type="success" size="small">{{$t('Save')}}</el-button>
+          <div style="text-align: right">
+            <el-button @click="addDialogVisible = false" type="danger" size="small">{{$t('Cancel')}}</el-button>
+            <el-button @click="addGlobalVariableHandle(false)" type="success" size="small">{{$t('Save')}}</el-button>
+          </div>
         </el-form-item>
       </el-form>
     </el-dialog>
 
     <el-tabs v-model="activeName" @tab-click="tabActiveHandle">
-      <el-tab-pane :label="$t('Password Settings')" name="passwordSetting">
+      <el-tab-pane :label="$t('Password Settings')" name="password">
         <el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="200px" :rules="rules"
                  inline-message>
           <el-form-item prop="username" :label="$t('Username')">
@@ -32,7 +43,7 @@
           </el-form-item>
         </el-form>
       </el-tab-pane>
-      <el-tab-pane :label="$t('Notify Settings')" name="notifySetting">
+      <el-tab-pane :label="$t('Notify Settings')" name="notify">
         <el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="200px" :rules="rules"
                  inline-message>
           <el-form-item :label="$t('Notification Trigger Timing')">
@@ -63,44 +74,39 @@
                       :placeholder="$t('DingTalk Robot Webhook')"></el-input>
           </el-form-item>
           <el-form-item prop="setting.wechat_robot_webhook" :label="$t('Wechat Robot Webhook')">
-            <el-input v-model="userInfo.setting.wechat_robot_webhook" :placeholder="$t('Wechat Robot Webhook')"></el-input>
+            <el-input v-model="userInfo.setting.wechat_robot_webhook"
+                      :placeholder="$t('Wechat Robot Webhook')"></el-input>
           </el-form-item>
         </el-form>
       </el-tab-pane>
-      <el-tab-pane :label="$t('Global Variable')" name="globalVariable">
-        <el-form :inline="true">
-          <el-form-item>
-            <el-button size="mini" @click="addGlobalVariableHandle(true)"
-                       type="success">
-              {{$t('Add')}}
-            </el-button>
-          </el-form-item>
-        </el-form>
+      <el-tab-pane :label="$t('Global Variable')" name="global-variable">
+        <div style="text-align: right;margin-bottom: 10px">
+          <el-button size="small" @click="addGlobalVariableHandle(true)"
+                     icon="el-icon-plus"
+                     type="primary">
+            {{$t('Add')}}
+          </el-button>
+          <el-button size="small" type="success" @click="saveUserInfo">{{$t('Save')}}</el-button>
+        </div>
         <el-table :data="globalVariableList" border>
-          <el-table-column prop="key" label="Key"/>
-          <el-table-column prop="value" label="Value"/>
-          <el-table-column prop="remark" label="Remark"/>
+          <el-table-column prop="key" :label="$t('Key')"/>
+          <el-table-column prop="value" :label="$t('Value')"/>
+          <el-table-column prop="remark" :label="$t('Remark')"/>
           <el-table-column prop="" :label="$t('Action')" width="80">
             <template slot-scope="scope">
-              <el-button @click="deleteGlobalVariableHandle(scope.row._id)" icon="el-icon-delete" type="danger" size="mini"></el-button>
+              <el-button @click="deleteGlobalVariableHandle(scope.row._id)" icon="el-icon-delete" type="danger"
+                         size="mini"></el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
     </el-tabs>
-    <el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="200px" :rules="rules"
-             inline-message v-if="activeName !== 'globalVariable'">
-      <el-form-item>
-        <div class="buttons">
-          <el-button size="small" type="success" @click="saveUserInfo">{{$t('Save')}}</el-button>
-        </div>
-      </el-form-item>
-    </el-form>
   </div>
 </template>
 
 <script>
 import { mapState } from 'vuex'
+
 export default {
   name: 'Setting',
   data () {
@@ -145,8 +151,44 @@ export default {
         'setting.wechat_robot_webhook': [{ trigger: 'blur', validator: validateWechatRobotWebhook }]
       },
       isShowDingTalkAppSecret: false,
-      activeName: 'passwordSetting',
-      addDialogVisible: false
+      activeName: 'password',
+      addDialogVisible: false,
+      tourSteps: [
+        {
+          target: '#tab-password',
+          content: this.$t('Here you can set your password.'),
+          params: {
+            placement: 'right'
+          }
+        },
+        {
+          target: '#tab-notify',
+          content: this.$t('In this tab you can configure your notification settings.')
+        },
+        {
+          target: '#tab-global-variable',
+          content: this.$t('Here you can add/edit/delete global environment variables which will be passed into your spider programs.')
+        }
+      ],
+      tourCallbacks: {
+        onStop: () => {
+          this.$utils.tour.finishTour('setting')
+        },
+        onPreviousStep: (currentStep) => {
+          if (currentStep === 1) {
+            this.activeName = 'password'
+          } else if (currentStep === 2) {
+            this.activeName = 'notify'
+          }
+        },
+        onNextStep: (currentStep) => {
+          if (currentStep === 0) {
+            this.activeName = 'notify'
+          } else if (currentStep === 1) {
+            this.activeName = 'global-variable'
+          }
+        }
+      },
     }
   },
   computed: {
@@ -165,7 +207,8 @@ export default {
         this.$store.dispatch('user/deleteGlobalVariable', id).then(() => {
           this.$store.dispatch('user/getGlobalVariable')
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     addGlobalVariableHandle (isShow) {
       if (isShow) {
@@ -206,12 +249,18 @@ export default {
       })
       this.$st.sendEv('设置', '保存')
     },
-    tabActiveHandle () {}
+    tabActiveHandle () {
+    }
   },
   async created () {
     await this.$store.dispatch('user/getInfo')
-    this.$store.dispatch('user/getGlobalVariable')
+    await this.$store.dispatch('user/getGlobalVariable')
     this.getUserInfo()
+  },
+  mounted () {
+    if (!this.$utils.tour.isFinishedTour('setting')) {
+      this.$tours['setting'].start()
+    }
   }
 }
 </script>

From 83af0786e0714d1d4e07afa412de03e61143a196 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 1 Feb 2020 18:00:33 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=95=99=E7=A8=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Config/ConfigList.vue |  2 ++
 frontend/src/components/File/FileList.vue     | 13 +------
 frontend/src/i18n/zh.js                       |  3 ++
 frontend/src/store/index.js                   |  2 ++
 frontend/src/store/modules/tour.js            | 34 +++++++++++++++++++
 frontend/src/utils/tour.js                    | 25 ++++++++++++++
 frontend/src/views/node/NodeDetail.vue        |  3 ++
 frontend/src/views/schedule/ScheduleList.vue  |  6 ++++
 frontend/src/views/setting/Setting.vue        |  5 ++-
 frontend/src/views/spider/SpiderDetail.vue    |  4 +++
 frontend/src/views/spider/SpiderList.vue      | 10 ++++++
 frontend/src/views/task/TaskDetail.vue        |  3 ++
 frontend/src/views/task/TaskList.vue          |  3 ++
 13 files changed, 100 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/store/modules/tour.js

diff --git a/frontend/src/components/Config/ConfigList.vue b/frontend/src/components/Config/ConfigList.vue
index fff81080..9e2f5de1 100644
--- a/frontend/src/components/Config/ConfigList.vue
+++ b/frontend/src/components/Config/ConfigList.vue
@@ -477,6 +477,7 @@ export default {
           } else if (currentStep === 12) {
             this.activeTab = 'settings'
           }
+          this.$utils.tour.prevStep('spider-detail-confg', currentStep)
         },
         onNextStep: (currentStep) => {
           if (currentStep === 9) {
@@ -486,6 +487,7 @@ export default {
           } else if (currentStep === 11) {
             this.activeTab = 'spiderfile'
           }
+          this.$utils.tour.nextStep('spider-detail-config', currentStep)
         }
       }
     }
diff --git a/frontend/src/components/File/FileList.vue b/frontend/src/components/File/FileList.vue
index d5750cf1..2aed5a6b 100644
--- a/frontend/src/components/File/FileList.vue
+++ b/frontend/src/components/File/FileList.vue
@@ -203,18 +203,7 @@ export default {
       dirDialogVisible: false,
       fileDialogVisible: false,
       nodeExpandedDict: {},
-      isShowDeleteNav: false,
-      tourSteps: [
-        {
-          target: '.add-btn',
-          content: this.$t('You can add a file or directory')
-        }
-      ],
-      tourCallbacks: {
-        onStop: () => {
-          this.$utils.tour.finishTour('spider-detail-file-list')
-        }
-      }
+      isShowDeleteNav: false
     }
   },
   computed: {
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 20feddc9..c997248e 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -480,6 +480,9 @@ docker run -d --restart always --name crawlab_worker \\
   'The parameters which will be passed into the spider program.': '将被传入爬虫程序里的参数',
   'The description for the schedule': '定时任务的描述',
   'Once you have filled all fields, click this button to submit.': '当您填完所有字段，请点击这个按钮来提交定时任务',
+  'Here you can set your password.': '这里您可以设置您的密码',
+  'In this tab you can configure your notification settings.': '在这个标签中，您可以配置您的消息通知配置',
+  'Here you can add/edit/delete global environment variables which will be passed into your spider programs.': '这里您可以添加/修改/删除全局环境变量，它们会被传入爬虫程序中',
 
   // 其他
   'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧'
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 39c3bf18..34c98b4a 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -15,6 +15,7 @@ import site from './modules/site'
 import stats from './modules/stats'
 import setting from './modules/setting'
 import version from './modules/version'
+import tour from './modules/tour'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -35,6 +36,7 @@ const store = new Vuex.Store({
     site,
     setting,
     version,
+    tour,
     // 统计
     stats
   },
diff --git a/frontend/src/store/modules/tour.js b/frontend/src/store/modules/tour.js
new file mode 100644
index 00000000..3635049a
--- /dev/null
+++ b/frontend/src/store/modules/tour.js
@@ -0,0 +1,34 @@
+const state = {
+  tourFinishSteps: {
+    'spider-list': 3,
+    'spider-list-add': 8,
+    'spider-detail': 9,
+    'spider-detail-config': 12,
+    'task-list': 4,
+    'task-detail': 7,
+    'node-detail': 4,
+    'schedule-list': 1,
+    'schedule-list-add': 8,
+    'setting': 2
+  },
+  tourSteps: {}
+}
+
+const getters = {}
+
+const mutations = {
+  SET_TOUR_STEP: (state, payload) => {
+    const { tourName, step } = payload
+    state.tourSteps[tourName] = step
+  }
+}
+
+const actions = {}
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions
+}
diff --git a/frontend/src/utils/tour.js b/frontend/src/utils/tour.js
index e7843f35..b974d692 100644
--- a/frontend/src/utils/tour.js
+++ b/frontend/src/utils/tour.js
@@ -1,4 +1,6 @@
 import i18n from '../i18n'
+import store from '../store'
+import stats from './stats'
 
 export default {
   isFinishedTour: (tourName) => {
@@ -26,6 +28,29 @@ export default {
     }
     data[tourName] = 1
     localStorage.setItem('tour', JSON.stringify(data))
+
+    // 发送统计数据
+    const finalStep = store.state.tour.tourFinishSteps[tourName]
+    const currentStep = store.state.tour.tourSteps[tourName]
+    if (currentStep === finalStep) {
+      stats.sendEv('教程', '完成', tourName)
+    } else {
+      stats.sendEv('教程', '跳过', tourName)
+    }
+  },
+  nextStep: (tourName, currentStep) => {
+    store.commit('tour/SET_TOUR_STEP', {
+      tourName,
+      step: currentStep + 1
+    })
+    stats.sendEv('教程', '下一步', tourName)
+  },
+  prevStep: (tourName, currentStep) => {
+    store.commit('tour/SET_TOUR_STEP', {
+      tourName,
+      step: currentStep - 1
+    })
+    stats.sendEv('教程', '上一步', tourName)
   },
   getOptions: (isShowHighlight) => {
     return {
diff --git a/frontend/src/views/node/NodeDetail.vue b/frontend/src/views/node/NodeDetail.vue
index 1ce3170d..ba53dcb8 100644
--- a/frontend/src/views/node/NodeDetail.vue
+++ b/frontend/src/views/node/NodeDetail.vue
@@ -86,11 +86,13 @@ export default {
           if (currentStep === 3) {
             this.activeTabName = 'overview'
           }
+          this.$utils.tour.prevStep('node-detail', currentStep)
         },
         onNextStep: (currentStep) => {
           if (currentStep === 2) {
             this.activeTabName = 'installation'
           }
+          this.$utils.tour.nextStep('node-detail', currentStep)
         }
       }
     }
@@ -123,6 +125,7 @@ export default {
   mounted () {
     if (!this.$utils.tour.isFinishedTour('node-detail')) {
       this.$tours['node-detail'].start()
+      this.$st.sendEv('教程', '开始', 'node-detail')
     }
   }
 }
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 253ac057..f200f6bf 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -281,6 +281,7 @@ export default {
           if (currentStep === 2) {
             this.dialogVisible = false
           }
+          this.$utils.tour.prevStep('schedule-list', currentStep)
         },
         onNextStep: (currentStep) => {
           if (currentStep === 1) {
@@ -288,6 +289,7 @@ export default {
             this.dialogVisible = true
             this.$store.commit('schedule/SET_SCHEDULE_FORM', { node_ids: [] })
           }
+          this.$utils.tour.nextStep('schedule-list', currentStep)
         }
       },
       tourAddSteps: [
@@ -365,6 +367,7 @@ export default {
           } else if (currentStep === 6) {
             this.isShowCron = true
           }
+          this.$utils.tour.prevStep('schedule-list-add', currentStep)
         },
         onNextStep: (currentStep) => {
           if (currentStep === 3) {
@@ -372,6 +375,7 @@ export default {
           } else if (currentStep === 5) {
             this.isShowCron = false
           }
+          this.$utils.tour.nextStep('schedule-list-add', currentStep)
         }
       }
     }
@@ -418,6 +422,7 @@ export default {
       if (!this.$utils.tour.isFinishedTour('schedule-list-add')) {
         setTimeout(() => {
           this.$tours['schedule-list-add'].start()
+          this.$st.sendEv('教程', '开始', 'schedule-list-add')
         }, 500)
       }
     },
@@ -528,6 +533,7 @@ export default {
     if (!this.isDisabledSpiderSchedule) {
       if (!this.$utils.tour.isFinishedTour('schedule-list')) {
         this.$tours['schedule-list'].start()
+        this.$st.sendEv('教程', '开始', 'schedule-list')
       }
     }
   }
diff --git a/frontend/src/views/setting/Setting.vue b/frontend/src/views/setting/Setting.vue
index 95abeb81..27e79b9c 100644
--- a/frontend/src/views/setting/Setting.vue
+++ b/frontend/src/views/setting/Setting.vue
@@ -180,6 +180,7 @@ export default {
           } else if (currentStep === 2) {
             this.activeName = 'notify'
           }
+          this.$utils.tour.prevStep('setting', currentStep)
         },
         onNextStep: (currentStep) => {
           if (currentStep === 0) {
@@ -187,8 +188,9 @@ export default {
           } else if (currentStep === 1) {
             this.activeName = 'global-variable'
           }
+          this.$utils.tour.nextStep('setting', currentStep)
         }
-      },
+      }
     }
   },
   computed: {
@@ -260,6 +262,7 @@ export default {
   mounted () {
     if (!this.$utils.tour.isFinishedTour('setting')) {
       this.$tours['setting'].start()
+      this.$st.sendEv('教程', '开始', 'setting')
     }
   }
 }
diff --git a/frontend/src/views/spider/SpiderDetail.vue b/frontend/src/views/spider/SpiderDetail.vue
index 4a30341b..9bc49984 100644
--- a/frontend/src/views/spider/SpiderDetail.vue
+++ b/frontend/src/views/spider/SpiderDetail.vue
@@ -143,6 +143,7 @@ export default {
           } else if (currentStep === 9) {
             this.activeTabName = 'environment'
           }
+          this.$utils.tour.prevStep('spider-detail', currentStep)
         },
         onNextStep: (currentStep) => {
           if (currentStep === 4) {
@@ -152,6 +153,7 @@ export default {
           } else if (currentStep === 8) {
             this.activeTabName = 'schedules'
           }
+          this.$utils.tour.nextStep('spider-detail', currentStep)
         }
       }
     }
@@ -188,6 +190,7 @@ export default {
         if (!this.$utils.tour.isFinishedTour('spider-detail-config')) {
           setTimeout(() => {
             this.$tours['spider-detail-config'].start()
+            this.$st.sendEv('教程', '开始', 'spider-detail-config')
           }, 100)
         }
       }
@@ -222,6 +225,7 @@ export default {
   mounted () {
     if (!this.$utils.tour.isFinishedTour('spider-detail')) {
       this.$tours['spider-detail'].start()
+      this.$st.sendEv('教程', '开始', 'spider-detail')
     }
   }
 }
diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index 29c9e479..c7107f11 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -386,6 +386,12 @@ export default {
       tourCallbacks: {
         onStop: () => {
           this.$utils.tour.finishTour('spider-list')
+        },
+        onPreviousStep: (currentStep) => {
+          this.$utils.tour.prevStep('spider-list', currentStep)
+        },
+        onNextStep: (currentStep) => {
+          this.$utils.tour.nextStep('spider-list', currentStep)
         }
       },
       tourAddSteps: [
@@ -463,11 +469,13 @@ export default {
           if (currentStep === 7) {
             this.spiderType = 'customized'
           }
+          this.$utils.tour.prevStep('spider-list-add', currentStep)
         },
         onNextStep: (currentStep) => {
           if (currentStep === 6) {
             this.spiderType = 'configurable'
           }
+          this.$utils.tour.nextStep('spider-list-add', currentStep)
         }
       }
     }
@@ -517,6 +525,7 @@ export default {
       setTimeout(() => {
         if (!this.$utils.tour.isFinishedTour('spider-list-add')) {
           this.$tours['spider-list-add'].start()
+          this.$st.sendEv('教程', '开始', 'spider-list-add')
         }
       }, 300)
     },
@@ -751,6 +760,7 @@ export default {
 
     if (!this.$utils.tour.isFinishedTour('spider-list')) {
       this.$tours['spider-list'].start()
+      this.$st.sendEv('教程', '开始', 'spider-list')
     }
   }
 }
diff --git a/frontend/src/views/task/TaskDetail.vue b/frontend/src/views/task/TaskDetail.vue
index 05217c1c..f52597ca 100644
--- a/frontend/src/views/task/TaskDetail.vue
+++ b/frontend/src/views/task/TaskDetail.vue
@@ -122,6 +122,7 @@ export default {
           } else if (currentStep === 6) {
             this.activeTabName = 'log'
           }
+          this.$utils.tour.prevStep('task-detail', currentStep)
         },
         onNextStep: (currentStep) => {
           if (currentStep === 4) {
@@ -129,6 +130,7 @@ export default {
           } else if (currentStep === 5) {
             this.activeTabName = 'results'
           }
+          this.$utils.tour.nextStep('task-detail', currentStep)
         }
       }
     }
@@ -201,6 +203,7 @@ export default {
   mounted () {
     if (!this.$utils.tour.isFinishedTour('task-detail')) {
       this.$tours['task-detail'].start()
+      this.$st.sendEv('教程', '开始', 'task-detail')
     }
   },
   destroyed () {
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index 0b600f8b..1eb5d484 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -236,8 +236,10 @@ export default {
           this.$utils.tour.finishTour('task-list')
         },
         onPreviousStep: (currentStep) => {
+          this.$utils.tour.prevStep('task-list', currentStep)
         },
         onNextStep: (currentStep) => {
+          this.$utils.tour.nextStep('task-list', currentStep)
         }
       }
     }
@@ -401,6 +403,7 @@ export default {
 
     if (!this.$utils.tour.isFinishedTour('task-list')) {
       this.$tours['task-list'].start()
+      this.$st.sendEv('教程', '开始', 'task-list')
     }
   },
   destroyed () {