From 6b2d51fb1ef16da6fb9cdd5094eed87ccbbdea04 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 20 Mar 2020 08:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=88=AC=E8=99=AB=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/routes/config_spider.go | 17 +++++++++++++++++
 backend/routes/spider.go        |  5 +++++
 2 files changed, 22 insertions(+)

diff --git a/backend/routes/config_spider.go b/backend/routes/config_spider.go
index ac6a11e0..4c65964e 100644
--- a/backend/routes/config_spider.go
+++ b/backend/routes/config_spider.go
@@ -51,6 +51,9 @@ func PutConfigSpider(c *gin.Context) {
 	// 将FileId置空
 	spider.FileId = bson.ObjectIdHex(constants.ObjectIdNull)
 
+	// UserId
+	spider.UserId = services.GetCurrentUserId(c)
+
 	// 创建爬虫目录
 	spiderDir := filepath.Join(viper.GetString("spider.path"), spider.Name)
 	if utils.Exists(spiderDir) {
@@ -109,8 +112,12 @@ func UploadConfigSpider(c *gin.Context) {
 	spider, err := model.GetSpider(bson.ObjectIdHex(id))
 	if err != nil {
 		HandleErrorF(http.StatusBadRequest, c, fmt.Sprintf("cannot find spider (id: %s)", id))
+		return
 	}
 
+	// UserId
+	spider.UserId = services.GetCurrentUserId(c)
+
 	// 获取上传文件
 	file, header, err := c.Request.FormFile("file")
 	if err != nil {
@@ -205,6 +212,11 @@ func PostConfigSpiderSpiderfile(c *gin.Context) {
 		return
 	}
 
+	// UserId
+	if !spider.UserId.Valid() {
+		spider.UserId = bson.ObjectIdHex(constants.ObjectIdNull)
+	}
+
 	// 反序列化
 	var configData entity.ConfigSpiderData
 	if err := yaml.Unmarshal([]byte(content), &configData); err != nil {
@@ -247,6 +259,11 @@ func PostConfigSpiderConfig(c *gin.Context) {
 		return
 	}
 
+	// UserId
+	if !spider.UserId.Valid() {
+		spider.UserId = bson.ObjectIdHex(constants.ObjectIdNull)
+	}
+
 	// 反序列化配置数据
 	var configData entity.ConfigSpiderData
 	if err := c.ShouldBindJSON(&configData); err != nil {
diff --git a/backend/routes/spider.go b/backend/routes/spider.go
index b136070b..8f7a513b 100644
--- a/backend/routes/spider.go
+++ b/backend/routes/spider.go
@@ -126,6 +126,11 @@ func PostSpider(c *gin.Context) {
 		return
 	}
 
+	// UserId
+	if !item.UserId.Valid() {
+		item.UserId = bson.ObjectIdHex(constants.ObjectIdNull)
+	}
+
 	if err := model.UpdateSpider(bson.ObjectIdHex(id), item); err != nil {
 		HandleError(http.StatusInternalServerError, c, err)
 		return