Merge pull request #525 from crawlab-team/develop

Develop

backend/model/spider.go

@@ -78,6 +78,10 @@ func (spider *Spider) Add() error {
 	spider.CreateTs = time.Now()
 	spider.UpdateTs = time.Now()
 
+	if !spider.ProjectId.Valid() {
+		spider.ProjectId = bson.ObjectIdHex(constants.ObjectIdNull)
+	}
+
 	if err := c.Insert(&spider); err != nil {
 		return err
 	}

backend/routes/spider.go

@@ -295,7 +295,12 @@ func UploadSpider(c *gin.Context) {
 		if cmd != "" {
 			spider.Cmd = cmd
 		}
-		_ = spider.Add()
+		if err := spider.Add(); err != nil {
+			log.Error("add spider error: " + err.Error())
+			debug.PrintStack()
+			HandleError(http.StatusInternalServerError, c, err)
+			return
+		}
 	} else {
 		if name != "" {
 			spider.Name = name
@@ -311,7 +316,12 @@ func UploadSpider(c *gin.Context) {
 		}
 		// 更新file_id
 		spider.FileId = fid
-		_ = spider.Save()
+		if err := spider.Add(); err != nil {
+			log.Error("add spider error: " + err.Error())
+			debug.PrintStack()
+			HandleError(http.StatusInternalServerError, c, err)
+			return
+		}
 	}
 
 	// 发起同步

backend/template/spiders/sinastock/sinastock/spiders/sinastock_spider.py

@@ -11,12 +11,6 @@ from sinastock.items import NewsItem
 class SinastockSpiderSpider(scrapy.Spider):
     name = 'sinastock_spider'
     allowed_domains = ['finance.sina.com.cn']
-    mongo = MongoClient(
-        host=os.environ.get('MONGO_HOST') or 'localhost',
-        port=int(os.environ.get('MONGO_PORT') or 27017)
-    )
-    db = mongo[os.environ.get('MONGO_DB') or 'crawlab_test']
-    col = db.get_collection(os.environ.get('CRAWLAB_COLLECTION') or 'stock_news')
 
     def start_requests(self):
         col = self.db['stocks']

frontend/src/i18n/zh.js

@@ -496,8 +496,8 @@ docker run -d --restart always --name crawlab_worker \\
   'The parameters which will be passed into the spider program.': '将被传入爬虫程序里的参数',
   'The description for the schedule': '定时任务的描述',
   'Once you have filled all fields, click this button to submit.': '当您填完所有字段，请点击这个按钮来提交定时任务',
-  'Here you can set your password.': '这里您可以设置您的密码',
-  'In this tab you can configure your notification settings.': '在这个标签中，您可以配置您的消息通知配置',
+  'Here you can set your general settings.': '这里您可以设置您的通用设置',
+  'In this tab you can configure your notification settings.': '在这个标签中，您可以<br>配置您的消息通知配置',
   'Here you can add/edit/delete global environment variables which will be passed into your spider programs.': '这里您可以添加/修改/删除全局环境变量，它们会被传入爬虫程序中',
   'You are running on a mobile device, which is not optimized yet. Please try with a laptop or desktop.': '您正在没有优化过的移动端上浏览，我们建议您用电脑来访问',
 

frontend/src/views/setting/Setting.vue

@@ -300,8 +300,8 @@ export default {
   },
   mounted () {
     if (!this.$utils.tour.isFinishedTour('setting')) {
-      // this.$tours['setting'].start()
-      // this.$st.sendEv('教程', '开始', 'setting')
+      this.$tours['setting'].start()
+      this.$st.sendEv('教程', '开始', 'setting')
     }
   }
 }