From 857bcdba16b1407e1afe6ff2a8ba57b9097a7253 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 2 Jan 2020 11:16:42 +0800
Subject: [PATCH 01/31] fixed
 https://github.com/crawlab-team/crawlab/issues/391

---
 backend/services/node.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/services/node.go b/backend/services/node.go
index d14ce4ae..6ff68b2d 100644
--- a/backend/services/node.go
+++ b/backend/services/node.go
@@ -12,6 +12,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/apex/log"
+	"github.com/globalsign/mgo"
 	"github.com/globalsign/mgo/bson"
 	"github.com/gomodule/redigo/redis"
 	"runtime/debug"
@@ -116,7 +117,7 @@ func handleNodeInfo(key string, data *Data) {
 	defer s.Close()
 
 	var node model.Node
-	if err := c.Find(bson.M{"key": key}).One(&node); err != nil {
+	if err := c.Find(bson.M{"key": key}).One(&node); err != nil && err != mgo.ErrNotFound {
 		// 数据库不存在该节点
 		node = model.Node{
 			Key:          key,

From af93733bc5aed3b3c7624376cc0916416099b2d1 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 2 Jan 2020 12:51:21 +0800
Subject: [PATCH 02/31] fixed
 https://github.com/crawlab-team/crawlab/issues/391

---
 backend/services/node.go | 48 ++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/backend/services/node.go b/backend/services/node.go
index 6ff68b2d..515ce9c9 100644
--- a/backend/services/node.go
+++ b/backend/services/node.go
@@ -117,7 +117,7 @@ func handleNodeInfo(key string, data *Data) {
 	defer s.Close()
 
 	var node model.Node
-	if err := c.Find(bson.M{"key": key}).One(&node); err != nil && err != mgo.ErrNotFound {
+	if err := c.Find(bson.M{"key": key}).One(&node); err != nil && err == mgo.ErrNotFound {
 		// 数据库不存在该节点
 		node = model.Node{
 			Key:          key,
@@ -134,7 +134,7 @@ func handleNodeInfo(key string, data *Data) {
 			log.Errorf(err.Error())
 			return
 		}
-	} else {
+	} else if node.Key != "" {
 		// 数据库存在该节点
 		node.Status = constants.StatusOnline
 		node.UpdateTs = time.Now()
@@ -169,33 +169,27 @@ func UpdateNodeData() {
 		return
 	}
 
-	//先获取所有Redis的nodekey
-	list, _ := database.RedisClient.HKeys("nodes")
-
-	if i := utils.Contains(list, key); i == false {
-		// 构造节点数据
-		data := Data{
-			Key:          key,
-			Mac:          mac,
-			Ip:           ip,
-			Master:       model.IsMaster(),
-			UpdateTs:     time.Now(),
-			UpdateTsUnix: time.Now().Unix(),
-		}
-
-		// 注册节点到Redis
-		dataBytes, err := json.Marshal(&data)
-		if err != nil {
-			log.Errorf(err.Error())
-			debug.PrintStack()
-			return
-		}
-		if err := database.RedisClient.HSet("nodes", key, utils.BytesToString(dataBytes)); err != nil {
-			log.Errorf(err.Error())
-			return
-		}
+	// 构造节点数据
+	data := Data{
+		Key:          key,
+		Mac:          mac,
+		Ip:           ip,
+		Master:       model.IsMaster(),
+		UpdateTs:     time.Now(),
+		UpdateTsUnix: time.Now().Unix(),
 	}
 
+	// 注册节点到Redis
+	dataBytes, err := json.Marshal(&data)
+	if err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
+		return
+	}
+	if err := database.RedisClient.HSet("nodes", key, utils.BytesToString(dataBytes)); err != nil {
+		log.Errorf(err.Error())
+		return
+	}
 }
 
 func MasterNodeCallback(message redis.Message) (err error) {

From 836dc1270343779613a9e8f7132b1cb9245db8fa Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 2 Jan 2020 15:53:53 +0800
Subject: [PATCH 03/31] =?UTF-8?q?=E5=8A=A0=E5=85=A5RPC=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/constants/rpc.go   |   8 ++
 backend/database/redis.go  |  29 ++++-
 backend/main.go            |  11 +-
 backend/routes/system.go   |  78 ++++++++++++--
 backend/services/rpc.go    | 214 +++++++++++++++++++++++++++++++++++++
 backend/services/system.go | 106 +++++++++++++-----
 6 files changed, 408 insertions(+), 38 deletions(-)
 create mode 100644 backend/constants/rpc.go
 create mode 100644 backend/services/rpc.go

diff --git a/backend/constants/rpc.go b/backend/constants/rpc.go
new file mode 100644
index 00000000..117ed5c8
--- /dev/null
+++ b/backend/constants/rpc.go
@@ -0,0 +1,8 @@
+package constants
+
+const (
+	RpcInstallDep          = "install_dep"
+	RpcInstallLang         = "install_lang"
+	RpcGetDepList          = "get_dep_list"
+	RpcGetInstalledDepList = "get_installed_dep_list"
+)
diff --git a/backend/database/redis.go b/backend/database/redis.go
index b165aaa3..1a488767 100644
--- a/backend/database/redis.go
+++ b/backend/database/redis.go
@@ -42,6 +42,17 @@ func (r *Redis) RPush(collection string, value interface{}) error {
 	return nil
 }
 
+func (r *Redis) LPush(collection string, value interface{}) error {
+	c := r.pool.Get()
+	defer utils.Close(c)
+
+	if _, err := c.Do("RPUSH", collection, value); err != nil {
+		debug.PrintStack()
+		return err
+	}
+	return nil
+}
+
 func (r *Redis) LPop(collection string) (string, error) {
 	c := r.pool.Get()
 	defer utils.Close(c)
@@ -96,6 +107,20 @@ func (r *Redis) HKeys(collection string) ([]string, error) {
 	return value, nil
 }
 
+func (r *Redis) BRPop(collection string, timeout int) (string, error) {
+	if timeout <= 0 {
+		timeout = 60
+	}
+	c := r.pool.Get()
+	defer utils.Close(c)
+
+	value, err2 := redis.String(c.Do("BRPOP", collection, timeout))
+	if err2 != nil {
+		return value, err2
+	}
+	return value, nil
+}
+
 func NewRedisPool() *redis.Pool {
 	var address = viper.GetString("redis.address")
 	var port = viper.GetString("redis.port")
@@ -112,8 +137,8 @@ func NewRedisPool() *redis.Pool {
 		Dial: func() (conn redis.Conn, e error) {
 			return redis.DialURL(url,
 				redis.DialConnectTimeout(time.Second*10),
-				redis.DialReadTimeout(time.Second*10),
-				redis.DialWriteTimeout(time.Second*15),
+				redis.DialReadTimeout(time.Second*600),
+				redis.DialWriteTimeout(time.Second*10),
 			)
 		},
 		TestOnBorrow: func(c redis.Conn, t time.Time) error {
diff --git a/backend/main.go b/backend/main.go
index 6a807331..8968027c 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -110,12 +110,20 @@ func main() {
 
 	// 初始化依赖服务
 	if err := services.InitDepsFetcher(); err != nil {
-		log.Error("init user service error:" + err.Error())
+		log.Error("init dependency fetcher error:" + err.Error())
 		debug.PrintStack()
 		panic(err)
 	}
 	log.Info("initialized dependency fetcher successfully")
 
+	// 初始化RPC服务
+	if err := services.InitRpcService(); err != nil {
+		log.Error("init rpc service error:" + err.Error())
+		debug.PrintStack()
+		panic(err)
+	}
+	log.Info("initialized rpc service successfully")
+
 	// 以下为主节点服务
 	if model.IsMaster() {
 		// 中间件
@@ -139,6 +147,7 @@ func main() {
 			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.GET("/spiders", routes.GetSpiderList)                     // 爬虫列表
 			authGroup.GET("/spiders/:id", routes.GetSpider)                     // 爬虫详情
diff --git a/backend/routes/system.go b/backend/routes/system.go
index bcd186f8..409168d2 100644
--- a/backend/routes/system.go
+++ b/backend/routes/system.go
@@ -26,12 +26,21 @@ func GetDepList(c *gin.Context) {
 
 	var depList []entity.Dependency
 	if lang == constants.Python {
-		list, err := services.GetPythonDepList(nodeId, depName)
-		if err != nil {
-			HandleError(http.StatusInternalServerError, c, err)
-			return
+		if services.IsMasterNode(nodeId) {
+			list, err := services.GetPythonLocalDepList(nodeId, depName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+			depList = list
+		} else {
+			list, err := services.GetPythonRemoteDepList(nodeId, depName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+			depList = list
 		}
-		depList = list
 	} else {
 		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", lang))
 		return
@@ -49,12 +58,21 @@ func GetInstalledDepList(c *gin.Context) {
 	lang := c.Query("lang")
 	var depList []entity.Dependency
 	if lang == constants.Python {
-		list, err := services.GetPythonInstalledDepList(nodeId)
-		if err != nil {
-			HandleError(http.StatusInternalServerError, c, err)
-			return
+		if services.IsMasterNode(nodeId) {
+			list, err := services.GetPythonLocalInstalledDepList(nodeId)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+			depList = list
+		} else {
+			list, err := services.GetPythonRemoteInstalledDepList(nodeId)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+			depList = list
 		}
-		depList = list
 	} else {
 		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", lang))
 		return
@@ -108,3 +126,43 @@ func GetAllDepList(c *gin.Context) {
 		Data:    returnList,
 	})
 }
+
+func InstallDep(c *gin.Context) {
+	type ReqBody struct {
+		Lang    string `json:"lang"`
+		DepName string `json:"dep_name"`
+	}
+
+	nodeId := c.Param("id")
+
+	var reqBody ReqBody
+	if err := c.ShouldBindJSON(&reqBody); err != nil {
+		HandleError(http.StatusBadRequest, c, err)
+	}
+
+	if reqBody.Lang == constants.Python {
+		if services.IsMasterNode(nodeId) {
+			_, err := services.InstallPythonLocalDep(reqBody.DepName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		} else {
+			_, err := services.InstallPythonRemoteDep(nodeId, reqBody.DepName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		}
+	} else {
+		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", reqBody.Lang))
+		return
+	}
+
+	// TODO: check if install is successful
+
+	c.JSON(http.StatusOK, Response{
+		Status:  "ok",
+		Message: "success",
+	})
+}
diff --git a/backend/services/rpc.go b/backend/services/rpc.go
new file mode 100644
index 00000000..cc0762bb
--- /dev/null
+++ b/backend/services/rpc.go
@@ -0,0 +1,214 @@
+package services
+
+import (
+	"crawlab/constants"
+	"crawlab/database"
+	"crawlab/entity"
+	"crawlab/model"
+	"encoding/json"
+	"fmt"
+	"github.com/apex/log"
+	uuid "github.com/satori/go.uuid"
+	"runtime/debug"
+)
+
+type RpcMessage struct {
+	Id     string `json:"id"`
+	Method string `json:"method"`
+	Params string `json:"params"`
+	Result string `json:"result"`
+}
+
+func RpcServerInstallLang(msg RpcMessage) RpcMessage {
+	// install dep rpc
+	return msg
+}
+
+func RpcServerInstallDep(msg RpcMessage) RpcMessage {
+	lang := GetRpcParam("lang", msg.Params)
+	depName := GetRpcParam("dep_name", msg.Params)
+	if lang == constants.Python {
+		output, _ := InstallPythonLocalDep(depName)
+		msg.Result = output
+	}
+	return msg
+}
+
+func RpcClientInstallDep(nodeId string, lang string, depName string) (output string, err error) {
+	params := map[string]string{}
+	params["lang"] = lang
+	params["dep_name"] = depName
+
+	data, err := RpcClientFunc(nodeId, params, 10)()
+	if err != nil {
+		return
+	}
+
+	output = data.(string)
+
+	return
+}
+
+func RpcServerGetDepList(nodeId string, msg RpcMessage) RpcMessage {
+	lang := GetRpcParam("lang", msg.Params)
+	searchDepName := GetRpcParam("search_dep_name", msg.Params)
+	if lang == constants.Python {
+		depList, _ := GetPythonLocalDepList(nodeId, searchDepName)
+		resultStr, _ := json.Marshal(depList)
+		msg.Result = string(resultStr)
+	}
+	return msg
+}
+
+func RpcClientGetDepList(nodeId string, lang string, searchDepName string) (list []entity.Dependency, err error) {
+	params := map[string]string{}
+	params["lang"] = lang
+	params["search_dep_name"] = searchDepName
+
+	data, err := RpcClientFunc(nodeId, params, 30)()
+	if err != nil {
+		return
+	}
+
+	list = data.([]entity.Dependency)
+
+	return
+}
+
+func RpcServerGetInstalledDepList(nodeId string, msg RpcMessage) RpcMessage {
+	lang := GetRpcParam("lang", msg.Params)
+	if lang == constants.Python {
+		depList, _ := GetPythonLocalInstalledDepList(nodeId)
+		resultStr, _ := json.Marshal(depList)
+		msg.Result = string(resultStr)
+	}
+	return msg
+}
+
+func RpcClientGetInstalledDepList(nodeId string, lang string) (list []entity.Dependency, err error) {
+	params := map[string]string{}
+	params["lang"] = lang
+
+	data, err := RpcClientFunc(nodeId, params, 10)()
+	if err != nil {
+		return
+	}
+
+	list = data.([]entity.Dependency)
+
+	return
+}
+
+func RpcClientFunc(nodeId string, params interface{}, timeout int) func() (interface{}, error) {
+	return func() (data interface{}, err error) {
+		// 请求ID
+		id := uuid.NewV4().String()
+
+		// 构造RPC消息
+		msg := RpcMessage{
+			Id:     id,
+			Method: constants.RpcGetDepList,
+			Params: ObjectToString(params),
+			Result: "",
+		}
+
+		// 发送RPC消息
+		if err := database.RedisClient.LPush(fmt.Sprintf("rpc:%s", nodeId), ObjectToString(msg)); err != nil {
+			return data, err
+		}
+
+		// 获取RPC回复消息
+		dataStr, err := database.RedisClient.BRPop(fmt.Sprintf("rpc:%s", nodeId), timeout)
+		if err != nil {
+			return data, err
+		}
+
+		// 反序列化消息
+		if err := json.Unmarshal([]byte(dataStr), &msg); err != nil {
+			return data, err
+		}
+
+		// 反序列化列表
+		if err := json.Unmarshal([]byte(msg.Result), &data); err != nil {
+			return data, err
+		}
+
+		return data, err
+	}
+}
+
+func GetRpcParam(key string, params interface{}) string {
+	var paramsObj map[string]string
+	if err := json.Unmarshal([]byte(params.(string)), &paramsObj); err != nil {
+		return ""
+	}
+	return paramsObj[key]
+}
+
+func ObjectToString(params interface{}) string {
+	str, _ := json.Marshal(params)
+	return string(str)
+}
+
+var IsRpcStopped = false
+
+func StopRpcService() {
+	IsRpcStopped = true
+}
+
+func InitRpcService() error {
+	go func() {
+		for {
+			// 获取当前节点
+			node, err := model.GetCurrentNode()
+			if err != nil {
+				log.Errorf(err.Error())
+				debug.PrintStack()
+				continue
+			}
+
+			// 获取获取消息队列信息
+			dataStr, err := database.RedisClient.BRPop(fmt.Sprintf("rpc:%s", node.Id.Hex()), 300)
+			if err != nil {
+				log.Errorf(err.Error())
+				debug.PrintStack()
+				continue
+			}
+
+			// 反序列化消息
+			var msg RpcMessage
+			if err := json.Unmarshal([]byte(dataStr), &msg); err != nil {
+				log.Errorf(err.Error())
+				debug.PrintStack()
+				continue
+			}
+
+			// 根据Method调用本地方法
+			var replyMsg RpcMessage
+			if msg.Method == constants.RpcInstallDep {
+				replyMsg = RpcServerInstallDep(msg)
+			} else if msg.Method == constants.RpcInstallLang {
+				replyMsg = RpcServerInstallLang(msg)
+			} else if msg.Method == constants.RpcGetDepList {
+				replyMsg = RpcServerGetDepList(node.Id.Hex(), msg)
+			} else if msg.Method == constants.RpcGetInstalledDepList {
+				replyMsg = RpcServerGetInstalledDepList(node.Id.Hex(), msg)
+			} else {
+				continue
+			}
+
+			// 发送返回消息
+			if err := database.RedisClient.LPush(fmt.Sprintf("rpc:%s", node.Id.Hex()), ObjectToString(replyMsg)); err != nil {
+				log.Errorf(err.Error())
+				debug.PrintStack()
+				continue
+			}
+
+			// 如果停止RPC服务，则返回
+			if IsRpcStopped {
+				return
+			}
+		}
+	}()
+	return nil
+}
diff --git a/backend/services/system.go b/backend/services/system.go
index 045ecbff..fc7e0bad 100644
--- a/backend/services/system.go
+++ b/backend/services/system.go
@@ -41,8 +41,10 @@ func (s PythonDepNameDictSlice) Len() int           { return len(s) }
 func (s PythonDepNameDictSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
 func (s PythonDepNameDictSlice) Less(i, j int) bool { return s[i].Weight > s[j].Weight }
 
+// 系统信息 chan 映射
 var SystemInfoChanMap = utils.NewChanMap()
 
+// 从远端获取系统信息
 func GetRemoteSystemInfo(nodeId string) (sysInfo entity.SystemInfo, err error) {
 	// 发送消息
 	msg := entity.NodeMessage{
@@ -70,6 +72,7 @@ func GetRemoteSystemInfo(nodeId string) (sysInfo entity.SystemInfo, err error) {
 	return sysInfo, nil
 }
 
+// 获取系统信息
 func GetSystemInfo(nodeId string) (sysInfo entity.SystemInfo, err error) {
 	if IsMasterNode(nodeId) {
 		sysInfo, err = model.GetLocalSystemInfo()
@@ -79,6 +82,7 @@ func GetSystemInfo(nodeId string) (sysInfo entity.SystemInfo, err error) {
 	return
 }
 
+// 获取语言列表
 func GetLangList(nodeId string) []entity.Lang {
 	list := []entity.Lang{
 		{Name: "Python", ExecutableName: "python", ExecutablePath: "/usr/local/bin/python", DepExecutablePath: "/usr/local/bin/pip"},
@@ -91,6 +95,7 @@ func GetLangList(nodeId string) []entity.Lang {
 	return list
 }
 
+// 根据语言名获取语言实例
 func GetLangFromLangName(nodeId string, name string) entity.Lang {
 	langList := GetLangList(nodeId)
 	for _, lang := range langList {
@@ -101,7 +106,22 @@ func GetLangFromLangName(nodeId string, name string) entity.Lang {
 	return entity.Lang{}
 }
 
-func GetPythonDepList(nodeId string, searchDepName string) ([]entity.Dependency, error) {
+// 是否已安装该依赖
+func IsInstalledLang(nodeId string, lang entity.Lang) bool {
+	sysInfo, err := GetSystemInfo(nodeId)
+	if err != nil {
+		return false
+	}
+	for _, exec := range sysInfo.Executables {
+		if exec.Path == lang.ExecutablePath {
+			return true
+		}
+	}
+	return false
+}
+
+// 获取Python本地依赖列表
+func GetPythonLocalDepList(nodeId string, searchDepName string) ([]entity.Dependency, error) {
 	var list []entity.Dependency
 
 	// 先从 Redis 获取
@@ -130,7 +150,7 @@ func GetPythonDepList(nodeId string, searchDepName string) ([]entity.Dependency,
 	}
 
 	// 获取已安装依赖
-	installedDepList, err := GetPythonInstalledDepList(nodeId)
+	installedDepList, err := GetPythonLocalInstalledDepList(nodeId)
 	if err != nil {
 		return list, err
 	}
@@ -170,6 +190,16 @@ func GetPythonDepList(nodeId string, searchDepName string) ([]entity.Dependency,
 	return list, nil
 }
 
+// 获取Python远端依赖列表
+func GetPythonRemoteDepList(nodeId string, searchDepName string) ([]entity.Dependency, error) {
+	depList, err := RpcClientGetDepList(nodeId, constants.Python, searchDepName)
+	if err != nil {
+		return depList, err
+	}
+	return depList, nil
+}
+
+// 从Redis获取Python依赖列表
 func GetPythonDepListFromRedis() ([]string, error) {
 	var list []string
 
@@ -192,28 +222,7 @@ func GetPythonDepListFromRedis() ([]string, error) {
 	return list, nil
 }
 
-func IsInstalledLang(nodeId string, lang entity.Lang) bool {
-	sysInfo, err := GetSystemInfo(nodeId)
-	if err != nil {
-		return false
-	}
-	for _, exec := range sysInfo.Executables {
-		if exec.Path == lang.ExecutablePath {
-			return true
-		}
-	}
-	return false
-}
-
-func IsInstalledDep(installedDepList []entity.Dependency, dep entity.Dependency) bool {
-	for _, _dep := range installedDepList {
-		if strings.ToLower(_dep.Name) == strings.ToLower(dep.Name) {
-			return true
-		}
-	}
-	return false
-}
-
+// 从Python依赖源获取依赖列表并返回
 func FetchPythonDepList() ([]string, error) {
 	// 依赖URL
 	url := "https://pypi.tuna.tsinghua.edu.cn/simple"
@@ -251,6 +260,7 @@ func FetchPythonDepList() ([]string, error) {
 	return list, nil
 }
 
+// 更新Python依赖列表到Redis
 func UpdatePythonDepList() {
 	// 从依赖源获取列表
 	list, _ := FetchPythonDepList()
@@ -271,7 +281,8 @@ func UpdatePythonDepList() {
 	}
 }
 
-func GetPythonInstalledDepList(nodeId string) ([]entity.Dependency, error){
+// 获取Python本地已安装的依赖列表
+func GetPythonLocalInstalledDepList(nodeId string) ([]entity.Dependency, error) {
 	var list []entity.Dependency
 
 	lang := GetLangFromLangName(nodeId, constants.Python)
@@ -301,11 +312,56 @@ func GetPythonInstalledDepList(nodeId string) ([]entity.Dependency, error){
 	return list, nil
 }
 
+// 获取Python远端依赖列表
+func GetPythonRemoteInstalledDepList(nodeId string) ([]entity.Dependency, error) {
+	depList, err := RpcClientGetInstalledDepList(nodeId, constants.Python)
+	if err != nil {
+		return depList, err
+	}
+	return depList, nil
+}
+
+// 是否已安装该依赖
+func IsInstalledDep(installedDepList []entity.Dependency, dep entity.Dependency) bool {
+	for _, _dep := range installedDepList {
+		if strings.ToLower(_dep.Name) == strings.ToLower(dep.Name) {
+			return true
+		}
+	}
+	return false
+}
+
+// 安装Python本地依赖
+func InstallPythonLocalDep(depName string) (string, error) {
+	// 依赖镜像URL
+	url := "https://pypi.tuna.tsinghua.edu.cn/simple"
+
+	cmd := exec.Command("pip", "install", depName, "-i", url)
+	outputBytes, err := cmd.Output()
+	if err != nil {
+		return fmt.Sprintf("error: %s", err.Error()), err
+	}
+	return string(outputBytes), nil
+}
+
+// 获取Python远端依赖列表
+func InstallPythonRemoteDep(nodeId string, depName string) (string, error) {
+	output, err := RpcClientInstallDep(nodeId, constants.Python, depName)
+	if err != nil {
+		return output, err
+	}
+	return output, nil
+}
+
 func InitDepsFetcher() error {
 	c := cron.New(cron.WithSeconds())
 	c.Start()
 	if _, err := c.AddFunc("0 */5 * * * *", UpdatePythonDepList); err != nil {
 		return err
 	}
+
+	go func() {
+		UpdatePythonDepList()
+	}()
 	return nil
 }

From 53c77eb6e94d887a6dc33c8c745af8959533d94b Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 2 Jan 2020 17:38:39 +0800
Subject: [PATCH 04/31] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8D=B8=E8=BD=BD?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/constants/rpc.go                      |  3 +-
 backend/database/redis.go                     |  8 +-
 backend/main.go                               |  1 +
 backend/routes/system.go                      | 59 +++++++++---
 backend/services/rpc.go                       | 77 ++++++++--------
 backend/services/system.go                    | 92 +++++++++++++------
 .../src/components/Node/NodeInstallation.vue  | 81 +++++++++++++++-
 frontend/src/i18n/zh.js                       |  8 ++
 8 files changed, 237 insertions(+), 92 deletions(-)

diff --git a/backend/constants/rpc.go b/backend/constants/rpc.go
index 117ed5c8..6eebf0d5 100644
--- a/backend/constants/rpc.go
+++ b/backend/constants/rpc.go
@@ -1,8 +1,9 @@
 package constants
 
 const (
-	RpcInstallDep          = "install_dep"
 	RpcInstallLang         = "install_lang"
+	RpcInstallDep          = "install_dep"
+	RpcUninstallDep        = "uninstall_dep"
 	RpcGetDepList          = "get_dep_list"
 	RpcGetInstalledDepList = "get_installed_dep_list"
 )
diff --git a/backend/database/redis.go b/backend/database/redis.go
index 1a488767..bd4e5c10 100644
--- a/backend/database/redis.go
+++ b/backend/database/redis.go
@@ -114,11 +114,11 @@ func (r *Redis) BRPop(collection string, timeout int) (string, error) {
 	c := r.pool.Get()
 	defer utils.Close(c)
 
-	value, err2 := redis.String(c.Do("BRPOP", collection, timeout))
-	if err2 != nil {
-		return value, err2
+	values, err := redis.Strings(c.Do("BRPOP", collection, timeout))
+	if err != nil {
+		return "", err
 	}
-	return value, nil
+	return values[1], nil
 }
 
 func NewRedisPool() *redis.Pool {
diff --git a/backend/main.go b/backend/main.go
index 8968027c..5c3a4e88 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -148,6 +148,7 @@ func main() {
 			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.GET("/spiders", routes.GetSpiderList)                     // 爬虫列表
 			authGroup.GET("/spiders/:id", routes.GetSpider)                     // 爬虫详情
diff --git a/backend/routes/system.go b/backend/routes/system.go
index 409168d2..d883efb3 100644
--- a/backend/routes/system.go
+++ b/backend/routes/system.go
@@ -26,21 +26,12 @@ func GetDepList(c *gin.Context) {
 
 	var depList []entity.Dependency
 	if lang == constants.Python {
-		if services.IsMasterNode(nodeId) {
-			list, err := services.GetPythonLocalDepList(nodeId, depName)
-			if err != nil {
-				HandleError(http.StatusInternalServerError, c, err)
-				return
-			}
-			depList = list
-		} else {
-			list, err := services.GetPythonRemoteDepList(nodeId, depName)
-			if err != nil {
-				HandleError(http.StatusInternalServerError, c, err)
-				return
-			}
-			depList = list
+		list, err := services.GetPythonDepList(nodeId, depName)
+		if err != nil {
+			HandleError(http.StatusInternalServerError, c, err)
+			return
 		}
+		depList = list
 	} else {
 		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", lang))
 		return
@@ -166,3 +157,43 @@ func InstallDep(c *gin.Context) {
 		Message: "success",
 	})
 }
+
+func UninstallDep(c *gin.Context) {
+	type ReqBody struct {
+		Lang    string `json:"lang"`
+		DepName string `json:"dep_name"`
+	}
+
+	nodeId := c.Param("id")
+
+	var reqBody ReqBody
+	if err := c.ShouldBindJSON(&reqBody); err != nil {
+		HandleError(http.StatusBadRequest, c, err)
+	}
+
+	if reqBody.Lang == constants.Python {
+		if services.IsMasterNode(nodeId) {
+			_, err := services.UninstallPythonLocalDep(reqBody.DepName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		} else {
+			_, err := services.UninstallPythonRemoteDep(nodeId, reqBody.DepName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		}
+	} else {
+		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", reqBody.Lang))
+		return
+	}
+
+	// TODO: check if uninstall is successful
+
+	c.JSON(http.StatusOK, Response{
+		Status:  "ok",
+		Message: "success",
+	})
+}
diff --git a/backend/services/rpc.go b/backend/services/rpc.go
index cc0762bb..77d0c217 100644
--- a/backend/services/rpc.go
+++ b/backend/services/rpc.go
@@ -5,6 +5,7 @@ import (
 	"crawlab/database"
 	"crawlab/entity"
 	"crawlab/model"
+	"crawlab/utils"
 	"encoding/json"
 	"fmt"
 	"github.com/apex/log"
@@ -13,10 +14,10 @@ import (
 )
 
 type RpcMessage struct {
-	Id     string `json:"id"`
-	Method string `json:"method"`
-	Params string `json:"params"`
-	Result string `json:"result"`
+	Id     string            `json:"id"`
+	Method string            `json:"method"`
+	Params map[string]string `json:"params"`
+	Result string            `json:"result"`
 }
 
 func RpcServerInstallLang(msg RpcMessage) RpcMessage {
@@ -39,38 +40,37 @@ func RpcClientInstallDep(nodeId string, lang string, depName string) (output str
 	params["lang"] = lang
 	params["dep_name"] = depName
 
-	data, err := RpcClientFunc(nodeId, params, 10)()
+	data, err := RpcClientFunc(nodeId, constants.RpcInstallDep, params, 10)()
 	if err != nil {
 		return
 	}
 
-	output = data.(string)
+	output = data
 
 	return
 }
 
-func RpcServerGetDepList(nodeId string, msg RpcMessage) RpcMessage {
+func RpcServerUninstallDep(msg RpcMessage) RpcMessage {
 	lang := GetRpcParam("lang", msg.Params)
-	searchDepName := GetRpcParam("search_dep_name", msg.Params)
+	depName := GetRpcParam("dep_name", msg.Params)
 	if lang == constants.Python {
-		depList, _ := GetPythonLocalDepList(nodeId, searchDepName)
-		resultStr, _ := json.Marshal(depList)
-		msg.Result = string(resultStr)
+		output, _ := UninstallPythonLocalDep(depName)
+		msg.Result = output
 	}
 	return msg
 }
 
-func RpcClientGetDepList(nodeId string, lang string, searchDepName string) (list []entity.Dependency, err error) {
+func RpcClientUninstallDep(nodeId string, lang string, depName string) (output string, err error) {
 	params := map[string]string{}
 	params["lang"] = lang
-	params["search_dep_name"] = searchDepName
+	params["dep_name"] = depName
 
-	data, err := RpcClientFunc(nodeId, params, 30)()
+	data, err := RpcClientFunc(nodeId, constants.RpcUninstallDep, params, 60)()
 	if err != nil {
 		return
 	}
 
-	list = data.([]entity.Dependency)
+	output = data
 
 	return
 }
@@ -89,65 +89,60 @@ func RpcClientGetInstalledDepList(nodeId string, lang string) (list []entity.Dep
 	params := map[string]string{}
 	params["lang"] = lang
 
-	data, err := RpcClientFunc(nodeId, params, 10)()
+	data, err := RpcClientFunc(nodeId, constants.RpcGetInstalledDepList, params, 10)()
 	if err != nil {
 		return
 	}
 
-	list = data.([]entity.Dependency)
+	// 反序列化结果
+	if err := json.Unmarshal([]byte(data), &list); err != nil {
+		return list, err
+	}
 
 	return
 }
 
-func RpcClientFunc(nodeId string, params interface{}, timeout int) func() (interface{}, error) {
-	return func() (data interface{}, err error) {
+func RpcClientFunc(nodeId string, method string, params map[string]string, timeout int) func() (string, error) {
+	return func() (result string, err error) {
 		// 请求ID
 		id := uuid.NewV4().String()
 
 		// 构造RPC消息
 		msg := RpcMessage{
 			Id:     id,
-			Method: constants.RpcGetDepList,
-			Params: ObjectToString(params),
+			Method: method,
+			Params: params,
 			Result: "",
 		}
 
 		// 发送RPC消息
-		if err := database.RedisClient.LPush(fmt.Sprintf("rpc:%s", nodeId), ObjectToString(msg)); err != nil {
-			return data, err
+		msgStr := ObjectToString(msg)
+		if err := database.RedisClient.LPush(fmt.Sprintf("rpc:%s", nodeId), msgStr); err != nil {
+			return result, err
 		}
 
 		// 获取RPC回复消息
 		dataStr, err := database.RedisClient.BRPop(fmt.Sprintf("rpc:%s", nodeId), timeout)
 		if err != nil {
-			return data, err
+			return result, err
 		}
 
 		// 反序列化消息
 		if err := json.Unmarshal([]byte(dataStr), &msg); err != nil {
-			return data, err
+			return result, err
 		}
 
-		// 反序列化列表
-		if err := json.Unmarshal([]byte(msg.Result), &data); err != nil {
-			return data, err
-		}
-
-		return data, err
+		return msg.Result, err
 	}
 }
 
-func GetRpcParam(key string, params interface{}) string {
-	var paramsObj map[string]string
-	if err := json.Unmarshal([]byte(params.(string)), &paramsObj); err != nil {
-		return ""
-	}
-	return paramsObj[key]
+func GetRpcParam(key string, params map[string]string) string {
+	return params[key]
 }
 
 func ObjectToString(params interface{}) string {
-	str, _ := json.Marshal(params)
-	return string(str)
+	bytes, _ := json.Marshal(params)
+	return utils.BytesToString(bytes)
 }
 
 var IsRpcStopped = false
@@ -187,10 +182,10 @@ func InitRpcService() error {
 			var replyMsg RpcMessage
 			if msg.Method == constants.RpcInstallDep {
 				replyMsg = RpcServerInstallDep(msg)
+			} else if msg.Method == constants.RpcUninstallDep {
+				replyMsg = RpcServerUninstallDep(msg)
 			} else if msg.Method == constants.RpcInstallLang {
 				replyMsg = RpcServerInstallLang(msg)
-			} else if msg.Method == constants.RpcGetDepList {
-				replyMsg = RpcServerGetDepList(node.Id.Hex(), msg)
 			} else if msg.Method == constants.RpcGetInstalledDepList {
 				replyMsg = RpcServerGetInstalledDepList(node.Id.Hex(), msg)
 			} else {
diff --git a/backend/services/system.go b/backend/services/system.go
index fc7e0bad..e84a1255 100644
--- a/backend/services/system.go
+++ b/backend/services/system.go
@@ -121,7 +121,7 @@ func IsInstalledLang(nodeId string, lang entity.Lang) bool {
 }
 
 // 获取Python本地依赖列表
-func GetPythonLocalDepList(nodeId string, searchDepName string) ([]entity.Dependency, error) {
+func GetPythonDepList(nodeId string, searchDepName string) ([]entity.Dependency, error) {
 	var list []entity.Dependency
 
 	// 先从 Redis 获取
@@ -149,22 +149,51 @@ func GetPythonLocalDepList(nodeId string, searchDepName string) ([]entity.Depend
 		}
 	}
 
-	// 获取已安装依赖
-	installedDepList, err := GetPythonLocalInstalledDepList(nodeId)
-	if err != nil {
-		return list, err
+	// 获取已安装依赖列表
+	var installedDepList []entity.Dependency
+	if IsMasterNode(nodeId) {
+		installedDepList, err = GetPythonLocalInstalledDepList(nodeId)
+		if err != nil {
+			return list, err
+		}
+	} else {
+		installedDepList, err = GetPythonRemoteInstalledDepList(nodeId)
+		if err != nil {
+			return list, err
+		}
 	}
 
-	// 从依赖源获取数据
-	var goSync sync.WaitGroup
+	// 根据依赖名排序
 	sort.Stable(depNameList)
+
+	// 遍历依赖名列表，取前10个
 	for i, depNameDict := range depNameList {
+		if i > 10 {
+			break
+		}
+		dep := entity.Dependency{
+			Name: depNameDict.Name,
+		}
+		dep.Installed = IsInstalledDep(installedDepList, dep)
+		list = append(list, dep)
+	}
+
+	// 从依赖源获取信息
+	list, err = GetPythonDepListWithInfo(list)
+
+	return list, nil
+}
+
+// 获取Python依赖的源数据信息
+func GetPythonDepListWithInfo(depList []entity.Dependency) ([]entity.Dependency, error) {
+	var goSync sync.WaitGroup
+	for i, dep := range depList {
 		if i > 10 {
 			break
 		}
 		goSync.Add(1)
-		go func(depName string, n *sync.WaitGroup) {
-			url := fmt.Sprintf("https://pypi.org/pypi/%s/json", depName)
+		go func(i int, dep entity.Dependency, depList []entity.Dependency, n *sync.WaitGroup) {
+			url := fmt.Sprintf("https://pypi.org/pypi/%s/json", dep.Name)
 			res, err := req.Get(url)
 			if err != nil {
 				n.Done()
@@ -175,27 +204,12 @@ func GetPythonLocalDepList(nodeId string, searchDepName string) ([]entity.Depend
 				n.Done()
 				return
 			}
-			dep := entity.Dependency{
-				Name:        depName,
-				Version:     data.Info.Version,
-				Description: data.Info.Summary,
-			}
-			dep.Installed = IsInstalledDep(installedDepList, dep)
-			list = append(list, dep)
+			depList[i].Version = data.Info.Version
+			depList[i].Description = data.Info.Summary
 			n.Done()
-		}(depNameDict.Name, &goSync)
+		}(i, dep, depList, &goSync)
 	}
 	goSync.Wait()
-
-	return list, nil
-}
-
-// 获取Python远端依赖列表
-func GetPythonRemoteDepList(nodeId string, searchDepName string) ([]entity.Dependency, error) {
-	depList, err := RpcClientGetDepList(nodeId, constants.Python, searchDepName)
-	if err != nil {
-		return depList, err
-	}
 	return depList, nil
 }
 
@@ -339,6 +353,8 @@ func InstallPythonLocalDep(depName string) (string, error) {
 	cmd := exec.Command("pip", "install", depName, "-i", url)
 	outputBytes, err := cmd.Output()
 	if err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
 		return fmt.Sprintf("error: %s", err.Error()), err
 	}
 	return string(outputBytes), nil
@@ -353,6 +369,28 @@ func InstallPythonRemoteDep(nodeId string, depName string) (string, error) {
 	return output, nil
 }
 
+// 安装Python本地依赖
+func UninstallPythonLocalDep(depName string) (string, error) {
+	cmd := exec.Command("pip", "uninstall", "-y", depName)
+	outputBytes, err := cmd.Output()
+	if err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
+		return fmt.Sprintf("error: %s", err.Error()), err
+	}
+	return string(outputBytes), nil
+}
+
+// 获取Python远端依赖列表
+func UninstallPythonRemoteDep(nodeId string, depName string) (string, error) {
+	output, err := RpcClientUninstallDep(nodeId, constants.Python, depName)
+	if err != nil {
+		return output, err
+	}
+	return output, nil
+}
+
+// 初始化函数
 func InitDepsFetcher() error {
 	c := cron.New(cron.WithSeconds())
 	c.Start()
diff --git a/frontend/src/components/Node/NodeInstallation.vue b/frontend/src/components/Node/NodeInstallation.vue
index d9de222d..df487434 100644
--- a/frontend/src/components/Node/NodeInstallation.vue
+++ b/frontend/src/components/Node/NodeInstallation.vue
@@ -51,10 +51,22 @@
         >
           <template slot-scope="scope">
             <el-button
+              v-if="!scope.row.installed"
+              v-loading="getDepLoading(scope.row)"
               size="mini"
-              :type="scope.row.installed ? 'danger' : 'primary' "
+              type="primary"
+              @click="onClickInstallDep(scope.row)"
             >
-              {{scope.row.installed ? $t('Uninstall') : $t('Install')}}
+              {{$t('Install')}}
+            </el-button>
+            <el-button
+              v-else
+              v-loading="getDepLoading(scope.row)"
+              size="mini"
+              type="danger"
+              @click="onClickUninstallDep(scope.row)"
+            >
+              {{$t('Uninstall')}}
             </el-button>
           </template>
         </el-table-column>
@@ -63,7 +75,10 @@
     <template v-else>
       <div class="install-wrapper">
         <h3>{{activeLang.name + $t(' is not installed, do you want to install it?')}}</h3>
-        <el-button type="primary" style="width: 240px;font-weight: bolder;font-size: 18px">
+        <el-button
+          type="primary"
+          style="width: 240px;font-weight: bolder;font-size: 18px"
+        >
           {{$t('Install')}}
         </el-button>
       </div>
@@ -86,7 +101,8 @@ export default {
       depList: [],
       loading: false,
       isShowInstalled: false,
-      installedDepList: []
+      installedDepList: [],
+      depLoadingDict: {}
     }
   },
   computed: {
@@ -147,6 +163,59 @@ export default {
       if (val) {
         this.getInstalledDepList()
       }
+    },
+    async onClickInstallDep (dep) {
+      const name = dep.name
+      this.$set(this.depLoadingDict, name, true)
+      const arr = this.$route.path.split('/')
+      const id = arr[arr.length - 1]
+      const data = await this.$request.post(`/nodes/${id}/deps/install`, {
+        lang: this.activeLang.executable_name,
+        dep_name: name
+      })
+      if (!data || data.error) {
+        this.$notify.error({
+          title: this.$t('Installing dependency failed'),
+          message: this.$t('The dependency installation is unsuccessful: ') + name
+        })
+      } else {
+        this.$notify.success({
+          title: this.$t('Installing dependency successful'),
+          message: this.$t('You have successfully installed a dependency: ') + name
+        })
+        dep.installed = true
+      }
+      this.$set(this.depLoadingDict, name, false)
+    },
+    async onClickUninstallDep (dep) {
+      const name = dep.name
+      this.$set(this.depLoadingDict, name, true)
+      const arr = this.$route.path.split('/')
+      const id = arr[arr.length - 1]
+      const data = await this.$request.post(`/nodes/${id}/deps/uninstall`, {
+        lang: this.activeLang.executable_name,
+        dep_name: name
+      })
+      if (!data || data.error) {
+        this.$notify.error({
+          title: this.$t('Uninstalling dependency failed'),
+          message: this.$t('The dependency uninstallation is unsuccessful: ') + name
+        })
+      } else {
+        this.$notify.success({
+          title: this.$t('Uninstalling dependency successful'),
+          message: this.$t('You have successfully uninstalled a dependency: ') + name
+        })
+        dep.installed = false
+      }
+      this.$set(this.depLoadingDict, name, false)
+    },
+    getDepLoading (dep) {
+      const name = dep.name
+      if (this.depLoadingDict[name] === undefined) {
+        return false
+      }
+      return this.depLoadingDict[name]
     }
   },
   async created () {
@@ -160,5 +229,7 @@ export default {
 </script>
 
 <style scoped>
-
+  .install-wrapper >>> .el-button .el-loading-spinner {
+    height: 100%;
+  }
 </style>
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 7fef483c..665f49e5 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -300,6 +300,14 @@ export default {
   'Please search dependencies': '请搜索依赖',
   'No Data': '暂无数据',
   'Show installed': '只看已安装',
+  'Installing dependency successful': '安装依赖成功',
+  'Installing dependency failed': '安装依赖失败',
+  'You have successfully installed a dependency: ': '您已成功安装依赖: ',
+  'The dependency installation is unsuccessful: ': '安装依赖失败: ',
+  'Uninstalling dependency successful': '卸载依赖成功',
+  'Uninstalling dependency failed': '卸载依赖失败',
+  'You have successfully uninstalled a dependency: ': '您已成功卸载依赖: ',
+  'The dependency uninstallation is unsuccessful: ': '卸载依赖失败: ',
 
   // 登录
   'Sign in': '登录',

From 98cc4646a360b80db5edb139d3ce011a6db88632 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 10:54:20 +0800
Subject: [PATCH 05/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/database/redis.go  | 11 +++++++++++
 backend/main.go            |  3 ++-
 backend/routes/system.go   | 26 +++++++++++++++++++++++++-
 backend/services/system.go | 28 +++++++++++++++++++++++++---
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/backend/database/redis.go b/backend/database/redis.go
index bd4e5c10..4ecabbbd 100644
--- a/backend/database/redis.go
+++ b/backend/database/redis.go
@@ -36,6 +36,7 @@ func (r *Redis) RPush(collection string, value interface{}) error {
 	defer utils.Close(c)
 
 	if _, err := c.Do("RPUSH", collection, value); err != nil {
+		log.Error(err.Error())
 		debug.PrintStack()
 		return err
 	}
@@ -47,6 +48,7 @@ func (r *Redis) LPush(collection string, value interface{}) error {
 	defer utils.Close(c)
 
 	if _, err := c.Do("RPUSH", collection, value); err != nil {
+		log.Error(err.Error())
 		debug.PrintStack()
 		return err
 	}
@@ -69,6 +71,7 @@ func (r *Redis) HSet(collection string, key string, value string) error {
 	defer utils.Close(c)
 
 	if _, err := c.Do("HSET", collection, key, value); err != nil {
+		log.Error(err.Error())
 		debug.PrintStack()
 		return err
 	}
@@ -81,6 +84,8 @@ func (r *Redis) HGet(collection string, key string) (string, error) {
 
 	value, err2 := redis.String(c.Do("HGET", collection, key))
 	if err2 != nil {
+		log.Error(err2.Error())
+		debug.PrintStack()
 		return value, err2
 	}
 	return value, nil
@@ -91,6 +96,8 @@ func (r *Redis) HDel(collection string, key string) error {
 	defer utils.Close(c)
 
 	if _, err := c.Do("HDEL", collection, key); err != nil {
+		log.Error(err.Error())
+		debug.PrintStack()
 		return err
 	}
 	return nil
@@ -102,6 +109,8 @@ func (r *Redis) HKeys(collection string) ([]string, error) {
 
 	value, err2 := redis.Strings(c.Do("HKeys", collection))
 	if err2 != nil {
+		log.Error(err2.Error())
+		debug.PrintStack()
 		return []string{}, err2
 	}
 	return value, nil
@@ -116,6 +125,8 @@ func (r *Redis) BRPop(collection string, timeout int) (string, error) {
 
 	values, err := redis.Strings(c.Do("BRPOP", collection, timeout))
 	if err != nil {
+		log.Error(err.Error())
+		debug.PrintStack()
 		return "", err
 	}
 	return values[1], nil
diff --git a/backend/main.go b/backend/main.go
index 5c3a4e88..c7ae7ec1 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -206,7 +206,8 @@ func main() {
 			// release版本
 			authGroup.GET("/version", routes.GetVersion) // 获取发布的版本
 			// 系统
-			authGroup.GET("/system/deps", routes.GetAllDepList) // 节点所有第三方依赖列表
+			authGroup.GET("/system/deps/:lang", routes.GetAllDepList)             // 节点所有第三方依赖列表
+			authGroup.GET("/system/deps/:lang/:dep_name/json", routes.GetDepJson) // 节点第三方依赖JSON
 		}
 
 	}
diff --git a/backend/routes/system.go b/backend/routes/system.go
index d883efb3..43b37cf9 100644
--- a/backend/routes/system.go
+++ b/backend/routes/system.go
@@ -77,7 +77,7 @@ func GetInstalledDepList(c *gin.Context) {
 }
 
 func GetAllDepList(c *gin.Context) {
-	lang := c.Query("lang")
+	lang := c.Param("lang")
 	depName := c.Query("dep_name")
 
 	// 获取所有依赖列表
@@ -197,3 +197,27 @@ func UninstallDep(c *gin.Context) {
 		Message: "success",
 	})
 }
+
+func GetDepJson(c *gin.Context) {
+	depName := c.Param("dep_name")
+	lang := c.Param("lang")
+
+	var dep entity.Dependency
+	if lang == constants.Python {
+		_dep, err := services.FetchPythonDepInfo(depName)
+		if err != nil {
+			HandleError(http.StatusInternalServerError, c, err)
+		}
+		dep = _dep
+	} else {
+		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", lang))
+		return
+	}
+
+	c.Header("Cache-Control", "max-age=86400")
+	c.JSON(http.StatusOK, Response{
+		Status:  "ok",
+		Message: "success",
+		Data:    dep,
+	})
+}
diff --git a/backend/services/system.go b/backend/services/system.go
index e84a1255..f1a4c4e6 100644
--- a/backend/services/system.go
+++ b/backend/services/system.go
@@ -166,9 +166,9 @@ func GetPythonDepList(nodeId string, searchDepName string) ([]entity.Dependency,
 	// 根据依赖名排序
 	sort.Stable(depNameList)
 
-	// 遍历依赖名列表，取前10个
+	// 遍历依赖名列表，取前20个
 	for i, depNameDict := range depNameList {
-		if i > 10 {
+		if i > 20 {
 			break
 		}
 		dep := entity.Dependency{
@@ -179,7 +179,7 @@ func GetPythonDepList(nodeId string, searchDepName string) ([]entity.Dependency,
 	}
 
 	// 从依赖源获取信息
-	list, err = GetPythonDepListWithInfo(list)
+	//list, err = GetPythonDepListWithInfo(list)
 
 	return list, nil
 }
@@ -213,6 +213,28 @@ func GetPythonDepListWithInfo(depList []entity.Dependency) ([]entity.Dependency,
 	return depList, nil
 }
 
+func FetchPythonDepInfo(depName string) (entity.Dependency, error) {
+	url := fmt.Sprintf("https://pypi.org/pypi/%s/json", depName)
+	res, err := req.Get(url)
+	if err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
+		return entity.Dependency{}, err
+	}
+	var data PythonDepJsonData
+	if err := res.ToJSON(&data); err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
+		return entity.Dependency{}, err
+	}
+	dep := entity.Dependency{
+		Name:        depName,
+		Version:     data.Info.Version,
+		Description: data.Info.Summary,
+	}
+	return dep, nil
+}
+
 // 从Redis获取Python依赖列表
 func GetPythonDepListFromRedis() ([]string, error) {
 	var list []string

From e42dc9c759a8d6c8e4077e1d670e5c33307393f2 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 10:54:43 +0800
Subject: [PATCH 06/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Node/NodeInstallation.vue  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Node/NodeInstallation.vue b/frontend/src/components/Node/NodeInstallation.vue
index df487434..320b0b7f 100644
--- a/frontend/src/components/Node/NodeInstallation.vue
+++ b/frontend/src/components/Node/NodeInstallation.vue
@@ -7,7 +7,7 @@
           style="width: 240px"
           :placeholder="$t('Search Dependencies')"
           :fetchSuggestions="fetchAllDepList"
-          minlength="2"
+          :minlength="2"
           @select="onSearch"
         />
       </el-form-item>
@@ -134,6 +134,13 @@ export default {
       })
       this.loading = false
       this.depList = res.data.data.sort((a, b) => a.name > b.name ? 1 : -1)
+      this.depList.map(async dep => {
+        this.$set(dep, 'loading', true)
+        const res = await this.$request.get(`/system/deps/${this.activeLang.executable_name}/${dep.name}/json`)
+        dep.version = res.data.data.version
+        dep.description = res.data.data.description
+        this.$set(dep, 'loading', false)
+      })
     },
     async getInstalledDepList () {
       this.loading = true
@@ -144,8 +151,7 @@ export default {
       this.installedDepList = res.data.data
     },
     async fetchAllDepList (queryString, callback) {
-      const res = await this.$request.get('/system/deps', {
-        lang: this.activeLang.executable_name,
+      const res = await this.$request.get(`/system/deps/${this.activeLang.executable_name}`, {
         dep_name: queryString
       })
       callback(res.data.data ? res.data.data.map(d => {
@@ -229,7 +235,13 @@ export default {
 </script>
 
 <style scoped>
-  .install-wrapper >>> .el-button .el-loading-spinner {
-    height: 100%;
+  .node-installation >>> .el-button .el-loading-spinner {
+    margin-top: -13px;
+    height: 28px;
+  }
+
+  .node-installation >>> .el-button .el-loading-spinner .circular {
+    width: 28px;
+    height: 28px;
   }
 </style>

From 944f3c4bf8ebdd66bb8189ca5c4c6b6d2452fc94 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 11:01:57 +0800
Subject: [PATCH 07/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Node/NodeInstallation.vue | 14 +++++++++-----
 frontend/src/i18n/zh.js                           |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Node/NodeInstallation.vue b/frontend/src/components/Node/NodeInstallation.vue
index 320b0b7f..cf204da8 100644
--- a/frontend/src/components/Node/NodeInstallation.vue
+++ b/frontend/src/components/Node/NodeInstallation.vue
@@ -1,18 +1,24 @@
 <template>
   <div class="node-installation">
     <el-form inline>
-      <el-form-item v-if="!isShowInstalled">
+      <el-form-item>
         <el-autocomplete
           v-model="depName"
           style="width: 240px"
           :placeholder="$t('Search Dependencies')"
           :fetchSuggestions="fetchAllDepList"
           :minlength="2"
+          :disabled="isShowInstalled"
           @select="onSearch"
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" type="success" @click="onSearch">
+        <el-button
+          icon="el-icon-search"
+          type="success"
+          :disabled="isShowInstalled"
+          @click="onSearch"
+        >
           {{$t('Search')}}
         </el-button>
       </el-form-item>
@@ -37,7 +43,7 @@
           width="180"
         />
         <el-table-column
-          :label="$t('Latest Version')"
+          :label="!isShowInstalled ? $t('Latest Version') : $t('Version')"
           prop="version"
           width="100"
         />
@@ -135,11 +141,9 @@ export default {
       this.loading = false
       this.depList = res.data.data.sort((a, b) => a.name > b.name ? 1 : -1)
       this.depList.map(async dep => {
-        this.$set(dep, 'loading', true)
         const res = await this.$request.get(`/system/deps/${this.activeLang.executable_name}/${dep.name}/json`)
         dep.version = res.data.data.version
         dep.description = res.data.data.description
-        this.$set(dep, 'loading', false)
       })
     },
     async getInstalledDepList () {
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 665f49e5..1cfabb23 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -267,6 +267,7 @@ export default {
   'Number of CPU': 'CPU数',
   'Executables': '执行文件',
   'Latest Version': '最新版本',
+  'Version': '版本',
 
   // 弹出框
   'Notification': '提示',

From 33fbf96efb6da880d56aa7e148c57a2943f778ee Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 11:12:46 +0800
Subject: [PATCH 08/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/main.go            |  1 +
 backend/routes/system.go   |  4 ++
 backend/services/system.go | 96 +++++++++++++++++++++-----------------
 3 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index c7ae7ec1..7dd5046e 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -149,6 +149,7 @@ func main() {
 			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)                     // 爬虫详情
diff --git a/backend/routes/system.go b/backend/routes/system.go
index 43b37cf9..0a388d0f 100644
--- a/backend/routes/system.go
+++ b/backend/routes/system.go
@@ -221,3 +221,7 @@ func GetDepJson(c *gin.Context) {
 		Data:    dep,
 	})
 }
+
+func InstallLang(c *gin.Context) {
+	//lang := c.Query("lang")
+}
diff --git a/backend/services/system.go b/backend/services/system.go
index f1a4c4e6..759f52e0 100644
--- a/backend/services/system.go
+++ b/backend/services/system.go
@@ -20,27 +20,6 @@ import (
 	"sync"
 )
 
-type PythonDepJsonData struct {
-	Info PythonDepJsonDataInfo `json:"info"`
-}
-
-type PythonDepJsonDataInfo struct {
-	Name    string `json:"name"`
-	Summary string `json:"summary"`
-	Version string `json:"version"`
-}
-
-type PythonDepNameDict struct {
-	Name   string `json:"name"`
-	Weight int    `json:"weight"`
-}
-
-type PythonDepNameDictSlice []PythonDepNameDict
-
-func (s PythonDepNameDictSlice) Len() int           { return len(s) }
-func (s PythonDepNameDictSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s PythonDepNameDictSlice) Less(i, j int) bool { return s[i].Weight > s[j].Weight }
-
 // 系统信息 chan 映射
 var SystemInfoChanMap = utils.NewChanMap()
 
@@ -120,6 +99,55 @@ func IsInstalledLang(nodeId string, lang entity.Lang) bool {
 	return false
 }
 
+// 是否已安装该依赖
+func IsInstalledDep(installedDepList []entity.Dependency, dep entity.Dependency) bool {
+	for _, _dep := range installedDepList {
+		if strings.ToLower(_dep.Name) == strings.ToLower(dep.Name) {
+			return true
+		}
+	}
+	return false
+}
+
+// 初始化函数
+func InitDepsFetcher() error {
+	c := cron.New(cron.WithSeconds())
+	c.Start()
+	if _, err := c.AddFunc("0 */5 * * * *", UpdatePythonDepList); err != nil {
+		return err
+	}
+
+	go func() {
+		UpdatePythonDepList()
+	}()
+	return nil
+}
+
+// =========
+// Python
+// =========
+
+type PythonDepJsonData struct {
+	Info PythonDepJsonDataInfo `json:"info"`
+}
+
+type PythonDepJsonDataInfo struct {
+	Name    string `json:"name"`
+	Summary string `json:"summary"`
+	Version string `json:"version"`
+}
+
+type PythonDepNameDict struct {
+	Name   string `json:"name"`
+	Weight int    `json:"weight"`
+}
+
+type PythonDepNameDictSlice []PythonDepNameDict
+
+func (s PythonDepNameDictSlice) Len() int           { return len(s) }
+func (s PythonDepNameDictSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s PythonDepNameDictSlice) Less(i, j int) bool { return s[i].Weight > s[j].Weight }
+
 // 获取Python本地依赖列表
 func GetPythonDepList(nodeId string, searchDepName string) ([]entity.Dependency, error) {
 	var list []entity.Dependency
@@ -357,16 +385,6 @@ func GetPythonRemoteInstalledDepList(nodeId string) ([]entity.Dependency, error)
 	return depList, nil
 }
 
-// 是否已安装该依赖
-func IsInstalledDep(installedDepList []entity.Dependency, dep entity.Dependency) bool {
-	for _, _dep := range installedDepList {
-		if strings.ToLower(_dep.Name) == strings.ToLower(dep.Name) {
-			return true
-		}
-	}
-	return false
-}
-
 // 安装Python本地依赖
 func InstallPythonLocalDep(depName string) (string, error) {
 	// 依赖镜像URL
@@ -412,16 +430,6 @@ func UninstallPythonRemoteDep(nodeId string, depName string) (string, error) {
 	return output, nil
 }
 
-// 初始化函数
-func InitDepsFetcher() error {
-	c := cron.New(cron.WithSeconds())
-	c.Start()
-	if _, err := c.AddFunc("0 */5 * * * *", UpdatePythonDepList); err != nil {
-		return err
-	}
-
-	go func() {
-		UpdatePythonDepList()
-	}()
-	return nil
-}
+// ==============
+// Node.js
+// ==============

From 7076985898d294a73c42d24baf6fe9d09010321c Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 13:53:06 +0800
Subject: [PATCH 09/31] =?UTF-8?q?=E5=8A=A0=E5=85=A5Node.js=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=AE=89=E8=A3=85=E5=92=8C=E8=AF=AD=E8=A8=80=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/constants/system.go       |   2 +-
 backend/routes/system.go          |  90 +++++++++++++++++-
 backend/scripts/install-nodejs.sh |  17 ++++
 backend/services/rpc.go           |  24 ++++-
 backend/services/system.go        | 150 +++++++++++++++++++++++++++++-
 5 files changed, 278 insertions(+), 5 deletions(-)
 create mode 100644 backend/scripts/install-nodejs.sh

diff --git a/backend/constants/system.go b/backend/constants/system.go
index 70d41063..bec8b8c5 100644
--- a/backend/constants/system.go
+++ b/backend/constants/system.go
@@ -8,6 +8,6 @@ const (
 
 const (
 	Python = "python"
-	NodeJS = "node"
+	Nodejs = "node"
 	Java   = "java"
 )
diff --git a/backend/routes/system.go b/backend/routes/system.go
index 0a388d0f..b4e130a9 100644
--- a/backend/routes/system.go
+++ b/backend/routes/system.go
@@ -32,6 +32,13 @@ func GetDepList(c *gin.Context) {
 			return
 		}
 		depList = list
+	} else if lang == constants.Nodejs {
+		list, err := services.GetNodejsDepList(nodeId, depName)
+		if err != nil {
+			HandleError(http.StatusInternalServerError, c, err)
+			return
+		}
+		depList = list
 	} else {
 		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", lang))
 		return
@@ -64,6 +71,22 @@ func GetInstalledDepList(c *gin.Context) {
 			}
 			depList = list
 		}
+	} else if lang == constants.Nodejs {
+		if services.IsMasterNode(nodeId) {
+			list, err := services.GetNodejsLocalInstalledDepList(nodeId)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+			depList = list
+		} else {
+			list, err := services.GetNodejsRemoteInstalledDepList(nodeId)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+			depList = list
+		}
 	} else {
 		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", lang))
 		return
@@ -129,6 +152,7 @@ func InstallDep(c *gin.Context) {
 	var reqBody ReqBody
 	if err := c.ShouldBindJSON(&reqBody); err != nil {
 		HandleError(http.StatusBadRequest, c, err)
+		return
 	}
 
 	if reqBody.Lang == constants.Python {
@@ -145,6 +169,20 @@ func InstallDep(c *gin.Context) {
 				return
 			}
 		}
+	} else if reqBody.Lang == constants.Nodejs {
+		if services.IsMasterNode(nodeId) {
+			_, err := services.InstallNodejsLocalDep(reqBody.DepName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		} else {
+			_, err := services.InstallNodejsRemoteDep(nodeId, reqBody.DepName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		}
 	} else {
 		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", reqBody.Lang))
 		return
@@ -185,6 +223,20 @@ func UninstallDep(c *gin.Context) {
 				return
 			}
 		}
+	} else if reqBody.Lang == constants.Nodejs {
+		if services.IsMasterNode(nodeId) {
+			_, err := services.UninstallNodejsLocalDep(reqBody.DepName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		} else {
+			_, err := services.UninstallNodejsRemoteDep(nodeId, reqBody.DepName)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		}
 	} else {
 		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", reqBody.Lang))
 		return
@@ -223,5 +275,41 @@ func GetDepJson(c *gin.Context) {
 }
 
 func InstallLang(c *gin.Context) {
-	//lang := c.Query("lang")
+	type ReqBody struct {
+		Lang string `json:"lang"`
+	}
+
+	nodeId := c.Param("id")
+
+	var reqBody ReqBody
+	if err := c.ShouldBindJSON(&reqBody); err != nil {
+		HandleError(http.StatusBadRequest, c, err)
+		return
+	}
+
+	if reqBody.Lang == constants.Nodejs {
+		if services.IsMasterNode(nodeId) {
+			_, err := services.InstallNodejsLocalLang()
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		} else {
+			_, err := services.InstallNodejsRemoteLang(nodeId)
+			if err != nil {
+				HandleError(http.StatusInternalServerError, c, err)
+				return
+			}
+		}
+	} else {
+		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("%s is not implemented", reqBody.Lang))
+		return
+	}
+
+	// TODO: check if install is successful
+
+	c.JSON(http.StatusOK, Response{
+		Status:  "ok",
+		Message: "success",
+	})
 }
diff --git a/backend/scripts/install-nodejs.sh b/backend/scripts/install-nodejs.sh
new file mode 100644
index 00000000..1ca73b2d
--- /dev/null
+++ b/backend/scripts/install-nodejs.sh
@@ -0,0 +1,17 @@
+#!/bin/env bash
+
+# install nvm
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+
+# install Node.js v8.12
+nvm install 8.12
+
+# create soft links
+ln -s $HOME/.nvm/versions/node/v8.12.0/bin/npm /usr/local/bin/npm
+ln -s $HOME/.nvm/versions/node/v8.12.0/bin/node /usr/local/bin/node
+
+# environments manipulation
+export NODE_PATH=$HOME.nvm/versions/node/v8.12.0/lib/node_modules
+export PATH=$NODE_PATH:$PATH
\ No newline at end of file
diff --git a/backend/services/rpc.go b/backend/services/rpc.go
index 77d0c217..9b6a5b74 100644
--- a/backend/services/rpc.go
+++ b/backend/services/rpc.go
@@ -21,10 +21,28 @@ type RpcMessage struct {
 }
 
 func RpcServerInstallLang(msg RpcMessage) RpcMessage {
-	// install dep rpc
+	lang := GetRpcParam("lang", msg.Params)
+	if lang == constants.Nodejs {
+		output, _ := InstallNodejsLocalLang()
+		msg.Result = output
+	}
 	return msg
 }
 
+func RpcClientInstallLang(nodeId string, lang string) (output string, err error) {
+	params := map[string]string{}
+	params["lang"] = lang
+
+	data, err := RpcClientFunc(nodeId, constants.RpcInstallLang, params, 600)()
+	if err != nil {
+		return
+	}
+
+	output = data
+
+	return
+}
+
 func RpcServerInstallDep(msg RpcMessage) RpcMessage {
 	lang := GetRpcParam("lang", msg.Params)
 	depName := GetRpcParam("dep_name", msg.Params)
@@ -81,6 +99,10 @@ func RpcServerGetInstalledDepList(nodeId string, msg RpcMessage) RpcMessage {
 		depList, _ := GetPythonLocalInstalledDepList(nodeId)
 		resultStr, _ := json.Marshal(depList)
 		msg.Result = string(resultStr)
+	} else if lang == constants.Nodejs {
+		depList, _ := GetNodejsLocalInstalledDepList(nodeId)
+		resultStr, _ := json.Marshal(depList)
+		msg.Result = string(resultStr)
 	}
 	return msg
 }
diff --git a/backend/services/system.go b/backend/services/system.go
index 759f52e0..dce309d1 100644
--- a/backend/services/system.go
+++ b/backend/services/system.go
@@ -13,6 +13,7 @@ import (
 	"github.com/apex/log"
 	"github.com/imroc/req"
 	"os/exec"
+	"path"
 	"regexp"
 	"runtime/debug"
 	"sort"
@@ -65,8 +66,8 @@ func GetSystemInfo(nodeId string) (sysInfo entity.SystemInfo, err error) {
 func GetLangList(nodeId string) []entity.Lang {
 	list := []entity.Lang{
 		{Name: "Python", ExecutableName: "python", ExecutablePath: "/usr/local/bin/python", DepExecutablePath: "/usr/local/bin/pip"},
-		{Name: "NodeJS", ExecutableName: "node", ExecutablePath: "/usr/local/bin/node"},
-		{Name: "Java", ExecutableName: "java", ExecutablePath: "/usr/local/bin/java"},
+		{Name: "Node.js", ExecutableName: "node", ExecutablePath: "/usr/local/bin/node", DepExecutablePath: "/usr/local/bin/npm"},
+		//{Name: "Java", ExecutableName: "java", ExecutablePath: "/usr/local/bin/java"},
 	}
 	for i, lang := range list {
 		list[i].Installed = IsInstalledLang(nodeId, lang)
@@ -433,3 +434,148 @@ func UninstallPythonRemoteDep(nodeId string, depName string) (string, error) {
 // ==============
 // Node.js
 // ==============
+
+func InstallNodejsLocalLang() (string, error) {
+	cmd := exec.Command("/bin/sh", path.Join("scripts", "install-nodejs.sh"))
+	output, err := cmd.Output()
+	if err != nil {
+		log.Error(err.Error())
+		debug.PrintStack()
+		return string(output), err
+	}
+
+	// TODO: check if Node.js is installed successfully
+
+	return string(output), nil
+}
+
+// 获取Node.js远端依赖列表
+func InstallNodejsRemoteLang(nodeId string) (string, error) {
+	output, err := RpcClientInstallLang(nodeId, constants.Nodejs)
+	if err != nil {
+		return output, err
+	}
+	return output, nil
+}
+
+// 获取Nodejs本地已安装的依赖列表
+func GetNodejsLocalInstalledDepList(nodeId string) ([]entity.Dependency, error) {
+	var list []entity.Dependency
+
+	lang := GetLangFromLangName(nodeId, constants.Nodejs)
+	if !IsInstalledLang(nodeId, lang) {
+		return list, errors.New("nodejs is not installed")
+	}
+	cmd := exec.Command("npm", "ls", "-g", "--depth", "0")
+	outputBytes, _ := cmd.Output()
+	//if err != nil {
+	//	log.Error("error: " + string(outputBytes))
+	//	debug.PrintStack()
+	//	return list, err
+	//}
+
+	regex := regexp.MustCompile("\\s(.*)@(.*)")
+	for _, line := range strings.Split(string(outputBytes), "\n") {
+		arr := regex.FindStringSubmatch(line)
+		if len(arr) < 3 {
+			continue
+		}
+		dep := entity.Dependency{
+			Name:      strings.ToLower(arr[1]),
+			Version:   arr[2],
+			Installed: true,
+		}
+		list = append(list, dep)
+	}
+
+	return list, nil
+}
+
+// 获取Nodejs远端依赖列表
+func GetNodejsRemoteInstalledDepList(nodeId string) ([]entity.Dependency, error) {
+	depList, err := RpcClientGetInstalledDepList(nodeId, constants.Nodejs)
+	if err != nil {
+		return depList, err
+	}
+	return depList, nil
+}
+
+// 安装Nodejs本地依赖
+func InstallNodejsLocalDep(depName string) (string, error) {
+	// 依赖镜像URL
+	url := "https://registry.npm.taobao.org"
+
+	cmd := exec.Command("npm", "install", depName, "-g", "--registry", url)
+	outputBytes, err := cmd.Output()
+	if err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
+		return fmt.Sprintf("error: %s", err.Error()), err
+	}
+	return string(outputBytes), nil
+}
+
+// 获取Nodejs远端依赖列表
+func InstallNodejsRemoteDep(nodeId string, depName string) (string, error) {
+	output, err := RpcClientInstallDep(nodeId, constants.Nodejs, depName)
+	if err != nil {
+		return output, err
+	}
+	return output, nil
+}
+
+// 安装Nodejs本地依赖
+func UninstallNodejsLocalDep(depName string) (string, error) {
+	cmd := exec.Command("npm", "uninstall", depName, "-g")
+	outputBytes, err := cmd.Output()
+	if err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
+		return fmt.Sprintf("error: %s", err.Error()), err
+	}
+	return string(outputBytes), nil
+}
+
+// 获取Nodejs远端依赖列表
+func UninstallNodejsRemoteDep(nodeId string, depName string) (string, error) {
+	output, err := RpcClientUninstallDep(nodeId, constants.Nodejs, depName)
+	if err != nil {
+		return output, err
+	}
+	return output, nil
+}
+
+// 获取Nodejs本地依赖列表
+func GetNodejsDepList(nodeId string, searchDepName string) (depList []entity.Dependency, err error) {
+	// 执行shell命令
+	cmd := exec.Command("npm", "search", "--json", searchDepName)
+	outputBytes, _ := cmd.Output()
+
+	// 获取已安装依赖列表
+	var installedDepList []entity.Dependency
+	if IsMasterNode(nodeId) {
+		installedDepList, err = GetNodejsLocalInstalledDepList(nodeId)
+		if err != nil {
+			return depList, err
+		}
+	} else {
+		installedDepList, err = GetNodejsRemoteInstalledDepList(nodeId)
+		if err != nil {
+			return depList, err
+		}
+	}
+
+	// 反序列化
+	if err := json.Unmarshal(outputBytes, &depList); err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
+		return depList, err
+	}
+
+	// 遍历安装列表
+	for i, dep := range depList {
+		depList[i].Installed = IsInstalledDep(installedDepList, dep)
+	}
+
+	return depList, nil
+}

From 7310df1be6abce945f4e98680bb5bd0e6f947464 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 14:21:47 +0800
Subject: [PATCH 10/31] =?UTF-8?q?=E5=85=BC=E5=AE=B9Node.js=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/services/task.go                      | 12 ++++
 .../components/InfoView/SpiderInfoView.vue    |  8 +--
 .../src/components/Node/NodeInstallation.vue  | 69 ++++++++++++++++---
 frontend/src/i18n/zh.js                       |  6 +-
 4 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/backend/services/task.go b/backend/services/task.go
index 9e6fdbc8..c0aa8fc8 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -19,6 +19,7 @@ import (
 	"runtime"
 	"runtime/debug"
 	"strconv"
+	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -104,6 +105,17 @@ func AssignTask(task model.Task) error {
 
 // 设置环境变量
 func SetEnv(cmd *exec.Cmd, envs []model.Env, taskId string, dataCol string) *exec.Cmd {
+	// 默认把Node.js的全局node_modules加入环境变量
+	envPath := os.Getenv("PATH")
+	for _, _path := range strings.Split(envPath, ":") {
+		if strings.Contains(_path, "/.nvm/versions/node/") {
+			pathNodeModules := strings.Replace(_path, "/bin", "/lib/node_modules", -1)
+			_ = os.Setenv("PATH", pathNodeModules+":"+envPath)
+			_ = os.Setenv("NODE_PATH", pathNodeModules)
+			break
+		}
+	}
+
 	// 默认环境变量
 	cmd.Env = append(os.Environ(), "CRAWLAB_TASK_ID="+taskId)
 	cmd.Env = append(cmd.Env, "CRAWLAB_COLLECTION="+dataCol)
diff --git a/frontend/src/components/InfoView/SpiderInfoView.vue b/frontend/src/components/InfoView/SpiderInfoView.vue
index a13b4c7a..1f29e89c 100644
--- a/frontend/src/components/InfoView/SpiderInfoView.vue
+++ b/frontend/src/components/InfoView/SpiderInfoView.vue
@@ -51,6 +51,10 @@
       </el-form>
     </el-row>
     <el-row class="button-container" v-if="!isView">
+      <el-button size="normal" v-if="isShowRun" type="danger" @click="onCrawl"
+                 icon="el-icon-video-play" style="margin-right: 10px">
+        {{$t('Run')}}
+      </el-button>
       <el-upload
         v-if="spiderForm.type === 'customized'"
         :action="$request.baseUrl + `/spiders/${spiderForm._id}/upload`"
@@ -65,10 +69,6 @@
           {{$t('Upload')}}
         </el-button>
       </el-upload>
-      <el-button size="normal" v-if="isShowRun" type="danger" @click="onCrawl"
-                 icon="el-icon-video-play">
-        {{$t('Run')}}
-      </el-button>
       <el-button size="normal" type="success" @click="onSave"
                  icon="el-icon-check">
         {{$t('Save')}}
diff --git a/frontend/src/components/Node/NodeInstallation.vue b/frontend/src/components/Node/NodeInstallation.vue
index cf204da8..7cf4f6b9 100644
--- a/frontend/src/components/Node/NodeInstallation.vue
+++ b/frontend/src/components/Node/NodeInstallation.vue
@@ -3,6 +3,7 @@
     <el-form inline>
       <el-form-item>
         <el-autocomplete
+          v-if="activeLang.executable_name === 'python'"
           v-model="depName"
           style="width: 240px"
           :placeholder="$t('Search Dependencies')"
@@ -11,6 +12,13 @@
           :disabled="isShowInstalled"
           @select="onSearch"
         />
+        <el-input
+          v-else
+          v-model="depName"
+          style="width: 240px"
+          :placeholder="$t('Search Dependencies')"
+          :disabled="isShowInstalled"
+        />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -26,7 +34,7 @@
         <el-checkbox v-model="isShowInstalled" :label="$t('Show installed')" @change="onIsShowInstalledChange"/>
       </el-form-item>
     </el-form>
-    <el-tabs v-model="activeTab">
+    <el-tabs v-model="activeTab" @tab-click="onTabChange">
       <el-tab-pane v-for="lang in langList" :key="lang.name" :label="lang.name" :name="lang.executable_name"/>
     </el-tabs>
     <template v-if="activeLang.installed">
@@ -59,6 +67,7 @@
             <el-button
               v-if="!scope.row.installed"
               v-loading="getDepLoading(scope.row)"
+              :disabled="getDepLoading(scope.row)"
               size="mini"
               type="primary"
               @click="onClickInstallDep(scope.row)"
@@ -68,6 +77,7 @@
             <el-button
               v-else
               v-loading="getDepLoading(scope.row)"
+              :disabled="getDepLoading(scope.row)"
               size="mini"
               type="danger"
               @click="onClickUninstallDep(scope.row)"
@@ -82,8 +92,11 @@
       <div class="install-wrapper">
         <h3>{{activeLang.name + $t(' is not installed, do you want to install it?')}}</h3>
         <el-button
+          v-loading="isLoadingInstallLang"
+          :disabled="isLoadingInstallLang"
           type="primary"
           style="width: 240px;font-weight: bolder;font-size: 18px"
+          @click="onClickInstallLang"
         >
           {{$t('Install')}}
         </el-button>
@@ -108,7 +121,8 @@ export default {
       loading: false,
       isShowInstalled: false,
       installedDepList: [],
-      depLoadingDict: {}
+      depLoadingDict: {},
+      isLoadingInstallLang: false
     }
   },
   computed: {
@@ -123,6 +137,9 @@ export default {
       }
       return {}
     },
+    activeLangName () {
+      return this.activeLang.executable_name
+    },
     computedDepList () {
       if (this.isShowInstalled) {
         return this.installedDepList
@@ -139,12 +156,19 @@ export default {
         dep_name: this.depName
       })
       this.loading = false
-      this.depList = res.data.data.sort((a, b) => a.name > b.name ? 1 : -1)
-      this.depList.map(async dep => {
-        const res = await this.$request.get(`/system/deps/${this.activeLang.executable_name}/${dep.name}/json`)
-        dep.version = res.data.data.version
-        dep.description = res.data.data.description
-      })
+      this.depList = res.data.data
+
+      if (this.activeLangName === 'python') {
+        // 排序
+        this.depList = this.depList.sort((a, b) => a.name > b.name ? 1 : -1)
+
+        // 异步获取python附加信息
+        this.depList.map(async dep => {
+          const res = await this.$request.get(`/system/deps/${this.activeLang.executable_name}/${dep.name}/json`)
+          dep.version = res.data.data.version
+          dep.description = res.data.data.description
+        })
+      }
     },
     async getInstalledDepList () {
       this.loading = true
@@ -172,6 +196,9 @@ export default {
     onIsShowInstalledChange (val) {
       if (val) {
         this.getInstalledDepList()
+      } else {
+        this.depName = ''
+        this.depList = []
       }
     },
     async onClickInstallDep (dep) {
@@ -226,6 +253,32 @@ export default {
         return false
       }
       return this.depLoadingDict[name]
+    },
+    async onClickInstallLang () {
+      this.isLoadingInstallLang = true
+      const res = await this.$request.post(`/nodes/${this.nodeForm._id}/langs/install`, {
+        lang: this.activeLang.executable_name
+      })
+      if (!res || res.error) {
+        this.$notify.error({
+          title: this.$t('Installing language failed'),
+          message: this.$t('The language installation is unsuccessful: ') + this.activeLang.name
+        })
+      } else {
+        this.$notify.success({
+          title: this.$t('Installing language successful'),
+          message: this.$t('You have successfully installed a language: ') + this.activeLang.name
+        })
+      }
+      this.isLoadingInstallLang = false
+    },
+    onTabChange () {
+      if (this.isShowInstalled) {
+        this.getInstalledDepList()
+      } else {
+        this.depName = ''
+        this.depList = []
+      }
     }
   },
   async created () {
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 1cfabb23..852e79be 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -300,7 +300,7 @@ export default {
   'Disclaimer': '免责声明',
   'Please search dependencies': '请搜索依赖',
   'No Data': '暂无数据',
-  'Show installed': '只看已安装',
+  'Show installed': '查看已安装',
   'Installing dependency successful': '安装依赖成功',
   'Installing dependency failed': '安装依赖失败',
   'You have successfully installed a dependency: ': '您已成功安装依赖: ',
@@ -309,6 +309,10 @@ export default {
   'Uninstalling dependency failed': '卸载依赖失败',
   'You have successfully uninstalled a dependency: ': '您已成功卸载依赖: ',
   'The dependency uninstallation is unsuccessful: ': '卸载依赖失败: ',
+  'Installing language successful': '安装语言成功',
+  'Installing language failed': '安装语言失败',
+  'You have successfully installed a language: ': '您已成功安装语言: ',
+  'The language installation is unsuccessful: ': '安装语言失败: ',
 
   // 登录
   'Sign in': '登录',

From ec2a738958af673a8eb4d5dab4e3073fcb92f8ba Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 15:45:18 +0800
Subject: [PATCH 11/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0docker=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85node?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                         |   2 +-
 Dockerfile.local                   |   2 +-
 backend/conf/config.yml            |   3 +
 backend/services/system.go         |   1 +
 docker-compose.yml                 |   3 +
 docker_init.sh                     |   9 +-
 jenkins/master/docker-compose.yaml |   1 +
 wait-for-it.sh                     | 178 -----------------------------
 8 files changed, 18 insertions(+), 181 deletions(-)
 delete mode 100755 wait-for-it.sh

diff --git a/Dockerfile b/Dockerfile
index cf8ab174..73883c64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,4 +59,4 @@ EXPOSE 8080
 EXPOSE 8000
 
 # start backend
-CMD ["/bin/sh", "/app/docker_init.sh"]
+CMD ["/bin/bash", "/app/docker_init.sh"]
diff --git a/Dockerfile.local b/Dockerfile.local
index d99010a4..59b8736d 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -57,4 +57,4 @@ EXPOSE 8080
 EXPOSE 8000
 
 # start backend
-CMD ["/bin/sh", "/app/docker_init.sh"]
+CMD ["/bin/bash", "/app/docker_init.sh"]
diff --git a/backend/conf/config.yml b/backend/conf/config.yml
index 5ada78f6..c0c1256e 100644
--- a/backend/conf/config.yml
+++ b/backend/conf/config.yml
@@ -26,6 +26,9 @@ server:
     # mac地址 或者 ip地址，如果是ip，则需要手动指定IP
     type: "mac"
     ip: ""
+  lang: # 安装语言环境, Y 为安装，N 为不安装，只对 Docker 有效
+    python: "Y"
+    node: "N"
 spider:
   path: "/app/spiders"
 task:
diff --git a/backend/services/system.go b/backend/services/system.go
index dce309d1..12b8744c 100644
--- a/backend/services/system.go
+++ b/backend/services/system.go
@@ -415,6 +415,7 @@ func UninstallPythonLocalDep(depName string) (string, error) {
 	cmd := exec.Command("pip", "uninstall", "-y", depName)
 	outputBytes, err := cmd.Output()
 	if err != nil {
+		log.Errorf(string(outputBytes))
 		log.Errorf(err.Error())
 		debug.PrintStack()
 		return fmt.Sprintf("error: %s", err.Error()), err
diff --git a/docker-compose.yml b/docker-compose.yml
index b4f36e86..4fe71d24 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,12 +8,15 @@ services:
       CRAWLAB_SERVER_MASTER: "Y"  # whether to be master node 是否为主节点，主节点为 Y，工作节点为 N
       CRAWLAB_MONGO_HOST: "mongo"  # MongoDB host address MongoDB 的地址，在 docker compose 网络中，直接引用服务名称
       CRAWLAB_REDIS_ADDRESS: "redis"  # Redis host address Redis 的地址，在 docker compose 网络中，直接引用服务名称
+      CRAWLAB_SERVER_LANG_NODE: "Y"  # 预安装 Node.js 语言环境
     ports:    
       - "8080:8080" # frontend port mapping 前端端口映射
       - "8000:8000" # backend port mapping 后端端口映射 
     depends_on:
       - mongo
       - redis
+    volumes:
+      - "/Users/marvzhang/projects/crawlab-team/crawlab/docker_init.sh:/app/docker_init.sh"
   worker:
     image: tikazyq/crawlab:latest
     container_name: worker
diff --git a/docker_init.sh b/docker_init.sh
index 97c505dc..648634cd 100755
--- a/docker_init.sh
+++ b/docker_init.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # replace default api path to new one
 if [ "${CRAWLAB_API_ADDRESS}" = "" ]; 
@@ -22,5 +22,12 @@ fi
 # start nginx
 service nginx start
 
+# install languages: Node.js
+if [ "${CRAWLAB_SERVER_LANG_NODE}" = "Y" ];
+then
+	echo "installing node.js"
+	/bin/sh /app/backend/scripts/install-nodejs.sh
+fi
+
 # start backend
 crawlab
\ No newline at end of file
diff --git a/jenkins/master/docker-compose.yaml b/jenkins/master/docker-compose.yaml
index ff9dd64e..ed649aa8 100644
--- a/jenkins/master/docker-compose.yaml
+++ b/jenkins/master/docker-compose.yaml
@@ -9,6 +9,7 @@ services:
       CRAWLAB_MONGO_HOST: "mongo"
       CRAWLAB_REDIS_ADDRESS: "redis"
       CRAWLAB_LOG_PATH: "/var/logs/crawlab"
+      CRAWLAB_SETTING_ALLOWREGISTER: "Y"
     ports:    
       - "8080:8080" # frontend
       - "8000:8000" # backend
diff --git a/wait-for-it.sh b/wait-for-it.sh
deleted file mode 100755
index 607a7d67..00000000
--- a/wait-for-it.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env bash
-#   Use this script to test if a given TCP host/port are available
-
-WAITFORIT_cmdname=${0##*/}
-
-echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
-
-usage()
-{
-    cat << USAGE >&2
-Usage:
-    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
-    -h HOST | --host=HOST       Host or IP under test
-    -p PORT | --port=PORT       TCP port under test
-                                Alternatively, you specify the host and port as host:port
-    -s | --strict               Only execute subcommand if the test succeeds
-    -q | --quiet                Don't output any status messages
-    -t TIMEOUT | --timeout=TIMEOUT
-                                Timeout in seconds, zero for no timeout
-    -- COMMAND ARGS             Execute command with args after the test finishes
-USAGE
-    exit 1
-}
-
-wait_for()
-{
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    else
-        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
-    fi
-    WAITFORIT_start_ts=$(date +%s)
-    while :
-    do
-        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
-            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
-            WAITFORIT_result=$?
-        else
-            (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
-            WAITFORIT_result=$?
-        fi
-        if [[ $WAITFORIT_result -eq 0 ]]; then
-            WAITFORIT_end_ts=$(date +%s)
-            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
-            break
-        fi
-        sleep 1
-    done
-    return $WAITFORIT_result
-}
-
-wait_for_wrapper()
-{
-    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
-    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    else
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    fi
-    WAITFORIT_PID=$!
-    trap "kill -INT -$WAITFORIT_PID" INT
-    wait $WAITFORIT_PID
-    WAITFORIT_RESULT=$?
-    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    fi
-    return $WAITFORIT_RESULT
-}
-
-# process arguments
-while [[ $# -gt 0 ]]
-do
-    case "$1" in
-        *:* )
-        WAITFORIT_hostport=(${1//:/ })
-        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
-        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
-        shift 1
-        ;;
-        --child)
-        WAITFORIT_CHILD=1
-        shift 1
-        ;;
-        -q | --quiet)
-        WAITFORIT_QUIET=1
-        shift 1
-        ;;
-        -s | --strict)
-        WAITFORIT_STRICT=1
-        shift 1
-        ;;
-        -h)
-        WAITFORIT_HOST="$2"
-        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
-        shift 2
-        ;;
-        --host=*)
-        WAITFORIT_HOST="${1#*=}"
-        shift 1
-        ;;
-        -p)
-        WAITFORIT_PORT="$2"
-        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --port=*)
-        WAITFORIT_PORT="${1#*=}"
-        shift 1
-        ;;
-        -t)
-        WAITFORIT_TIMEOUT="$2"
-        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --timeout=*)
-        WAITFORIT_TIMEOUT="${1#*=}"
-        shift 1
-        ;;
-        --)
-        shift
-        WAITFORIT_CLI=("$@")
-        break
-        ;;
-        --help)
-        usage
-        ;;
-        *)
-        echoerr "Unknown argument: $1"
-        usage
-        ;;
-    esac
-done
-
-if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
-    echoerr "Error: you need to provide a host and port to test."
-    usage
-fi
-
-WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
-WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
-WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
-WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
-
-# check to see if timeout is from busybox?
-WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
-WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
-if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
-        WAITFORIT_ISBUSY=1
-        WAITFORIT_BUSYTIMEFLAG="-t"
-
-else
-        WAITFORIT_ISBUSY=0
-        WAITFORIT_BUSYTIMEFLAG=""
-fi
-
-if [[ $WAITFORIT_CHILD -gt 0 ]]; then
-    wait_for
-    WAITFORIT_RESULT=$?
-    exit $WAITFORIT_RESULT
-else
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        wait_for_wrapper
-        WAITFORIT_RESULT=$?
-    else
-        wait_for
-        WAITFORIT_RESULT=$?
-    fi
-fi
-
-if [[ $WAITFORIT_CLI != "" ]]; then
-    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
-        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
-        exit $WAITFORIT_RESULT
-    fi
-    exec "${WAITFORIT_CLI[@]}"
-else
-    exit $WAITFORIT_RESULT
-fi
\ No newline at end of file

From d6edc60062e2c4b3ec07d8ab1831a73eaeae52ba Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 15:50:59 +0800
Subject: [PATCH 12/31] updated docker-compose.yml

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4fe71d24..5c059f95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       CRAWLAB_SERVER_MASTER: "Y"  # whether to be master node 是否为主节点，主节点为 Y，工作节点为 N
       CRAWLAB_MONGO_HOST: "mongo"  # MongoDB host address MongoDB 的地址，在 docker compose 网络中，直接引用服务名称
       CRAWLAB_REDIS_ADDRESS: "redis"  # Redis host address Redis 的地址，在 docker compose 网络中，直接引用服务名称
-      CRAWLAB_SERVER_LANG_NODE: "Y"  # 预安装 Node.js 语言环境
+      # CRAWLAB_SERVER_LANG_NODE: "Y"  # 预安装 Node.js 语言环境
     ports:    
       - "8080:8080" # frontend port mapping 前端端口映射
       - "8000:8000" # backend port mapping 后端端口映射 

From 9d310cf5d7aec738833747a86ccde08ea7780cf0 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 16:02:56 +0800
Subject: [PATCH 13/31] updated CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa2682ce..1275b9fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 0.4.3 (unknown)
+
+### Features / Enhancement
+- **Dependency Installation**. Allow users to install/uninstall dependencies and add programming languages (Node.js only for now) on the platform web interface.
+- **Pre-install Programming Languages in Docker**. Allow Docker users to set `CRAWLAB_SERVER_LANG_NODE` as `Y` to pre-install `Node.js` environments.
+
+
 # 0.4.2 (2019-12-26)
 ### Features / Enhancement
 - **Disclaimer**. Added page for Disclaimer.

From 9374493fd2a144c72d503eedc6e7cbf0692efa50 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 16:03:32 +0800
Subject: [PATCH 14/31] updated version

---
 backend/conf/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/conf/config.yml b/backend/conf/config.yml
index c0c1256e..a51a34c9 100644
--- a/backend/conf/config.yml
+++ b/backend/conf/config.yml
@@ -35,6 +35,6 @@ task:
   workers: 4
 other:
   tmppath: "/tmp"
-version: 0.4.2
+version: 0.4.3
 setting:
   allowRegister: "N"
\ No newline at end of file

From 7835de2641a9fd58c16ca9114bb6553c22649ad4 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 17:20:24 +0800
Subject: [PATCH 15/31] =?UTF-8?q?=E7=88=AC=E8=99=AB=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/main.go                               |  2 +-
 backend/model/spider.go                       | 22 +-------
 backend/routes/spider.go                      | 36 +++++++-----
 frontend/src/store/modules/spider.js          |  5 ++
 frontend/src/views/result/ResultList.vue      |  2 +-
 frontend/src/views/schedule/ScheduleList.vue  | 29 +++++++++-
 frontend/src/views/spider/SpiderDetail.vue    |  5 ++
 frontend/src/views/spider/SpiderList.vue      |  5 --
 frontend/src/views/spider/SpiderSchedules.vue | 55 +++++++++++++++++++
 9 files changed, 117 insertions(+), 44 deletions(-)
 create mode 100644 frontend/src/views/spider/SpiderSchedules.vue

diff --git a/backend/main.go b/backend/main.go
index 7dd5046e..74fac484 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -168,7 +168,7 @@ func main() {
 			authGroup.POST("/spiders/:id/file/rename", routes.RenameSpiderFile) // 爬虫文件重命名
 			authGroup.GET("/spiders/:id/dir", routes.GetSpiderDir)              // 爬虫目录
 			authGroup.GET("/spiders/:id/stats", routes.GetSpiderStats)          // 爬虫统计数据
-			authGroup.GET("/spider/types", routes.GetSpiderTypes)               // 爬虫类型
+			authGroup.GET("/spiders/:id/schedules", routes.GetSpiderSchedules)  // 爬虫定时任务
 			// 可配置爬虫
 			authGroup.GET("/config_spiders/:id/config", routes.GetConfigSpiderConfig)           // 获取可配置爬虫配置
 			authGroup.POST("/config_spiders/:id/config", routes.PostConfigSpiderConfig)         // 更改可配置爬虫配置
diff --git a/backend/model/spider.go b/backend/model/spider.go
index 02c3aa8d..e08352e4 100644
--- a/backend/model/spider.go
+++ b/backend/model/spider.go
@@ -275,27 +275,7 @@ func GetSpiderCount() (int, error) {
 	return count, nil
 }
 
-// 获取爬虫类型
-func GetSpiderTypes() ([]*entity.SpiderType, error) {
-	s, c := database.GetCol("spiders")
-	defer s.Close()
-
-	group := bson.M{
-		"$group": bson.M{
-			"_id":   "$type",
-			"count": bson.M{"$sum": 1},
-		},
-	}
-	var types []*entity.SpiderType
-	if err := c.Pipe([]bson.M{group}).All(&types); err != nil {
-		log.Errorf("get spider types error: %s", err.Error())
-		debug.PrintStack()
-		return nil, err
-	}
-
-	return types, nil
-}
-
+// 获取爬虫定时任务
 func GetConfigSpiderData(spider Spider) (entity.ConfigSpiderData, error) {
 	// 构造配置数据
 	configData := entity.ConfigSpiderData{}
diff --git a/backend/routes/spider.go b/backend/routes/spider.go
index a5623b67..ca9f74d9 100644
--- a/backend/routes/spider.go
+++ b/backend/routes/spider.go
@@ -693,20 +693,6 @@ func RenameSpiderFile(c *gin.Context) {
 	})
 }
 
-// 爬虫类型
-func GetSpiderTypes(c *gin.Context) {
-	types, err := model.GetSpiderTypes()
-	if err != nil {
-		HandleError(http.StatusInternalServerError, c, err)
-		return
-	}
-	c.JSON(http.StatusOK, Response{
-		Status:  "ok",
-		Message: "success",
-		Data:    types,
-	})
-}
-
 func GetSpiderStats(c *gin.Context) {
 	type Overview struct {
 		TaskCount            int     `json:"task_count" bson:"task_count"`
@@ -826,3 +812,25 @@ func GetSpiderStats(c *gin.Context) {
 		},
 	})
 }
+
+func GetSpiderSchedules(c *gin.Context) {
+	id := c.Param("id")
+
+	if !bson.IsObjectIdHex(id) {
+		HandleErrorF(http.StatusBadRequest, c, "spider_id is invalid")
+		return
+	}
+
+	// 获取定时任务
+	list, err := model.GetScheduleList(bson.M{"spider_id": bson.ObjectIdHex(id)})
+	if err != nil {
+		HandleError(http.StatusInternalServerError, c, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, Response{
+		Status:  "ok",
+		Message: "success",
+		Data:    list,
+	})
+}
diff --git a/frontend/src/store/modules/spider.js b/frontend/src/store/modules/spider.js
index 0b669a6d..4632483a 100644
--- a/frontend/src/store/modules/spider.js
+++ b/frontend/src/store/modules/spider.js
@@ -180,6 +180,11 @@ const actions = {
   async getTemplateList ({ state, commit }) {
     const res = await request.get(`/config_spiders_templates`)
     commit('SET_TEMPLATE_LIST', res.data.data)
+  },
+  async getScheduleList ({ state, commit }, payload) {
+    const { id } = payload
+    const res = await request.get(`/spiders/${id}/schedules`)
+    commit('schedule/SET_SCHEDULE_LIST', res.data.data, { root: true })
   }
 }
 
diff --git a/frontend/src/views/result/ResultList.vue b/frontend/src/views/result/ResultList.vue
index 2f3e820b..44d04c46 100644
--- a/frontend/src/views/result/ResultList.vue
+++ b/frontend/src/views/result/ResultList.vue
@@ -240,7 +240,7 @@ export default {
               message: 'Deleted successfully'
             })
           })
-      })
+      }))
     },
     onDeploy (row) {
       this.$store.dispatch('spider/getSpiderData', row._id)
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 23d9fa97..0cfbb6d2 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -32,8 +32,30 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('Spider')" prop="spider_id" required>
-          <el-select v-model="scheduleForm.spider_id" :placeholder="$t('Spider')" filterable>
+        <el-form-item v-if="!isDisabledSpiderSchedule" :label="$t('Spider')" prop="spider_id" required>
+          <el-select
+            v-model="scheduleForm.spider_id"
+            :placeholder="$t('Spider')"
+            filterable
+            :disabled="isDisabledSpiderSchedule"
+          >
+            <el-option
+              v-for="op in spiderList"
+              :key="op._id"
+              :value="op._id"
+              :label="`${op.display_name} (${op.name})`"
+              :disabled="isDisabledSpider(op)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-else :label="$t('Spider')" required>
+          <el-select
+            :value="spiderId"
+            :placeholder="$t('Spider')"
+            filterable
+            :disabled="isDisabledSpiderSchedule"
+          >
             <el-option
               v-for="op in spiderList"
               :key="op._id"
@@ -199,6 +221,9 @@ export default {
         }
       }
       return {}
+    },
+    isDisabledSpiderSchedule () {
+      return false
     }
   },
   methods: {
diff --git a/frontend/src/views/spider/SpiderDetail.vue b/frontend/src/views/spider/SpiderDetail.vue
index a743e47d..868f8762 100644
--- a/frontend/src/views/spider/SpiderDetail.vue
+++ b/frontend/src/views/spider/SpiderDetail.vue
@@ -25,6 +25,9 @@
       <el-tab-pane :label="$t('Analytics')" name="analytics">
         <spider-stats ref="spider-stats"/>
       </el-tab-pane>
+      <el-tab-pane :label="$t('Schedules')" name="schedules">
+        <spider-schedules/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -38,10 +41,12 @@ import SpiderOverview from '../../components/Overview/SpiderOverview'
 import EnvironmentList from '../../components/Environment/EnvironmentList'
 import SpiderStats from '../../components/Stats/SpiderStats'
 import ConfigList from '../../components/Config/ConfigList'
+import SpiderSchedules from './SpiderSchedules'
 
 export default {
   name: 'SpiderDetail',
   components: {
+    SpiderSchedules,
     ConfigList,
     SpiderStats,
     EnvironmentList,
diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index 80c3fa0b..fa6c6718 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -556,11 +556,6 @@ export default {
       }
       this.$store.dispatch('spider/getSpiderList', params)
     }
-    // getTypes () {
-    //   request.get(`/spider/types`).then(resp => {
-    //     this.types = resp.data.data
-    //   })
-    // }
   },
   async created () {
     // fetch spider types
diff --git a/frontend/src/views/spider/SpiderSchedules.vue b/frontend/src/views/spider/SpiderSchedules.vue
new file mode 100644
index 00000000..0315e47d
--- /dev/null
+++ b/frontend/src/views/spider/SpiderSchedules.vue
@@ -0,0 +1,55 @@
+<script>
+import ScheduleList from '../schedule/ScheduleList'
+
+export default {
+  name: 'SpiderSchedules',
+  extends: ScheduleList,
+  computed: {
+    isDisabledSpiderSchedule () {
+      return true
+    },
+    spiderId () {
+      const arr = this.$route.path.split('/')
+      return arr[arr.length - 1]
+    }
+  },
+  methods: {
+    getNodeList () {
+      this.$request.get('/nodes', {}).then(response => {
+        this.nodeList = response.data.data.map(d => {
+          d.systemInfo = {
+            os: '',
+            arch: '',
+            num_cpu: '',
+            executables: []
+          }
+          return d
+        })
+      })
+    },
+    getSpiderList () {
+      this.$request.get('/spiders', {})
+        .then(response => {
+          this.spiderList = response.data.data.list || []
+        })
+    },
+    onAdd () {
+      this.isEdit = false
+      this.dialogVisible = true
+      this.$store.commit('schedule/SET_SCHEDULE_FORM', { node_ids: [], spider_id: this.spiderId })
+      this.$st.sendEv('定时任务', '添加定时任务')
+    }
+  },
+  created () {
+    const arr = this.$route.path.split('/')
+    const id = arr[arr.length - 1]
+    this.$store.dispatch(`spider/getScheduleList`, { id })
+
+    // 节点列表
+    this.getNodeList()
+
+    // 爬虫列表
+    this.getSpiderList()
+  }
+}
+</script>

From b98240fab6009d65fb11dc183876fbd3b7ffe5ac Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 3 Jan 2020 17:24:57 +0800
Subject: [PATCH 16/31] updated CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1275b9fa..81ea730d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Features / Enhancement
 - **Dependency Installation**. Allow users to install/uninstall dependencies and add programming languages (Node.js only for now) on the platform web interface.
 - **Pre-install Programming Languages in Docker**. Allow Docker users to set `CRAWLAB_SERVER_LANG_NODE` as `Y` to pre-install `Node.js` environments.
+- **Add Schedule List in Spider Detail Page**. Allow users to view / add / edit schedule cron jobs in the spider detail page. [#360](https://github.com/crawlab-team/crawlab/issues/360)
 
 
 # 0.4.2 (2019-12-26)

From c88c3abf85ec52af82267b6680535e4ca8045eb2 Mon Sep 17 00:00:00 2001
From: hantmac <hantmac@outlook.com>
Date: Sat, 4 Jan 2020 17:29:05 +0800
Subject: [PATCH 17/31] Add Unique index for 'key'

---
 backend/database/mongo.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/backend/database/mongo.go b/backend/database/mongo.go
index d646285d..5d205ae4 100644
--- a/backend/database/mongo.go
+++ b/backend/database/mongo.go
@@ -93,5 +93,14 @@ func InitMongo() error {
 		// 赋值给全局mongo session
 		Session = sess
 	}
+	//Add Unique index for 'key'
+	keyIndex := mgo.Index{
+		Key:    []string{"key"},
+		Unique: true,
+	}
+	s, c := GetCol("nodes")
+	defer s.Close()
+	c.EnsureIndex(keyIndex)
+
 	return nil
 }

From 877289e3828e8fd5603ce0bd27208298eaae70b6 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 12:35:17 +0800
Subject: [PATCH 18/31] fixed
 https://github.com/crawlab-team/crawlab/issues/423

---
 backend/constants/schedule.go |  2 +-
 backend/main.go               | 14 +++++++-------
 backend/model/node.go         |  4 ++--
 backend/model/schedule.go     | 32 ++++++++++++--------------------
 backend/model/task.go         | 16 ++++++++--------
 backend/routes/schedule.go    |  8 ++++----
 backend/services/schedule.go  | 22 +++++++++++++++++-----
 backend/services/task.go      |  4 ++++
 8 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/backend/constants/schedule.go b/backend/constants/schedule.go
index c3104601..520626a9 100644
--- a/backend/constants/schedule.go
+++ b/backend/constants/schedule.go
@@ -1,7 +1,7 @@
 package constants
 
 const (
-	ScheduleStatusStop    = "stop"
+	ScheduleStatusStop    = "stopped"
 	ScheduleStatusRunning = "running"
 	ScheduleStatusError   = "error"
 
diff --git a/backend/main.go b/backend/main.go
index 74fac484..08cdf70f 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -189,13 +189,13 @@ func main() {
 			authGroup.GET("/tasks/:id/results", routes.GetTaskResults)                  // 任务结果
 			authGroup.GET("/tasks/:id/results/download", routes.DownloadTaskResultsCsv) // 下载任务结果
 			// 定时任务
-			authGroup.GET("/schedules", routes.GetScheduleList)        // 定时任务列表
-			authGroup.GET("/schedules/:id", routes.GetSchedule)        // 定时任务详情
-			authGroup.PUT("/schedules", routes.PutSchedule)            // 创建定时任务
-			authGroup.POST("/schedules/:id", routes.PostSchedule)      // 修改定时任务
-			authGroup.DELETE("/schedules/:id", routes.DeleteSchedule)  // 删除定时任务
-			authGroup.POST("/schedules/:id/stop", routes.StopSchedule) // 停止定时任务
-			authGroup.POST("/schedules/:id/run", routes.RunSchedule)   // 运行定时任务
+			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("/stats/home", routes.GetHomeStats) // 首页统计数据
 			// 用户
diff --git a/backend/model/node.go b/backend/model/node.go
index effbfbd0..88c4ed66 100644
--- a/backend/model/node.go
+++ b/backend/model/node.go
@@ -173,8 +173,8 @@ func GetNode(id bson.ObjectId) (Node, error) {
 	defer s.Close()
 
 	if err := c.FindId(id).One(&node); err != nil {
-		log.Errorf("get node error: %s, id: %s", err.Error(), id.Hex())
-		debug.PrintStack()
+		//log.Errorf("get node error: %s, id: %s", err.Error(), id.Hex())
+		//debug.PrintStack()
 		return node, err
 	}
 	return node, nil
diff --git a/backend/model/schedule.go b/backend/model/schedule.go
index c1923885..3b654b74 100644
--- a/backend/model/schedule.go
+++ b/backend/model/schedule.go
@@ -16,20 +16,17 @@ type Schedule struct {
 	Name        string          `json:"name" bson:"name"`
 	Description string          `json:"description" bson:"description"`
 	SpiderId    bson.ObjectId   `json:"spider_id" bson:"spider_id"`
-	//NodeId      bson.ObjectId   `json:"node_id" bson:"node_id"`
-	//NodeKey     string          `json:"node_key" bson:"node_key"`
 	Cron        string          `json:"cron" bson:"cron"`
 	EntryId     cron.EntryID    `json:"entry_id" bson:"entry_id"`
 	Param       string          `json:"param" bson:"param"`
 	RunType     string          `json:"run_type" bson:"run_type"`
 	NodeIds     []bson.ObjectId `json:"node_ids" bson:"node_ids"`
-
-	// 状态
-	Status string `json:"status" bson:"status"`
+	Status      string          `json:"status" bson:"status"`
+	Enabled     bool            `json:"enabled" bson:"enabled"`
 
 	// 前端展示
 	SpiderName string `json:"spider_name" bson:"spider_name"`
-	NodeName   string `json:"node_name" bson:"node_name"`
+	Nodes      []Node `json:"nodes" bson:"nodes"`
 	Message    string `json:"message" bson:"message"`
 
 	CreateTs time.Time `json:"create_ts" bson:"create_ts"`
@@ -84,20 +81,15 @@ func GetScheduleList(filter interface{}) ([]Schedule, error) {
 
 	var schs []Schedule
 	for _, schedule := range schedules {
-		// TODO: 获取节点名称
-		//if schedule.NodeId == bson.ObjectIdHex(constants.ObjectIdNull) {
-		//	// 选择所有节点
-		//	schedule.NodeName = "All Nodes"
-		//} else {
-		//	// 选择单一节点
-		//	node, err := GetNode(schedule.NodeId)
-		//	if err != nil {
-		//		schedule.Status = constants.ScheduleStatusError
-		//		schedule.Message = constants.ScheduleStatusErrorNotFoundNode
-		//	} else {
-		//		schedule.NodeName = node.Name
-		//	}
-		//}
+		// 获取节点名称
+		schedule.Nodes = []Node{}
+		if schedule.RunType == constants.RunTypeSelectedNodes {
+			for _, nodeId := range schedule.NodeIds {
+				// 选择单一节点
+				node, _ := GetNode(nodeId)
+				schedule.Nodes = append(schedule.Nodes, node)
+			}
+		}
 
 		// 获取爬虫名称
 		spider, err := GetSpider(schedule.SpiderId)
diff --git a/backend/model/task.go b/backend/model/task.go
index 299661ed..6762bd54 100644
--- a/backend/model/task.go
+++ b/backend/model/task.go
@@ -117,18 +117,12 @@ func GetTaskList(filter interface{}, skip int, limit int, sortKey string) ([]Tas
 
 	for i, task := range tasks {
 		// 获取爬虫名称
-		spider, err := task.GetSpider()
-		if err != nil || spider.Id.Hex() == "" {
-			_ = spider.Delete()
-		} else {
+		if spider, err := task.GetSpider(); err == nil {
 			tasks[i].SpiderName = spider.DisplayName
 		}
 
 		// 获取节点名称
-		node, err := task.GetNode()
-		if node.Id.Hex() == "" || err != nil {
-			_ = task.Delete()
-		} else {
+		if node, err := task.GetNode(); err == nil {
 			tasks[i].NodeName = node.Name
 		}
 	}
@@ -142,6 +136,8 @@ func GetTaskListTotal(filter interface{}) (int, error) {
 	var result int
 	result, err := c.Find(filter).Count()
 	if err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
 		return result, err
 	}
 	return result, nil
@@ -168,6 +164,8 @@ func AddTask(item Task) error {
 	item.UpdateTs = time.Now()
 
 	if err := c.Insert(&item); err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
 		return err
 	}
 	return nil
@@ -179,6 +177,8 @@ func RemoveTask(id string) error {
 
 	var result Task
 	if err := c.FindId(id).One(&result); err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
 		return err
 	}
 
diff --git a/backend/routes/schedule.go b/backend/routes/schedule.go
index e54c49a3..c7ef474a 100644
--- a/backend/routes/schedule.go
+++ b/backend/routes/schedule.go
@@ -110,9 +110,9 @@ func DeleteSchedule(c *gin.Context) {
 }
 
 // 停止定时任务
-func StopSchedule(c *gin.Context) {
+func DisableSchedule(c *gin.Context) {
 	id := c.Param("id")
-	if err := services.Sched.Stop(bson.ObjectIdHex(id)); err != nil {
+	if err := services.Sched.Disable(bson.ObjectIdHex(id)); err != nil {
 		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
@@ -120,9 +120,9 @@ func StopSchedule(c *gin.Context) {
 }
 
 // 运行定时任务
-func RunSchedule(c *gin.Context) {
+func EnableSchedule(c *gin.Context) {
 	id := c.Param("id")
-	if err := services.Sched.Run(bson.ObjectIdHex(id)); err != nil {
+	if err := services.Sched.Enable(bson.ObjectIdHex(id)); err != nil {
 		HandleError(http.StatusInternalServerError, c, err)
 		return
 	}
diff --git a/backend/services/schedule.go b/backend/services/schedule.go
index 53938aea..d737c3ac 100644
--- a/backend/services/schedule.go
+++ b/backend/services/schedule.go
@@ -53,6 +53,8 @@ func AddScheduleTask(s model.Schedule) func() {
 				Param:    s.Param,
 			}
 			if err := AddTask(t); err != nil {
+				log.Errorf(err.Error())
+				debug.PrintStack()
 				return
 			}
 			if err := AssignTask(t); err != nil {
@@ -137,7 +139,7 @@ func (s *Scheduler) Start() error {
 func (s *Scheduler) AddJob(job model.Schedule) error {
 	spec := job.Cron
 
-	// 添加任务
+	// 添加定时任务
 	eid, err := s.cron.AddFunc(spec, AddScheduleTask(job))
 	if err != nil {
 		log.Errorf("add func task error: %s", err.Error())
@@ -147,7 +149,12 @@ func (s *Scheduler) AddJob(job model.Schedule) error {
 
 	// 更新EntryID
 	job.EntryId = eid
+
+	// 更新状态
 	job.Status = constants.ScheduleStatusRunning
+	job.Enabled = true
+
+	// 保存定时任务
 	if err := job.Save(); err != nil {
 		log.Errorf("job save error: %s", err.Error())
 		debug.PrintStack()
@@ -176,8 +183,8 @@ func ParserCron(spec string) error {
 	return nil
 }
 
-// 停止定时任务
-func (s *Scheduler) Stop(id bson.ObjectId) error {
+// 禁用定时任务
+func (s *Scheduler) Disable(id bson.ObjectId) error {
 	schedule, err := model.GetSchedule(id)
 	if err != nil {
 		return err
@@ -185,17 +192,22 @@ func (s *Scheduler) Stop(id bson.ObjectId) error {
 	if schedule.EntryId == 0 {
 		return errors.New("entry id not found")
 	}
+
+	// 从cron服务中删除该任务
 	s.cron.Remove(schedule.EntryId)
+
 	// 更新状态
 	schedule.Status = constants.ScheduleStatusStop
+	schedule.Enabled = false
+
 	if err = schedule.Save(); err != nil {
 		return err
 	}
 	return nil
 }
 
-// 运行任务
-func (s *Scheduler) Run(id bson.ObjectId) error {
+// 启用定时任务
+func (s *Scheduler) Enable(id bson.ObjectId) error {
 	schedule, err := model.GetSchedule(id)
 	if err != nil {
 		return err
diff --git a/backend/services/task.go b/backend/services/task.go
index c0aa8fc8..7da6b022 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -627,11 +627,15 @@ func AddTask(t model.Task) error {
 
 	// 将任务存入数据库
 	if err := model.AddTask(t); err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
 		return err
 	}
 
 	// 加入任务队列
 	if err := AssignTask(t); err != nil {
+		log.Errorf(err.Error())
+		debug.PrintStack()
 		return err
 	}
 

From fafdccecf7f5a6d2b396421cacfef062d5ac1fed Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 12:35:56 +0800
Subject: [PATCH 19/31] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E5=8A=A0=E5=85=A5=E5=90=AF=E7=94=A8/?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                      |   9 ++
 frontend/src/store/modules/schedule.js       |  15 ++-
 frontend/src/views/schedule/ScheduleList.vue | 109 +++++++++----------
 frontend/src/views/task/TaskList.vue         |   6 +-
 4 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 852e79be..ecb0bd82 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -223,6 +223,8 @@ export default {
   'error': '错误',
   'Not Found Node': '节点配置错误',
   'Not Found Spider': '爬虫配置错误',
+  '[minute] [hour] [day] [month] [day of week]': '[分] [时] [天] [月] [星期几]',
+  'Enable/Disable': '启用/禁用',
 
   // 网站
   'Site': '网站',
@@ -313,6 +315,13 @@ export default {
   'Installing language failed': '安装语言失败',
   'You have successfully installed a language: ': '您已成功安装语言: ',
   'The language installation is unsuccessful: ': '安装语言失败: ',
+  'Enabling the schedule successful': '启用定时任务成功',
+  'Disabling the schedule successful': '禁用定时任务成功',
+  'Enabling the schedule unsuccessful': '启用定时任务失败',
+  'Disabling the schedule unsuccessful': '禁用定时任务失败',
+  'The schedule has been removed': '已删除定时任务',
+  'The schedule has been added': '已添加定时任务',
+  'The schedule has been saved': '已保存定时任务',
 
   // 登录
   'Sign in': '登录',
diff --git a/frontend/src/store/modules/schedule.js b/frontend/src/store/modules/schedule.js
index e71d5f03..9fde4e84 100644
--- a/frontend/src/store/modules/schedule.js
+++ b/frontend/src/store/modules/schedule.js
@@ -21,7 +21,12 @@ const actions = {
   getScheduleList ({ state, commit }) {
     request.get('/schedules')
       .then(response => {
-        commit('SET_SCHEDULE_LIST', response.data.data)
+        commit('SET_SCHEDULE_LIST', response.data.data.map(d => {
+          const arr = d.cron.split(' ')
+          arr.splice(0, 1)
+          d.cron = arr.join(' ')
+          return d
+        }))
       })
   },
   addSchedule ({ state }) {
@@ -33,11 +38,11 @@ const actions = {
   removeSchedule ({ state }, id) {
     request.delete(`/schedules/${id}`)
   },
-  stopSchedule ({ state, dispatch }, id) {
-    return request.post(`/schedules/${id}/stop`)
+  enableSchedule ({ state, dispatch }, id) {
+    return request.post(`/schedules/${id}/enable`)
   },
-  runSchedule ({ state, dispatch }, id) {
-    return request.post(`/schedules/${id}/run`)
+  disableSchedule ({ state, dispatch }, id) {
+    return request.post(`/schedules/${id}/disable`)
   }
 }
 
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 0cfbb6d2..ab9e7636 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -67,8 +67,10 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('Cron')" prop="cron" required>
-          <el-input v-model="scheduleForm.cron"
-                    :placeholder="$t('schedules.cron')">
+          <el-input
+            v-model="scheduleForm.cron"
+            :placeholder="`${$t('[minute] [hour] [day] [month] [day of week]')}`"
+          >
           </el-input>
           <!--<el-button size="small" style="width:100px" type="primary" @click="onShowCronDialog">{{$t('schedules.add_cron')}}</el-button>-->
         </el-form-item>
@@ -137,13 +139,28 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-else-if="col.name === 'run_type'" :key="col.name" :label="$t(col.label)">
+          <el-table-column v-else-if="col.name === 'run_type'" :key="col.name" :label="$t(col.label)" :width="col.width">
             <template slot-scope="scope">
               <template v-if="scope.row.run_type === 'all-nodes'">{{$t('All Nodes')}}</template>
               <template v-else-if="scope.row.run_type === 'selected-nodes'">{{$t('Selected Nodes')}}</template>
               <template v-else-if="scope.row.run_type === 'random'">{{$t('Random')}}</template>
             </template>
           </el-table-column>
+          <el-table-column v-else-if="col.name === 'node_names'" :key="col.name" :label="$t(col.label)" :width="col.width">
+            <template slot-scope="scope">
+              {{scope.row.nodes.map(d => d.name).join(', ')}}
+            </template>
+          </el-table-column>
+          <el-table-column v-else-if="col.name === 'enable'" :key="col.name" :label="$t(col.label)" :width="col.width">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.enabled"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                @change="onEnabledChange(scope.row)"
+              />
+            </template>
+          </el-table-column>
           <el-table-column v-else :key="col.name"
                            :property="col.name"
                            :label="$t(col.label)"
@@ -155,7 +172,7 @@
             </template>
           </el-table-column>
         </template>
-        <el-table-column :label="$t('Action')" align="left" width="180px" fixed="right">
+        <el-table-column :label="$t('Action')" align="left" width="auto" fixed="right">
           <template slot-scope="scope">
             <!-- 编辑 -->
             <el-tooltip :content="$t('Edit')" placement="top">
@@ -188,14 +205,15 @@ export default {
   data () {
     return {
       columns: [
-        { name: 'name', label: 'Name', width: '180' },
-        { name: 'cron', label: 'Cron', width: '120' },
-        { name: 'run_type', label: 'Run Type', width: '150' },
-        { name: 'node_name', label: 'Node', width: '150' },
-        { name: 'spider_name', label: 'Spider', width: '150' },
-        { name: 'param', label: 'Parameters', width: '150' },
-        { name: 'description', label: 'Description', width: 'auto' },
-        { name: 'status', label: 'Status', width: 'auto' }
+        { name: 'name', label: 'Name', width: '150px' },
+        { name: 'cron', label: 'Cron', width: '120px' },
+        { name: 'run_type', label: 'Run Type', width: '120px' },
+        { name: 'node_names', label: 'Node', width: '150px' },
+        { name: 'spider_name', label: 'Spider', width: '150px' },
+        { name: 'param', label: 'Parameters', width: '150px' },
+        { name: 'description', label: 'Description', width: '200px' },
+        { name: 'enable', label: 'Enable/Disable', width: '120px' }
+        // { name: 'status', label: 'Status', width: '100px' }
       ],
       isEdit: false,
       dialogTitle: '',
@@ -242,23 +260,27 @@ export default {
     onAddSubmit () {
       this.$refs.scheduleForm.validate(res => {
         if (res) {
+          const form = JSON.parse(JSON.stringify(this.scheduleForm))
+          form.cron = '0 ' + this.scheduleForm.cron
           if (this.isEdit) {
-            request.post(`/schedules/${this.scheduleForm._id}`, this.scheduleForm).then(response => {
+            request.post(`/schedules/${this.scheduleForm._id}`, form).then(response => {
               if (response.data.error) {
                 this.$message.error(response.data.error)
                 return
               }
               this.dialogVisible = false
               this.$store.dispatch('schedule/getScheduleList')
+              this.$message.success(this.$t('The schedule has been saved'))
             })
           } else {
-            request.put('/schedules', this.scheduleForm).then(response => {
+            request.put('/schedules', form).then(response => {
               if (response.data.error) {
                 this.$message.error(response.data.error)
                 return
               }
               this.dialogVisible = false
               this.$store.dispatch('schedule/getScheduleList')
+              this.$message.success(this.$t('The schedule has been added'))
             })
           }
         }
@@ -283,57 +305,13 @@ export default {
           .then(() => {
             setTimeout(() => {
               this.$store.dispatch('schedule/getScheduleList')
-              this.$message.success(`Schedule "${row.name}" has been removed`)
+              this.$message.success(this.$t('The schedule has been removed'))
             }, 100)
           })
       }).catch(() => {
       })
       this.$st.sendEv('定时任务', '删除定时任务')
     },
-    onCrawl (row) {
-      // 停止定时任务
-      if (!row.status || row.status === 'running') {
-        this.$confirm(this.$t('Are you sure to delete the schedule task?'), this.$t('Notification'), {
-          confirmButtonText: this.$t('Confirm'),
-          cancelButtonText: this.$t('Cancel'),
-          type: 'warning'
-        }).then(() => {
-          this.$store.dispatch('schedule/stopSchedule', row._id)
-            .then((resp) => {
-              if (resp.data.status === 'ok') {
-                this.$store.dispatch('schedule/getScheduleList')
-                return
-              }
-              this.$message({
-                type: 'error',
-                message: resp.data.error
-              })
-            })
-        }).catch(() => {
-        })
-      }
-      // 运行定时任务
-      if (row.status === 'stop') {
-        this.$confirm(this.$t('Are you sure to delete the schedule task?'), this.$t('Notification'), {
-          confirmButtonText: this.$t('Confirm'),
-          cancelButtonText: this.$t('Cancel'),
-          type: 'warning'
-        }).then(() => {
-          this.$store.dispatch('schedule/runSchedule', row._id)
-            .then((resp) => {
-              if (resp.data.status === 'ok') {
-                this.$store.dispatch('schedule/getScheduleList')
-                return
-              }
-              this.$message({
-                type: 'error',
-                message: resp.data.error
-              })
-            })
-        }).catch(() => {
-        })
-      }
-    },
     isDisabledSpider (spider) {
       if (spider.type === 'customized') {
         return !spider.cmd
@@ -349,6 +327,19 @@ export default {
       } else if (row.status === 'error') {
         return 'Start'
       }
+    },
+    async onEnabledChange (row) {
+      let res
+      if (row.enabled) {
+        res = await this.$store.dispatch('schedule/enableSchedule', row._id)
+      } else {
+        res = await this.$store.dispatch('schedule/disableSchedule', row._id)
+      }
+      if (!res || res.data.error) {
+        this.$message.error(this.$t(`${row.enabled ? 'Enabling' : 'Disabling'} the schedule unsuccessful`))
+      } else {
+        this.$message.success(this.$t(`${row.enabled ? 'Enabling' : 'Disabling'} the schedule successful`))
+      }
     }
   },
   created () {
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index 6cfab747..543a1ac1 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -345,9 +345,9 @@ export default {
     this.$store.dispatch('node/getNodeList')
   },
   mounted () {
-    // this.handle = setInterval(() => {
-    //   this.$store.dispatch('task/getTaskList')
-    // }, 5000)
+    this.handle = setInterval(() => {
+      this.$store.dispatch('task/getTaskList')
+    }, 5000)
   },
   destroyed () {
     clearInterval(this.handle)

From a369a2250ced53ecbfe457e042c4c8dfa26e9a49 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 12:50:41 +0800
Subject: [PATCH 20/31] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Node/NodeInstallation.vue     | 16 ++++++++--------
 frontend/src/views/node/NodeDetail.vue           |  3 +--
 frontend/src/views/spider/SpiderList.vue         |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/Node/NodeInstallation.vue b/frontend/src/components/Node/NodeInstallation.vue
index 7cf4f6b9..e0f2bb25 100644
--- a/frontend/src/components/Node/NodeInstallation.vue
+++ b/frontend/src/components/Node/NodeInstallation.vue
@@ -9,7 +9,6 @@
           :placeholder="$t('Search Dependencies')"
           :fetchSuggestions="fetchAllDepList"
           :minlength="2"
-          :disabled="isShowInstalled"
           @select="onSearch"
         />
         <el-input
@@ -17,14 +16,12 @@
           v-model="depName"
           style="width: 240px"
           :placeholder="$t('Search Dependencies')"
-          :disabled="isShowInstalled"
         />
       </el-form-item>
       <el-form-item>
         <el-button
           icon="el-icon-search"
           type="success"
-          :disabled="isShowInstalled"
           @click="onSearch"
         >
           {{$t('Search')}}
@@ -187,11 +184,9 @@ export default {
       }) : [])
     },
     onSearch () {
-      if (!this.isShowInstalled) {
-        this.getDepList()
-      } else {
-        this.getInstalledDepList()
-      }
+      this.isShowInstalled = false
+      this.getDepList()
+      this.$st.sendEv('节点详情', '安装', '搜索')
     },
     onIsShowInstalledChange (val) {
       if (val) {
@@ -200,6 +195,7 @@ export default {
         this.depName = ''
         this.depList = []
       }
+      this.$st.sendEv('节点详情', '安装', '点击查看已安装')
     },
     async onClickInstallDep (dep) {
       const name = dep.name
@@ -223,6 +219,7 @@ export default {
         dep.installed = true
       }
       this.$set(this.depLoadingDict, name, false)
+      this.$st.sendEv('节点详情', '安装', '点击安装依赖')
     },
     async onClickUninstallDep (dep) {
       const name = dep.name
@@ -246,6 +243,7 @@ export default {
         dep.installed = false
       }
       this.$set(this.depLoadingDict, name, false)
+      this.$st.sendEv('节点详情', '安装', '点击卸载依赖')
     },
     getDepLoading (dep) {
       const name = dep.name
@@ -271,6 +269,7 @@ export default {
         })
       }
       this.isLoadingInstallLang = false
+      this.$st.sendEv('节点详情', '安装', '点击安装语言')
     },
     onTabChange () {
       if (this.isShowInstalled) {
@@ -279,6 +278,7 @@ export default {
         this.depName = ''
         this.depList = []
       }
+      this.$st.sendEv('节点详情', '安装', '切换标签')
     }
   },
   async created () {
diff --git a/frontend/src/views/node/NodeDetail.vue b/frontend/src/views/node/NodeDetail.vue
index 10364b01..dca3d818 100644
--- a/frontend/src/views/node/NodeDetail.vue
+++ b/frontend/src/views/node/NodeDetail.vue
@@ -49,8 +49,7 @@ export default {
   },
   methods: {
     onTabClick (name) {
-      if (name === 'installation') {
-      }
+      this.$st.sendEv('节点详情', '切换标签', name)
     },
     onNodeChange (id) {
       this.$router.push(`/nodes/${id}`)
diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index fa6c6718..d31a906f 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -163,8 +163,8 @@
       <!--tabs-->
       <el-tabs v-model="filter.type" @tab-click="onClickTab">
         <el-tab-pane :label="$t('All')" name="all"></el-tab-pane>
-        <el-tab-pane :label="$t('Configurable')" name="configurable"></el-tab-pane>
         <el-tab-pane :label="$t('Customized')" name="customized"></el-tab-pane>
+        <el-tab-pane :label="$t('Configurable')" name="configurable"></el-tab-pane>
       </el-tabs>
       <!--./tabs-->
 

From 029c95498aa5d7706b2839858d42c2ed39bcf35b Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 12:55:30 +0800
Subject: [PATCH 21/31] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/InfoView/NodeInfoView.vue | 2 +-
 frontend/src/components/Node/NodeInstallation.vue | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/InfoView/NodeInfoView.vue b/frontend/src/components/InfoView/NodeInfoView.vue
index e6ffb58a..6b0861e3 100644
--- a/frontend/src/components/InfoView/NodeInfoView.vue
+++ b/frontend/src/components/InfoView/NodeInfoView.vue
@@ -55,7 +55,7 @@ export default {
             })
         }
       })
-      this.$st.sendEv('节点详情', '保存')
+      this.$st.sendEv('节点详情', '概览', '保存')
     }
   }
 }
diff --git a/frontend/src/components/Node/NodeInstallation.vue b/frontend/src/components/Node/NodeInstallation.vue
index e0f2bb25..3924cd76 100644
--- a/frontend/src/components/Node/NodeInstallation.vue
+++ b/frontend/src/components/Node/NodeInstallation.vue
@@ -186,7 +186,7 @@ export default {
     onSearch () {
       this.isShowInstalled = false
       this.getDepList()
-      this.$st.sendEv('节点详情', '安装', '搜索')
+      this.$st.sendEv('节点详情', '安装', '搜索依赖')
     },
     onIsShowInstalledChange (val) {
       if (val) {
@@ -219,7 +219,7 @@ export default {
         dep.installed = true
       }
       this.$set(this.depLoadingDict, name, false)
-      this.$st.sendEv('节点详情', '安装', '点击安装依赖')
+      this.$st.sendEv('节点详情', '安装', '安装依赖')
     },
     async onClickUninstallDep (dep) {
       const name = dep.name
@@ -243,7 +243,7 @@ export default {
         dep.installed = false
       }
       this.$set(this.depLoadingDict, name, false)
-      this.$st.sendEv('节点详情', '安装', '点击卸载依赖')
+      this.$st.sendEv('节点详情', '安装', '卸载依赖')
     },
     getDepLoading (dep) {
       const name = dep.name
@@ -269,7 +269,7 @@ export default {
         })
       }
       this.isLoadingInstallLang = false
-      this.$st.sendEv('节点详情', '安装', '点击安装语言')
+      this.$st.sendEv('节点详情', '安装', '安装语言')
     },
     onTabChange () {
       if (this.isShowInstalled) {

From 04905f38b50c4efa7094da479ebfe033135de637 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 13:18:29 +0800
Subject: [PATCH 22/31] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=88=AC=E8=99=AB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/constants/common.go              |   6 ++
 backend/model/spider.go                  |   4 +-
 backend/routes/spider.go                 |  24 ++++-
 backend/services/spider.go               |   2 +-
 frontend/src/views/spider/SpiderList.vue | 112 ++++++++++++++---------
 5 files changed, 100 insertions(+), 48 deletions(-)
 create mode 100644 backend/constants/common.go

diff --git a/backend/constants/common.go b/backend/constants/common.go
new file mode 100644
index 00000000..9ac6cdbc
--- /dev/null
+++ b/backend/constants/common.go
@@ -0,0 +1,6 @@
+package constants
+
+const (
+	ASCENDING = "ascending"
+	DESCENDING = "descending"
+)
diff --git a/backend/model/spider.go b/backend/model/spider.go
index e08352e4..3026a66b 100644
--- a/backend/model/spider.go
+++ b/backend/model/spider.go
@@ -107,13 +107,13 @@ func (spider *Spider) Delete() error {
 }
 
 // 获取爬虫列表
-func GetSpiderList(filter interface{}, skip int, limit int) ([]Spider, int, error) {
+func GetSpiderList(filter interface{}, skip int, limit int, sortStr string) ([]Spider, int, error) {
 	s, c := database.GetCol("spiders")
 	defer s.Close()
 
 	// 获取爬虫列表
 	var spiders []Spider
-	if err := c.Find(filter).Skip(skip).Limit(limit).Sort("+name").All(&spiders); err != nil {
+	if err := c.Find(filter).Skip(skip).Limit(limit).Sort(sortStr).All(&spiders); err != nil {
 		debug.PrintStack()
 		return spiders, 0, err
 	}
diff --git a/backend/routes/spider.go b/backend/routes/spider.go
index ca9f74d9..91bab47a 100644
--- a/backend/routes/spider.go
+++ b/backend/routes/spider.go
@@ -27,22 +27,38 @@ import (
 )
 
 func GetSpiderList(c *gin.Context) {
-	pageNum, _ := c.GetQuery("pageNum")
-	pageSize, _ := c.GetQuery("pageSize")
+	pageNum, _ := c.GetQuery("page_num")
+	pageSize, _ := c.GetQuery("page_size")
 	keyword, _ := c.GetQuery("keyword")
 	t, _ := c.GetQuery("type")
+	sortKey, _ := c.GetQuery("sort_key")
+	sortDirection, _ := c.GetQuery("sort_direction")
 
+	// 筛选
 	filter := bson.M{
 		"name": bson.M{"$regex": bson.RegEx{Pattern: keyword, Options: "im"}},
 	}
-
 	if t != "" && t != "all" {
 		filter["type"] = t
 	}
 
+	// 排序
+	sortStr := "-_id"
+	if sortKey != "" && sortDirection != "" {
+		if sortDirection == constants.DESCENDING {
+			sortStr = "-" + sortKey
+		} else if sortDirection == constants.ASCENDING {
+			sortStr = "+" + sortKey
+		} else {
+			HandleErrorF(http.StatusBadRequest, c, "invalid sort_direction")
+		}
+	}
+
+	// 分页
 	page := &entity.Page{}
 	page.GetPage(pageNum, pageSize)
-	results, count, err := model.GetSpiderList(filter, page.Skip, page.Limit)
+
+	results, count, err := model.GetSpiderList(filter, page.Skip, page.Limit, sortStr)
 	if err != nil {
 		HandleError(http.StatusInternalServerError, c, err)
 		return
diff --git a/backend/services/spider.go b/backend/services/spider.go
index 3515afa9..e97c7992 100644
--- a/backend/services/spider.go
+++ b/backend/services/spider.go
@@ -143,7 +143,7 @@ func ReadFileByStep(filePath string, handle func([]byte, *mgo.GridFile), fileCre
 // 发布所有爬虫
 func PublishAllSpiders() {
 	// 获取爬虫列表
-	spiders, _, _ := model.GetSpiderList(nil, 0, constants.Infinite)
+	spiders, _, _ := model.GetSpiderList(nil, 0, constants.Infinite, "-_id")
 	if len(spiders) == 0 {
 		return
 	}
diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index d31a906f..5e6ea3b9 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -169,67 +169,86 @@
       <!--./tabs-->
 
       <!--table list-->
-      <el-table :data="spiderList"
-                class="table"
-                :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
-                border
-                @row-click="onRowClick"
+      <el-table
+        :data="spiderList"
+        class="table"
+        :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
+        border
+        @row-click="onRowClick"
+        @sort-change="onSortChange"
       >
         <template v-for="col in columns">
-          <el-table-column v-if="col.name === 'type'"
-                           :key="col.name"
-                           :label="$t(col.label)"
-                           align="left"
-                           :width="col.width">
+          <el-table-column
+            v-if="col.name === 'type'"
+            :key="col.name"
+            :label="$t(col.label)"
+            align="left"
+            :width="col.width"
+            :sortable="col.sortable"
+          >
             <template slot-scope="scope">
               {{$t(scope.row.type)}}
             </template>
           </el-table-column>
-          <el-table-column v-else-if="col.name === 'last_5_errors'"
-                           :key="col.name"
-                           :label="$t(col.label)"
-                           :width="col.width"
-                           align="center">
+          <el-table-column
+            v-else-if="col.name === 'last_5_errors'"
+            :key="col.name"
+            :label="$t(col.label)"
+            :width="col.width"
+            :sortable="col.sortable"
+            align="center"
+          >
             <template slot-scope="scope">
               <div :style="{color:scope.row[col.name]>0?'red':''}">
                 {{scope.row[col.name]}}
               </div>
             </template>
           </el-table-column>
-          <el-table-column v-else-if="col.name === 'cmd'"
-                           :key="col.name"
-                           :label="$t(col.label)"
-                           :width="col.width"
-                           align="left">
+          <el-table-column
+            v-else-if="col.name === 'cmd'"
+            :key="col.name"
+            :label="$t(col.label)"
+            :width="col.width"
+            :sortable="col.sortable"
+            align="left"
+          >
             <template slot-scope="scope">
               <el-input v-model="scope.row[col.name]"></el-input>
             </template>
           </el-table-column>
-          <el-table-column v-else-if="col.name.match(/_ts$/)"
-                           :key="col.name"
-                           :label="$t(col.label)"
-                           :sortable="col.sortable"
-                           :align="col.align"
-                           :width="col.width">
+          <el-table-column
+            v-else-if="col.name.match(/_ts$/)"
+            :key="col.name"
+            :label="$t(col.label)"
+            :sortable="col.sortable"
+            :align="col.align"
+            :width="col.width"
+          >
             <template slot-scope="scope">
               {{getTime(scope.row[col.name])}}
             </template>
           </el-table-column>
-          <el-table-column v-else-if="col.name === 'last_status'"
-                           :key="col.name"
-                           :label="$t(col.label)"
-                           align="left" :width="col.width">
+          <el-table-column
+            v-else-if="col.name === 'last_status'"
+            :key="col.name"
+            :label="$t(col.label)"
+            align="left"
+            :width="col.width"
+            :sortable="col.sortable"
+          >
             <template slot-scope="scope">
               <status-tag :status="scope.row.last_status"/>
             </template>
           </el-table-column>
-          <el-table-column v-else
-                           :key="col.name"
-                           :property="col.name"
-                           :label="$t(col.label)"
-                           :sortable="col.sortable"
-                           :align="col.align || 'left'"
-                           :width="col.width">
+          <el-table-column
+            v-else
+            :key="col.name"
+            :property="col.name"
+            :label="$t(col.label)"
+            :sortable="col.sortable"
+            :align="col.align || 'left'"
+            :width="col.width"
+          >
           </el-table-column>
         </template>
         <el-table-column :label="$t('Action')" align="left" fixed="right">
@@ -300,10 +319,14 @@ export default {
         keyword: '',
         type: 'all'
       },
+      sort: {
+        sortKey: '',
+        sortDirection: null
+      },
       types: [],
       columns: [
-        { name: 'display_name', label: 'Name', width: '160', align: 'left' },
-        { name: 'type', label: 'Spider Type', width: '120' },
+        { name: 'display_name', label: 'Name', width: '160', align: 'left', sortable: true },
+        { name: 'type', label: 'Spider Type', width: '120', sortable: true },
         { name: 'last_status', label: 'Last Status', width: '120' },
         { name: 'last_run_ts', label: 'Last Run', width: '140' },
         // { name: 'update_ts', label: 'Update Time', width: '140' },
@@ -543,14 +566,21 @@ export default {
     onRowClick (row, column, event) {
       this.onView(row, event)
     },
+    onSortChange ({ column, prop, order }) {
+      this.sort.sortKey = order ? prop : ''
+      this.sort.sortDirection = order
+      this.getList()
+    },
     onClickTab (tab) {
       this.filter.type = tab.name
       this.getList()
     },
     getList () {
       let params = {
-        pageNum: this.pagination.pageNum,
-        pageSize: this.pagination.pageSize,
+        page_num: this.pagination.pageNum,
+        page_size: this.pagination.pageSize,
+        sort_key: this.sort.sortKey,
+        sort_direction: this.sort.sortDirection,
         keyword: this.filter.keyword,
         type: this.filter.type
       }

From d7e2270765dd44131ae3d7eafaeaf47d3d365e59 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 16:42:01 +0800
Subject: [PATCH 23/31] added CHANGELOG-zh.md

---
 CHANGELOG-zh.md | 147 ++++++++++++++++++++++++++++++++++++++++++++++++
 CHANGELOG.md    |  10 +++-
 README-zh.md    |   2 +-
 README.md       |   2 +-
 4 files changed, 158 insertions(+), 3 deletions(-)
 create mode 100644 CHANGELOG-zh.md

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
new file mode 100644
index 00000000..9a861d80
--- /dev/null
+++ b/CHANGELOG-zh.md
@@ -0,0 +1,147 @@
+# 0.4.3 (2020-01-07)
+
+### 功能 / 优化
+- **依赖安装**. 允许用户在平台 Web 界面安装/卸载依赖以及添加编程语言（暂时只有 Node.js）。
+- **Docker 中预装编程语言**. 允许 Docker 用户通过设置 `CRAWLAB_SERVER_LANG_NODE` 为 `Y` 来预装 `Node.js` 环境.
+- **在爬虫详情页添加定时任务列表**. 允许用户在爬虫详情页查看、添加、编辑定时任务. [#360](https://github.com/crawlab-team/crawlab/issues/360)
+- **Cron 表达式与 Linux 一致**. 将表达式从 6 元素改为 5 元素，与 Linux 一致.
+- **启用/禁用定时任务**. 允许用户启用/禁用定时任务. [#297](https://github.com/crawlab-team/crawlab/issues/297)
+- **优化任务管理**. 允许用户批量删除任务. [#341](https://github.com/crawlab-team/crawlab/issues/341)
+- **优化爬虫管理**. 允许用户在爬虫列表页对爬虫进行筛选和排序.
+
+### Bug 修复
+- **定时任务问题**. [#423](https://github.com/crawlab-team/crawlab/issues/423)
+- **上传爬虫zip文件问题**. [#403](https://github.com/crawlab-team/crawlab/issues/403) [#407](https://github.com/crawlab-team/crawlab/issues/407)
+- **因为网络原因导致崩溃**. [#340](https://github.com/crawlab-team/crawlab/issues/340)
+
+# 0.4.2 (2019-12-26)
+### 功能 / 优化
+- **免责声明**. 加入免责声明.
+- **通过 API 获取版本号**. [#371](https://github.com/crawlab-team/crawlab/issues/371)
+- **通过配置来允许用户注册**. [#346](https://github.com/crawlab-team/crawlab/issues/346)
+- **允许添加新用户**.
+- **更高级的文件管理**. 允许用户添加、编辑、重命名、删除代码文件. [#286](https://github.com/crawlab-team/crawlab/issues/286)
+- **优化爬虫创建流程**. 允许用户在上传 zip 文件前创建空的自定义爬虫.
+- **优化任务管理**. 允许用户通过选择条件过滤任务. [#341](https://github.com/crawlab-team/crawlab/issues/341)
+
+### Bug 修复
+- **重复节点**. [#391](https://github.com/crawlab-team/crawlab/issues/391)
+- **"mongodb no reachable" 错误**. [#373](https://github.com/crawlab-team/crawlab/issues/373)
+
+# 0.4.1 (2019-12-13)
+### 功能 / 优化
+- **Spiderfile 优化**. 将阶段由数组更换为字典. [#358](https://github.com/crawlab-team/crawlab/issues/358)
+- **百度统计更新**.
+
+### Bug 修复
+- **无法展示定时任务**. [#353](https://github.com/crawlab-team/crawlab/issues/353)
+- **重复节点注册**. [#334](https://github.com/crawlab-team/crawlab/issues/334)
+
+# 0.4.0 (2019-12-06)
+### 功能 / 优化
+- **可配置爬虫**. 允许用户添加 `Spiderfile` 来配置抓取规则.
+- **执行模式**. 允许用户选择 3 种任务执行模式: *所有节点*, *指定节点* and *随机*.
+
+### Bug 修复
+- **任务意外被杀死**. [#306](https://github.com/crawlab-team/crawlab/issues/306)
+- **文档更正**. [#301](https://github.com/crawlab-team/crawlab/issues/258) [#301](https://github.com/crawlab-team/crawlab/issues/258)
+- **直接部署与 Windows 不兼容**. [#288](https://github.com/crawlab-team/crawlab/issues/288)
+- **日志文件丢失**. [#269](https://github.com/crawlab-team/crawlab/issues/269)
+
+# 0.3.5 (2019-10-28)
+### 功能 / 优化
+- **优雅关闭**. [详情](https://github.com/crawlab-team/crawlab/commit/63fab3917b5a29fd9770f9f51f1572b9f0420385)
+- **节点信息优化**. [详情](https://github.com/crawlab-team/crawlab/commit/973251a0fbe7a2184ac0da09e0404a17c736aee7)
+- **将系统环境变量添加到任务**. [详情](https://github.com/crawlab-team/crawlab/commit/4ab4892471965d6342d30385578ca60dc51f8ad3)
+- **自动刷新任务日志**. [详情](https://github.com/crawlab-team/crawlab/commit/4ab4892471965d6342d30385578ca60dc51f8ad3)
+- **允许 HTTPS 部署**. [详情](https://github.com/crawlab-team/crawlab/commit/5d8f6f0c56768a6e58f5e46cbf5adff8c7819228)
+
+### Bug 修复
+- **定时任务中无法获取爬虫列表**. [详情](https://github.com/crawlab-team/crawlab/commit/311f72da19094e3fa05ab4af49812f58843d8d93)
+- **无法获取工作节点信息**. [详情](https://github.com/crawlab-team/crawlab/commit/6af06efc17685a9e232e8c2b5fd819ec7d2d1674)
+- **运行爬虫任务时无法选择节点**. [详情](https://github.com/crawlab-team/crawlab/commit/31f8e03234426e97aed9b0bce6a50562f957edad)
+- **结果量很大时无法获取结果数量**. [#260](https://github.com/crawlab-team/crawlab/issues/260)
+- **定时任务中的节点问题**. [#244](https://github.com/crawlab-team/crawlab/issues/244)
+
+
+# 0.3.1 (2019-08-25)
+### 功能 / 优化
+- **Docker 镜像优化**. 将 Docker 镜像进一步分割成 alpine 镜像版本的 master、worker、frontendSplit docker further into master, worker, frontend.
+- **单元测试**. 用单元测试覆盖部分后端代码.
+- **前端优化**. 登录页、按钮大小、上传 UI 提示. 
+- **更灵活的节点注册**. 允许用户传一个变量作为注册 key，而不是默认的 MAC 地址.
+
+### Bug 修复
+- **上传大爬虫文件错误**. 上传大爬虫文件时的内存崩溃问题. [#150](https://github.com/crawlab-team/crawlab/issues/150)
+- **无法同步爬虫**. 通过提高写权限等级来修复同步爬虫文件时的问题. [#114](https://github.com/crawlab-team/crawlab/issues/114)
+- **爬虫页问题**. 通过删除 `Site` 字段来修复. [#112](https://github.com/crawlab-team/crawlab/issues/112)
+- **节点展示问题**. 当在多个机器上跑 Docker 容器时，节点无法正确展示. [#99](https://github.com/crawlab-team/crawlab/issues/99)
+
+# 0.3.0 (2019-07-31)
+### 功能 / 优化
+- **Golang 后端**: 将后端由 Python 重构为 Golang，很大的提高了稳定性和性能.
+- **节点网络图**: 节点拓扑图可视化.
+- **节点系统信息**: 可以查看包括操作系统、CPU数量、可执行文件在内的系统信息.
+- **节点监控改进**: 节点通过 Redis 来监控和注册.
+- **文件管理**: 可以在线编辑爬虫文件，包括代码高亮.
+- **登录页/注册页/用户管理**: 要求用户登录后才能使用 Crawlab, 允许用户注册和用户管理，有一些基于角色的鉴权机制.
+- **自动部署爬虫**: 爬虫将被自动部署或同步到所有在线节点.
+- **更小的 Docker 镜像**: 瘦身版 Docker 镜像，通过多阶段构建将 Docker 镜像大小从 1.3G 减小到 700M 左右.
+
+### Bug 修复
+- **节点状态**. 节点状态不会随着节点下线而更新. [#87](https://github.com/tikazyq/crawlab/issues/87) 
+- **爬虫部署错误**. 通过自动爬虫部署来修复 [#83](https://github.com/tikazyq/crawlab/issues/83) 
+- **节点无法显示**. 节点无法显示在线 [#81](https://github.com/tikazyq/crawlab/issues/81) 
+- **定时任务无法工作**. 通过 Golang 后端修复 [#64](https://github.com/tikazyq/crawlab/issues/64) 
+- **Flower 错误**. 通过 Golang 后端修复 [#57](https://github.com/tikazyq/crawlab/issues/57) 
+
+# 0.2.4 (2019-07-07)
+### 功能 / 优化
+- **文档**: 更优和更详细的文档.
+- **更好的 Crontab**: 通过 UI 界面生成 Cron 表达式.
+- **更优的性能**: 从原生 flask 引擎 切换到 `gunicorn`. [#78](https://github.com/tikazyq/crawlab/issues/78)
+
+### Bug 修复
+- **删除爬虫**. 删除爬虫时不止在数据库中删除，还应该删除相关的文件夹、任务和定时任务. [#69](https://github.com/tikazyq/crawlab/issues/69)
+- **MongoDB 授权**. 允许用户注明 `authenticationDatabase` 来连接 `mongodb`. [#68](https://github.com/tikazyq/crawlab/issues/68)
+- **Windows 兼容性**. 加入 `eventlet` 到 `requirements.txt`. [#59](https://github.com/tikazyq/crawlab/issues/59)
+
+
+# 0.2.3 (2019-06-12)
+### 功能 / 优化
+- **Docker**: 用户能够运行 Docker 镜像来加快部署.
+- **CLI**: 允许用户通过命令行来执行 Crawlab 程序.
+- **上传爬虫**: 允许用户上传自定义爬虫到 Crawlab.
+- **预览时编辑字段**: 允许用户在可配置爬虫中预览数据时编辑字段.
+
+### Bug 修复
+- **爬虫分页**. 爬虫列表页中修复分页问题.
+
+# 0.2.2 (2019-05-30)
+### 功能 / 优化
+- **自动抓取字段**: 在可配置爬虫列表页种自动抓取字段.
+- **下载结果**: 允许下载结果为 CSV 文件.
+- **百度统计**: 允许用户选择是否允许向百度统计发送统计数据.
+
+### Bug 修复
+- **结果页分页**. [#45](https://github.com/tikazyq/crawlab/issues/45)
+- **定时任务重复触发**: 将 Flask DEBUG 设置为 False 来保证定时任务无法重复触发. [#32](https://github.com/tikazyq/crawlab/issues/32)
+- **前端环境**: 添加 `VUE_APP_BASE_URL` 作为生产环境模式变量，然后 API 不会永远都是 `localhost` [#30](https://github.com/tikazyq/crawlab/issues/30)
+
+# 0.2.1 (2019-05-27)
+- **可配置爬虫**: 允许用户创建爬虫来抓取数据，而不用编写代码.
+
+# 0.2 (2019-05-10)
+
+- **高级数据统计**: 爬虫详情页的高级数据统计.
+- **网站数据**: 加入网站列表（中国），允许用户查看 robots.txt、首页响应时间等信息.
+
+# 0.1.1 (2019-04-23)
+
+- **基础统计**: 用户可以查看基础统计数据，包括爬虫和任务页中的失败任务数、结果数.
+- **近实时任务信息**: 周期性（5 秒）向服务器轮训数据来实现近实时查看任务信息.
+- **定时任务**: 利用 apscheduler 实现定时任务，允许用户设置类似 Cron 的定时任务.
+
+# 0.1 (2019-04-17)
+
+- **首次发布**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81ea730d..89cd826d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,18 @@
-# 0.4.3 (unknown)
+# 0.4.3 (2020-01-07)
 
 ### Features / Enhancement
 - **Dependency Installation**. Allow users to install/uninstall dependencies and add programming languages (Node.js only for now) on the platform web interface.
 - **Pre-install Programming Languages in Docker**. Allow Docker users to set `CRAWLAB_SERVER_LANG_NODE` as `Y` to pre-install `Node.js` environments.
 - **Add Schedule List in Spider Detail Page**. Allow users to view / add / edit schedule cron jobs in the spider detail page. [#360](https://github.com/crawlab-team/crawlab/issues/360)
+- **Align Cron Expression with Linux**. Change the expression of 6 elements to 5 elements as aligned in Linux.
+- **Enable/Disable Schedule Cron**. Allow users to enable/disable the schedule jobs. [#297](https://github.com/crawlab-team/crawlab/issues/297)
+- **Better Task Management**. Allow users to batch delete tasks. [#341](https://github.com/crawlab-team/crawlab/issues/341)
+- **Better Spider Management**. Allow users to sort and filter spiders in the spider list page.
 
+### Bug Fixes
+- **Schedule Cron Task Issue**. [#423](https://github.com/crawlab-team/crawlab/issues/423)
+- **Upload Spider Zip File Issue**. [#403](https://github.com/crawlab-team/crawlab/issues/403) [#407](https://github.com/crawlab-team/crawlab/issues/407)
+- **Exit due to Network Failure**. [#340](https://github.com/crawlab-team/crawlab/issues/340)
 
 # 0.4.2 (2019-12-26)
 ### Features / Enhancement
diff --git a/README-zh.md b/README-zh.md
index 5b9acf29..828209e9 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -10,7 +10,7 @@
 
 中文 | [English](https://github.com/crawlab-team/crawlab)
 
-[安装](#安装) | [运行](#运行) | [截图](#截图) | [架构](#架构) | [集成](#与其他框架的集成) | [比较](#与其他框架比较) | [相关文章](#相关文章) | [社区&赞助](#社区--赞助) | [免责声明](https://github.com/crawlab-team/crawlab/blob/master/DISCLAIMER-zh.md)
+[安装](#安装) | [运行](#运行) | [截图](#截图) | [架构](#架构) | [集成](#与其他框架的集成) | [比较](#与其他框架比较) | [相关文章](#相关文章) | [社区&赞助](#社区--赞助) | [更新日志](https://github.com/crawlab-team/crawlab/blob/master/CHANGELOG-zh.md) | [免责声明](https://github.com/crawlab-team/crawlab/blob/master/DISCLAIMER-zh.md)
 
 基于Golang的分布式爬虫管理平台，支持Python、NodeJS、Go、Java、PHP等多种编程语言以及多种爬虫框架。
 
diff --git a/README.md b/README.md
index 7b7c3d2d..a02eaeaf 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 [中文](https://github.com/crawlab-team/crawlab/blob/master/README-zh.md) | English
 
-[Installation](#installation) | [Run](#run) | [Screenshot](#screenshot) | [Architecture](#architecture) | [Integration](#integration-with-other-frameworks) | [Compare](#comparison-with-other-frameworks) | [Community & Sponsorship](#community--sponsorship) | [Disclaimer](https://github.com/crawlab-team/crawlab/blob/master/DISCLAIMER.md)
+[Installation](#installation) | [Run](#run) | [Screenshot](#screenshot) | [Architecture](#architecture) | [Integration](#integration-with-other-frameworks) | [Compare](#comparison-with-other-frameworks) | [Community & Sponsorship](#community--sponsorship) | [CHANGELOG](https://github.com/crawlab-team/crawlab/blob/master/CHANGELOG.md) | [Disclaimer](https://github.com/crawlab-team/crawlab/blob/master/DISCLAIMER.md)
 
 Golang-based distributed web crawler management platform, supporting various languages including Python, NodeJS, Go, Java, PHP and various web crawler frameworks including Scrapy, Puppeteer, Selenium.
 

From a0c0c4756ceb7e1a90d5c3e600104c50ed527297 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 16:42:52 +0800
Subject: [PATCH 24/31] updated package.json version

---
 frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 32432b8f..ffc416f1 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crawlab",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --ip=0.0.0.0 --mode=development",

From 4145cbf011890d9e313b347083c9ff09614cc22e Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 17:17:04 +0800
Subject: [PATCH 25/31] added CHANGELOG

---
 CHANGELOG-zh.md                               |  2 ++
 CHANGELOG.md                                  |  2 ++
 README-zh.md                                  | 16 ++++++++++++--
 README.md                                     | 16 ++++++++++++--
 frontend/index.html                           |  4 ++++
 frontend/package.json                         |  1 +
 frontend/public/index.html                    |  4 ++++
 frontend/src/i18n/zh.js                       |  5 ++++-
 .../src/views/layout/components/Navbar.vue    | 21 ++++++++++++++++++-
 frontend/yarn.lock                            | 12 +++++++++++
 10 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index 9a861d80..c00c4fc1 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -8,6 +8,8 @@
 - **启用/禁用定时任务**. 允许用户启用/禁用定时任务. [#297](https://github.com/crawlab-team/crawlab/issues/297)
 - **优化任务管理**. 允许用户批量删除任务. [#341](https://github.com/crawlab-team/crawlab/issues/341)
 - **优化爬虫管理**. 允许用户在爬虫列表页对爬虫进行筛选和排序.
+- **添加中文版 `CHANGELOG`**.
+- **在顶部添加 Github 加星按钮**.
 
 ### Bug 修复
 - **定时任务问题**. [#423](https://github.com/crawlab-team/crawlab/issues/423)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89cd826d..6c64fbd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 - **Enable/Disable Schedule Cron**. Allow users to enable/disable the schedule jobs. [#297](https://github.com/crawlab-team/crawlab/issues/297)
 - **Better Task Management**. Allow users to batch delete tasks. [#341](https://github.com/crawlab-team/crawlab/issues/341)
 - **Better Spider Management**. Allow users to sort and filter spiders in the spider list page.
+- **Added Chinese `CHANGELOG`**.
+- **Added Github Star Button at Nav Bar**.
 
 ### Bug Fixes
 - **Schedule Cron Task Issue**. [#423](https://github.com/crawlab-team/crawlab/issues/423)
diff --git a/README-zh.md b/README-zh.md
index 828209e9..7848db5d 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -21,7 +21,7 @@
 三种方式:
 1. [Docker](https://tikazyq.github.io/crawlab-docs/Installation/Docker.html)（推荐）
 2. [直接部署](https://tikazyq.github.io/crawlab-docs/Installation/Direct.html)（了解内核）
-3. [Kubernetes](https://mp.weixin.qq.com/s/3Q1BQATUIEE_WXcHPqhYbA)
+3. [Kubernetes](https://juejin.im/post/5e0a02d851882549884c27ad) (多节点部署)
 
 ### 要求（Docker）
 - Docker 18.03+
@@ -31,9 +31,17 @@
 ### 要求（直接部署）
 - Go 1.12+
 - Node 8.12+
-- Redis
+- Redis 5.x+
 - MongoDB 3.6+
 
+## 快速开始
+
+```bash
+git clone https://github.com/crawlab-team/crawlab
+cd crawlab
+docker-compose up -d
+```
+
 ## 运行
 
 ### Docker
@@ -123,6 +131,10 @@ Docker部署的详情，请见[相关文档](https://tikazyq.github.io/crawlab-d
 
 ![](https://raw.githubusercontent.com/tikazyq/crawlab-docs/master/images/schedule.png)
 
+#### 依赖安装
+
+![](http://static-docs.crawlab.cn/node-install-dependencies.png)
+
 ## 架构
 
 Crawlab的架构包括了一个主节点（Master Node）和多个工作节点（Worker Node），以及负责通信和数据储存的Redis和MongoDB数据库。
diff --git a/README.md b/README.md
index a02eaeaf..6677f4a2 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Golang-based distributed web crawler management platform, supporting various lan
 Two methods:
 1. [Docker](https://tikazyq.github.io/crawlab-docs/Installation/Docker.html) (Recommended)
 2. [Direct Deploy](https://tikazyq.github.io/crawlab-docs/Installation/Direct.html) (Check Internal Kernel)
-3. [Kubernetes](https://mp.weixin.qq.com/s/3Q1BQATUIEE_WXcHPqhYbA)
+3. [Kubernetes](https://juejin.im/post/5e0a02d851882549884c27ad) (Multi-Node Deployment)
 
 ### Pre-requisite (Docker)
 - Docker 18.03+
@@ -31,9 +31,17 @@ Two methods:
 ### Pre-requisite (Direct Deploy)
 - Go 1.12+
 - Node 8.12+
-- Redis
+- Redis 5.x+
 - MongoDB 3.6+
 
+## Quick Start
+
+```bash
+git clone https://github.com/crawlab-team/crawlab
+cd crawlab
+docker-compose up -d
+```
+
 ## Run
 
 ### Docker
@@ -121,6 +129,10 @@ For Docker Deployment details, please refer to [relevant documentation](https://
 
 ![](https://raw.githubusercontent.com/tikazyq/crawlab-docs/master/images/schedule.png)
 
+#### Dependency Installation
+
+![](http://static-docs.crawlab.cn/node-install-dependencies.png)
+
 ## Architecture
 
 The architecture of Crawlab is consisted of the Master Node and multiple Worker Nodes, and Redis and MongoDB databases which are mainly for nodes communication and data storage.
diff --git a/frontend/index.html b/frontend/index.html
index 2c943e7e..5066906e 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -6,6 +6,10 @@
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="/static/favicon.ico" type="image/x-icon">
+
+    <!-- Place this tag in your head or just before your close body tag. -->
+    <script async defer src="https://buttons.github.io/buttons.js"></script>
+
     <title>Crawlab</title>
 </head>
 <body>
diff --git a/frontend/package.json b/frontend/package.json
index ffc416f1..af39a971 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -35,6 +35,7 @@
     "vue-ba": "^1.2.5",
     "vue-codemirror": "^4.0.6",
     "vue-codemirror-lite": "^1.0.4",
+    "vue-github-button": "^1.1.2",
     "vue-i18n": "^8.9.0",
     "vue-router": "^3.0.1",
     "vue-virtual-scroll-list": "^1.3.9",
diff --git a/frontend/public/index.html b/frontend/public/index.html
index c703d044..ccf318fc 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -6,6 +6,10 @@
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
+
+    <!-- Place this tag in your head or just before your close body tag. -->
+    <script async defer src="https://buttons.github.io/buttons.js"></script>
+
     <title>Crawlab</title>
 </head>
 <body>
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index ecb0bd82..b15efd50 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -356,5 +356,8 @@ export default {
     add_cron: '生成Cron',
     // Cron Format: [second] [minute] [hour] [day of month] [month] [day of week]
     cron_format: 'Cron 格式: [秒] [分] [小时] [日] [月] [周]'
-  }
+  },
+
+  // 其他
+  'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧'
 }
diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue
index 52960c21..882fbfa7 100644
--- a/frontend/src/views/layout/components/Navbar.vue
+++ b/frontend/src/views/layout/components/Navbar.vue
@@ -34,6 +34,17 @@
       </a>
       <el-dropdown-menu slot="dropdown"></el-dropdown-menu>
     </el-dropdown>
+    <el-dropdown class="github right">
+      <!-- Place this tag where you want the button to render. -->
+      <github-button
+        href="https://github.com/crawlab-team/crawlab"
+        data-color-scheme="no-preference: light; light: light; dark: dark;"
+        data-size="large"
+        data-show-count="true"
+        :aria-label="$t('Star crawlab-team/crawlab on GitHub')">
+        Star
+      </github-button>
+    </el-dropdown>
   </div>
 </template>
 
@@ -41,11 +52,13 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
+import GithubButton from 'vue-github-button'
 
 export default {
   components: {
     Breadcrumb,
-    Hamburger
+    Hamburger,
+    GithubButton
   },
   computed: {
     ...mapGetters([
@@ -122,6 +135,12 @@ export default {
       }
     }
 
+    .github {
+      height: 50px;
+      margin-right: 35px;
+      margin-top: -10px;
+    }
+
     .right {
       float: right
     }
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 3e7bb8a3..b885732c 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -3932,6 +3932,11 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+github-buttons@^2.3.0:
+  version "2.6.0"
+  resolved "https://registry.npm.taobao.org/github-buttons/download/github-buttons-2.6.0.tgz#fa3e031451cee7ba05c3254fa67c73fe783104dc"
+  integrity sha1-+j4DFFHO57oFwyVPpnxz/ngxBNw=
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "http://registry.npm.taobao.org/glob-base/download/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -8587,6 +8592,13 @@ vue-eslint-parser@^5.0.0:
     esquery "^1.0.1"
     lodash "^4.17.11"
 
+vue-github-button@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/vue-github-button/download/vue-github-button-1.1.2.tgz#318518c3a31d0fbd278ebcc80fbc5f88d68836e6"
+  integrity sha1-MYUYw6MdD70njrzID7xfiNaINuY=
+  dependencies:
+    github-buttons "^2.3.0"
+
 vue-hot-reload-api@^2.3.0:
   version "2.3.2"
   resolved "http://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.2.tgz#1fcc1495effe08a790909b46bf7b5c4cfeb6f21b"

From bc616cdb18f582b7eecf6a1cf801ce97edbb9b9f Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 21:12:41 +0800
Subject: [PATCH 26/31] updated README

---
 README-zh.md | 4 ++--
 README.md    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 7848db5d..691bda88 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -19,8 +19,8 @@
 ## 安装
 
 三种方式:
-1. [Docker](https://tikazyq.github.io/crawlab-docs/Installation/Docker.html)（推荐）
-2. [直接部署](https://tikazyq.github.io/crawlab-docs/Installation/Direct.html)（了解内核）
+1. [Docker](http://docs.crawlab.cn/Installation/Docker.html)（推荐）
+2. [直接部署](http://docs.crawlab.cn/Installation/Direct.html)（了解内核）
 3. [Kubernetes](https://juejin.im/post/5e0a02d851882549884c27ad) (多节点部署)
 
 ### 要求（Docker）
diff --git a/README.md b/README.md
index 6677f4a2..2b07ef1c 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,8 @@ Golang-based distributed web crawler management platform, supporting various lan
 ## Installation
 
 Two methods:
-1. [Docker](https://tikazyq.github.io/crawlab-docs/Installation/Docker.html) (Recommended)
-2. [Direct Deploy](https://tikazyq.github.io/crawlab-docs/Installation/Direct.html) (Check Internal Kernel)
+1. [Docker](http://docs.crawlab.cn/Installation/Docker.html) (Recommended)
+2. [Direct Deploy](http://docs.crawlab.cn/Installation/Direct.html) (Check Internal Kernel)
 3. [Kubernetes](https://juejin.im/post/5e0a02d851882549884c27ad) (Multi-Node Deployment)
 
 ### Pre-requisite (Docker)

From fab288034dcf6729f4eeb4e574d1f40228cef084 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 21:33:18 +0800
Subject: [PATCH 27/31] updated badges

---
 README-zh.md | 15 ++++++++-------
 README.md    | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 691bda88..f2d482c2 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -1,12 +1,13 @@
 # Crawlab
 
-![](http://114.67.75.98:8082/buildStatus/icon?job=crawlab%2Fmaster)
-![](https://img.shields.io/github/release/crawlab-team/crawlab.svg)
-![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab.svg)
-![](https://img.shields.io/github/contributors/crawlab-team/crawlab.svg)
-![](https://img.shields.io/docker/pulls/tikazyq/crawlab)
-![](https://img.shields.io/github/license/crawlab-team/crawlab.svg)
+![](http://jenkins.crawlab.cn/buildStatus/icon?job=crawlab%2Fmaster)
+![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
+![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg?logo=github)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?logo=github&logoColor=red)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?logo=github&logoColor=cyan)
+![](https://img.shields.io/github/contributors/crawlab-team/crawlab.svg?logo=github)
+![](https://img.shields.io/docker/pulls/tikazyq/crawlab?logo=docker)
+![](https://img.shields.io/github/license/crawlab-team/crawlab.svg?logo=FreeBSD&logoColor=yellow)
 
 中文 | [English](https://github.com/crawlab-team/crawlab)
 
diff --git a/README.md b/README.md
index 2b07ef1c..aed9d828 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
 # Crawlab
 
-![](http://114.67.75.98:8082/buildStatus/icon?job=crawlab%2Fmaster)
-![](https://img.shields.io/github/release/crawlab-team/crawlab.svg)
-![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab.svg)
-![](https://img.shields.io/github/contributors/crawlab-team/crawlab.svg)
-![](https://img.shields.io/docker/pulls/tikazyq/crawlab)
-![](https://img.shields.io/github/license/crawlab-team/crawlab.svg)
+![](http://jenkins.crawlab.cn/buildStatus/icon?job=crawlab%2Fmaster)
+![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
+![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg?logo=github)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?logo=github&logoColor=red)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?logo=github&logoColor=cyan)
+![](https://img.shields.io/github/contributors/crawlab-team/crawlab.svg?logo=github)
+![](https://img.shields.io/docker/pulls/tikazyq/crawlab?logo=docker)
+![](https://img.shields.io/github/license/crawlab-team/crawlab.svg?logo=FreeBSD&logoColor=yellow)
 
 [中文](https://github.com/crawlab-team/crawlab/blob/master/README-zh.md) | English
 

From ee0fd649cf0026efbf78f9ed9c6888dad3f8bd4d Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 21:40:11 +0800
Subject: [PATCH 28/31] updated badges

---
 README-zh.md | 9 ++++-----
 README.md    | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index f2d482c2..0dddf0c3 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -2,12 +2,11 @@
 
 ![](http://jenkins.crawlab.cn/buildStatus/icon?job=crawlab%2Fmaster)
 ![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
-![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg?logo=github)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?logo=github&logoColor=red)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?logo=github&logoColor=cyan)
-![](https://img.shields.io/github/contributors/crawlab-team/crawlab.svg?logo=github)
 ![](https://img.shields.io/docker/pulls/tikazyq/crawlab?logo=docker)
-![](https://img.shields.io/github/license/crawlab-team/crawlab.svg?logo=FreeBSD&logoColor=yellow)
+![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?color=red)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?color=cyan)
+![](https://img.shields.io/github/license/crawlab-team/crawlab.svg)
 
 中文 | [English](https://github.com/crawlab-team/crawlab)
 
diff --git a/README.md b/README.md
index aed9d828..a84ea552 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,11 @@
 
 ![](http://jenkins.crawlab.cn/buildStatus/icon?job=crawlab%2Fmaster)
 ![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
-![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg?logo=github)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?logo=github&logoColor=red)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?logo=github&logoColor=cyan)
-![](https://img.shields.io/github/contributors/crawlab-team/crawlab.svg?logo=github)
 ![](https://img.shields.io/docker/pulls/tikazyq/crawlab?logo=docker)
-![](https://img.shields.io/github/license/crawlab-team/crawlab.svg?logo=FreeBSD&logoColor=yellow)
+![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?color=red)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?color=cyan)
+![](https://img.shields.io/github/license/crawlab-team/crawlab.svg)
 
 [中文](https://github.com/crawlab-team/crawlab/blob/master/README-zh.md) | English
 

From 3cfe5c8668066653bd77a82b7956006ad0444fa7 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 21:41:53 +0800
Subject: [PATCH 29/31] updated badges

---
 README-zh.md | 4 ++--
 README.md    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 0dddf0c3..12b518b5 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -4,8 +4,8 @@
 ![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
 ![](https://img.shields.io/docker/pulls/tikazyq/crawlab?logo=docker)
 ![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?color=red)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?color=cyan)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?label=bugs&color=red)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?label=enhancements&color=cyan)
 ![](https://img.shields.io/github/license/crawlab-team/crawlab.svg)
 
 中文 | [English](https://github.com/crawlab-team/crawlab)
diff --git a/README.md b/README.md
index a84ea552..236e950f 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 ![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
 ![](https://img.shields.io/docker/pulls/tikazyq/crawlab?logo=docker)
 ![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?color=red)
-![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?color=cyan)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?label=bugs&color=red)
+![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?label=enhancements&color=cyan)
 ![](https://img.shields.io/github/license/crawlab-team/crawlab.svg)
 
 [中文](https://github.com/crawlab-team/crawlab/blob/master/README-zh.md) | English

From fa4e1af1b070d2e0f47245669795717977f8f293 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 21:43:16 +0800
Subject: [PATCH 30/31] updated badges

---
 README-zh.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 12b518b5..944019e1 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -2,7 +2,7 @@
 
 ![](http://jenkins.crawlab.cn/buildStatus/icon?job=crawlab%2Fmaster)
 ![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
-![](https://img.shields.io/docker/pulls/tikazyq/crawlab?logo=docker)
+![](https://img.shields.io/docker/pulls/tikazyq/crawlab?label=pulls&logo=docker)
 ![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
 ![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?label=bugs&color=red)
 ![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?label=enhancements&color=cyan)
diff --git a/README.md b/README.md
index 236e950f..efd21cb5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![](http://jenkins.crawlab.cn/buildStatus/icon?job=crawlab%2Fmaster)
 ![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
-![](https://img.shields.io/docker/pulls/tikazyq/crawlab?logo=docker)
+![](https://img.shields.io/docker/pulls/tikazyq/crawlab?label=pulls&logo=docker)
 ![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
 ![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?label=bugs&color=red)
 ![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?label=enhancements&color=cyan)

From aed16d3edbc759d5e119bd223967580f42889d45 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 6 Jan 2020 21:49:58 +0800
Subject: [PATCH 31/31] updated badges

---
 README-zh.md | 4 ++--
 README.md    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 944019e1..9057fcc3 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -1,8 +1,8 @@
 # Crawlab
 
-![](http://jenkins.crawlab.cn/buildStatus/icon?job=crawlab%2Fmaster)
-![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
+![](https://img.shields.io/docker/cloud/build/tikazyq/crawlab.svg?label=build&logo=docker)
 ![](https://img.shields.io/docker/pulls/tikazyq/crawlab?label=pulls&logo=docker)
+![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
 ![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
 ![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?label=bugs&color=red)
 ![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?label=enhancements&color=cyan)
diff --git a/README.md b/README.md
index efd21cb5..075a80b5 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Crawlab
 
-![](http://jenkins.crawlab.cn/buildStatus/icon?job=crawlab%2Fmaster)
-![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
+![](https://img.shields.io/docker/cloud/build/tikazyq/crawlab.svg?label=build&logo=docker)
 ![](https://img.shields.io/docker/pulls/tikazyq/crawlab?label=pulls&logo=docker)
+![](https://img.shields.io/github/release/crawlab-team/crawlab.svg?logo=github)
 ![](https://img.shields.io/github/last-commit/crawlab-team/crawlab.svg)
 ![](https://img.shields.io/github/issues/crawlab-team/crawlab/bug.svg?label=bugs&color=red)
 ![](https://img.shields.io/github/issues/crawlab-team/crawlab/enhancement.svg?label=enhancements&color=cyan)