From addd119edd8c1207fdfe53db59ba21d392d45aea Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 09:30:48 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BC=B9=E7=AA=97=E4=B8=AD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=88=AC=E8=99=AB=E5=85=B6=E4=BB=96=E9=A1=B9=E4=B8=8D=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/schedule/ScheduleList.vue | 25 ++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 997488b8..63a3210b 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -27,13 +27,16 @@
       :title="$t(dialogTitle)"
       :visible.sync="dialogVisible"
       width="640px"
-      :before-close="onDialogClose">
-      <el-form label-width="180px"
-               class="add-form"
-               :model="scheduleForm"
-               :inline-message="true"
-               ref="scheduleForm"
-               label-position="right">
+      :before-close="onDialogClose"
+    >
+      <el-form
+        label-width="180px"
+        class="add-form"
+        :model="scheduleForm"
+        :inline-message="true"
+        ref="scheduleForm"
+        label-position="right"
+      >
         <el-form-item :label="$t('Schedule Name')" prop="name" required>
           <el-input id="schedule-name" v-model="scheduleForm.name" :placeholder="$t('Schedule Name')"></el-input>
         </el-form-item>
@@ -62,6 +65,7 @@
             :placeholder="$t('Spider')"
             filterable
             :disabled="isDisabledSpiderSchedule"
+            @change="onSpiderChange"
           >
             <el-option
               v-for="op in spiderList"
@@ -562,6 +566,13 @@ export default {
     onParametersConfirm (value) {
       this.scheduleForm.param = value
       this.isParametersVisible = false
+    },
+    async onSpiderChange (spiderId) {
+      await this.$store.dispatch('spider/getSpiderData', spiderId)
+      if (this.spiderForm.type === 'customized' && this.spiderForm.is_scrapy) {
+        this.$set(this.scheduleForm, 'scrapy_spider', this.spiderForm.spider_names[0])
+        this.$set(this.scheduleForm, 'scrapy_log_level', 'INFO')
+      }
     }
   },
   created () {

From fe1eacb6a27d867dccd711965ed46d324556aa17 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 09:32:12 +0800
Subject: [PATCH 2/8] updated CHANGELOG

---
 CHANGELOG-zh.md | 1 +
 CHANGELOG.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index 7c1cbdd8..bf091de3 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -9,6 +9,7 @@
 - **复制爬虫**. 允许用户复制已存在爬虫来创建新爬虫.
 
 ### Bug 修复
+- **定时任务爬虫选择问题**. 字段不会随着爬虫变化而响应.
 
 # 0.4.6 (2020-02-13)
 ### 功能 / 优化
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd2fc69c..4a044da4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - **Copy Spiders**. Allow users to copy an existing spider to create a new one.
 
 ### Bug Fixes
+- **Schedule Spider Selection Issue**. Fields not responding to spider change.
 
 # 0.4.6 (2020-02-13)
 ### Features / Enhancement

From a094d93d9576e8a6c3a8fd344b870617856af300 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 09:38:54 +0800
Subject: [PATCH 3/8] updated CHANGELOG

---
 CHANGELOG-zh.md | 1 +
 CHANGELOG.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index bf091de3..03eaffe6 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -10,6 +10,7 @@
 
 ### Bug 修复
 - **定时任务爬虫选择问题**. 字段不会随着爬虫变化而响应.
+- **定时任务冲突问题**. 两个不同的爬虫设置定时任务，时间设置成相同的话，可能会有bug. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
 
 # 0.4.6 (2020-02-13)
 ### 功能 / 优化
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a044da4..142f3c72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - **Upgrade Check**. Check latest version and notifiy users to upgrade.
 - **Spiders Batch Operation**. Allow users to run/stop spider tasks and delete spiders in batches.
 - **Copy Spiders**. Allow users to copy an existing spider to create a new one.
+- **Cron Jobs Conflict**. Possible bug when two spiders set to the same time of their cron jobs. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
 
 ### Bug Fixes
 - **Schedule Spider Selection Issue**. Fields not responding to spider change.

From a24eeab68d02f1931b6786d1191d28b8096ed438 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 09:48:23 +0800
Subject: [PATCH 4/8] fixed https://github.com/crawlab-team/crawlab/issues/577

---
 backend/services/task.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/services/task.go b/backend/services/task.go
index 3bcdc8d6..f9bab5ce 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -313,13 +313,13 @@ func MakeLogDir(t model.Task) (fileDir string, err error) {
 }
 
 // 获取日志文件路径
-func GetLogFilePaths(fileDir string) (filePath string) {
+func GetLogFilePaths(fileDir string, t model.Task) (filePath string) {
 	// 时间戳
 	ts := time.Now()
 	tsStr := ts.Format("20060102150405")
 
 	// stdout日志文件
-	filePath = filepath.Join(fileDir, tsStr+".log")
+	filePath = filepath.Join(fileDir, t.Id+"_"+tsStr+".log")
 
 	return filePath
 }
@@ -419,7 +419,7 @@ func ExecuteTask(id int) {
 		return
 	}
 	// 获取日志文件路径
-	t.LogPath = GetLogFilePaths(fileDir)
+	t.LogPath = GetLogFilePaths(fileDir, t)
 
 	// 工作目录
 	cwd := filepath.Join(
@@ -571,7 +571,7 @@ func GetTaskLog(id string) (logStr string, err error) {
 				log.Errorf(err.Error())
 			}
 
-			fileP := GetLogFilePaths(fileDir)
+			fileP := GetLogFilePaths(fileDir, task)
 
 			// 获取日志文件路径
 			fLog, err := os.Create(fileP)

From 6b5c47aaf94a39e4ce27c007269686c2a200916d Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 09:50:55 +0800
Subject: [PATCH 5/8] updated CHANGELOG

---
 CHANGELOG-zh.md | 1 +
 CHANGELOG.md    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index 03eaffe6..a79b3eec 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -11,6 +11,7 @@
 ### Bug 修复
 - **定时任务爬虫选择问题**. 字段不会随着爬虫变化而响应.
 - **定时任务冲突问题**. 两个不同的爬虫设置定时任务，时间设置成相同的话，可能会有bug. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
+- **任务日志问题**. 在同一时间触发的不同任务可能会写入同一个日志文件. [#577](https://github.com/crawlab-team/crawlab/issues/577)
 
 # 0.4.6 (2020-02-13)
 ### 功能 / 优化
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 142f3c72..3502cdf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,11 @@
 - **Upgrade Check**. Check latest version and notifiy users to upgrade.
 - **Spiders Batch Operation**. Allow users to run/stop spider tasks and delete spiders in batches.
 - **Copy Spiders**. Allow users to copy an existing spider to create a new one.
-- **Cron Jobs Conflict**. Possible bug when two spiders set to the same time of their cron jobs. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
 
 ### Bug Fixes
 - **Schedule Spider Selection Issue**. Fields not responding to spider change.
+- **Cron Jobs Conflict**. Possible bug when two spiders set to the same time of their cron jobs. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
+- **Task Log Issue**. Different tasks write to the same log file if triggered at the same time. [#577](https://github.com/crawlab-team/crawlab/issues/577)
 
 # 0.4.6 (2020-02-13)
 ### Features / Enhancement

From b5bef9fda0361045e3d918bc339b647bc9066ffc Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 11:02:41 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AECron?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Cron/index.vue       | 32 +++++++--
 frontend/src/i18n/zh.js                      |  2 +
 frontend/src/views/schedule/ScheduleList.vue | 71 ++++++++++++++------
 3 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/Cron/index.vue b/frontend/src/components/Cron/index.vue
index 642a2092..341a364d 100644
--- a/frontend/src/components/Cron/index.vue
+++ b/frontend/src/components/Cron/index.vue
@@ -6,6 +6,10 @@
       z-index: 1;
     }
 
+    .cron-wrapper {
+      margin-bottom: 10px;
+    }
+
     .el-tabs {
       box-shadow: none;
     }
@@ -41,7 +45,14 @@
 </style>
 <template>
   <div id="change-crontab">
-    <!--        <el-button class="language" type="text" @click="i18n=(i18n==='en'?'cn':'en')">{{i18n}}</el-button>-->
+    <div class="cron-wrapper">
+      <label>
+        {{$t('Cron Expression')}}:
+      </label>
+      <el-tag type="success" size="small">
+        {{cron}}
+      </el-tag>
+    </div>
     <el-tabs type="border-card">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-date"></i> {{text.Minutes.name}}</span>
@@ -388,9 +399,6 @@ export default {
     }
   },
   methods: {
-    getValue () {
-      return this.cron
-    },
     change () {
       this.$emit('change', this.cron)
       this.close()
@@ -398,6 +406,22 @@ export default {
     close () {
       this.$emit('close')
     },
+    submit () {
+      if (!this.validate()) {
+        this.$message.error(this.$t('Cron expression is invalid'))
+        return false
+      }
+      this.$emit('submit', this.cron)
+      return true
+    },
+    validate () {
+      if (!this.minutesText) return false
+      if (!this.hoursText) return false
+      if (!this.daysText) return false
+      if (!this.monthsText) return false
+      if (!this.weeksText) return false
+      return true
+    },
     updateCronItem (key, value) {
       if (value === undefined) {
         this[key].cronEvery = '0'
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index ea8f7dbb..2d75b1f3 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -289,6 +289,8 @@ export default {
   '[minute] [hour] [day] [month] [day of week]': '[分] [时] [天] [月] [星期几]',
   'Enable/Disable': '启用/禁用',
   'Cron': 'Cron',
+  'Cron Expression': 'Cron 表达式',
+  'Cron expression is invalid': 'Cron 表达式不正确',
 
   // 网站
   'Site': '网站',
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 63a3210b..7308311c 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -115,21 +115,23 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('Cron')" prop="cron" required>
-          <el-popover v-model="isShowCron" trigger="focus">
-            <template>
-              <vue-cron-linux :data="scheduleForm.cron" :i18n="lang" @change="onCronChange"/>
-            </template>
-            <template slot="reference">
-              <el-input
-                id="cron"
-                ref="cron"
-                v-model="scheduleForm.cron"
-                :placeholder="`${$t('[minute] [hour] [day] [month] [day of week]')}`"
-              >
-              </el-input>
-            </template>
-          </el-popover>
-          <!--<el-button size="small" style="width:100px" type="primary" @click="onShowCronDialog">{{$t('schedules.add_cron')}}</el-button>-->
+          <el-input
+            class="cron"
+            ref="cron"
+            v-model="scheduleForm.cron"
+            :placeholder="`${$t('[minute] [hour] [day] [month] [day of week]')}`"
+            style="width: calc(100% - 100px)"
+          >
+          </el-input>
+          <el-button
+            class="cron-edit"
+            type="primary"
+            icon="el-icon-edit"
+            style="width: 100px"
+            @click="onShowCronDialog"
+          >
+            {{$t('Edit')}}
+          </el-button>
         </el-form-item>
         <el-form-item :label="$t('Execute Command')" prop="cmd">
           <el-input
@@ -161,9 +163,14 @@
     </el-dialog>
 
     <!--cron generation popup-->
-    <!--<el-dialog title="生成 Cron" :visible.sync="showCron">-->
-    <!--<vcrontab @hide="showCron=false" @fill="onCrontabFill" :expression="expression"></vcrontab>-->
-    <!--</el-dialog>-->
+    <el-dialog title="生成 Cron" :visible.sync="cronDialogVisible">
+      <vue-cron-linux ref="vue-cron-linux" :data="scheduleForm.cron" :i18n="lang" @submit="onCronChange"/>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="cronDialogVisible = false">{{$t('Cancel')}}</el-button>
+        <el-button size="small" type="primary" @click="onCronDialogSubmit">{{$t('Confirm')}}</el-button>
+      </span>
+    </el-dialog>
+    <!--./cron generation popup-->
 
     <el-card style="border-radius: 0" class="schedule-list">
       <!--filter-->
@@ -290,7 +297,7 @@ export default {
       isEdit: false,
       dialogTitle: '',
       dialogVisible: false,
-      showCron: false,
+      cronDialogVisible: false,
       expression: '',
       spiderList: [],
       nodeList: [],
@@ -560,6 +567,12 @@ export default {
       this.$set(this.scheduleForm, 'cron', value)
       this.$st.sendEv('定时任务', '配置Cron')
     },
+    onCronDialogSubmit () {
+      const valid = this.$refs['vue-cron-linux'].submit()
+      if (valid) {
+        this.cronDialogVisible = false
+      }
+    },
     onOpenParameters () {
       this.isParametersVisible = true
     },
@@ -573,6 +586,10 @@ export default {
         this.$set(this.scheduleForm, 'scrapy_spider', this.spiderForm.spider_names[0])
         this.$set(this.scheduleForm, 'scrapy_log_level', 'INFO')
       }
+    },
+    onShowCronDialog () {
+      this.cronDialogVisible = true
+      this.$st.sendEv('定时任务', '点击编辑Cron')
     }
   },
   created () {
@@ -637,4 +654,20 @@ export default {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
   }
+
+  .cron {
+    width: calc(100% - 100px);
+  }
+
+  .cron >>> .el-input__inner {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-right: none;
+  }
+
+  .cron-edit {
+    width: 100px;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
 </style>

From 4f704cd8c9220ce89978734524d2bd1707c1c30b Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 11:24:26 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=BE=AE=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                       |  1 +
 .../src/views/layout/components/Navbar.vue    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 2d75b1f3..e275afd0 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -409,6 +409,7 @@ export default {
   'Release Note': '发布记录',
   'How to Upgrade': '升级方式',
   'Release': '发布',
+  'Add Wechat to join discussion group': '添加微信 tikazyq1 加入交流群',
 
   // 登录
   'Sign in': '登录',
diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue
index 5e380e1b..7dfa804f 100644
--- a/frontend/src/views/layout/components/Navbar.vue
+++ b/frontend/src/views/layout/components/Navbar.vue
@@ -61,6 +61,20 @@
         <span style="margin-left: 5px;">{{$t('Upgrade')}}</span>
       </el-badge>
     </div>
+    <el-popover
+      class="wechat right"
+      trigger="click"
+    >
+      <div style="margin-bottom: 5px">
+        <label>{{$t('Add Wechat to join discussion group')}}</label>
+      </div>
+      <div>
+        <img class="wechat-img" src="http://static-docs.crawlab.cn/wechat.jpg">
+      </div>
+      <div slot="reference">
+        <i class="fa fa-wechat"></i>
+      </div>
+    </el-popover>
     <div class="github right">
       <!-- Place this tag where you want the button to render. -->
       <github-button
@@ -277,6 +291,12 @@ docker-compose up -d
       }
     }
 
+    .wechat {
+      color: #606266;
+      margin-right: 35px;
+      cursor: pointer;
+    }
+
     .right {
       float: right
     }
@@ -287,3 +307,8 @@ docker-compose up -d
     padding-top: 0;
   }
 </style>
+<style>
+  .wechat-img {
+    width: 240px;
+  }
+</style>

From d231357445cee8721f49f971784dda5c55f096ee Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 24 Feb 2020 11:25:16 +0800
Subject: [PATCH 8/8] updated CHANGELOG

---
 CHANGELOG-zh.md | 1 +
 CHANGELOG.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index a79b3eec..c963f207 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -7,6 +7,7 @@
 - **版本升级检测**. 检测最新版本，通知用户升级.
 - **批量操作爬虫**. 允许用户批量运行/停止爬虫任务，以及批量删除爬虫.
 - **复制爬虫**. 允许用户复制已存在爬虫来创建新爬虫.
+- **微信群二维码**.
 
 ### Bug 修复
 - **定时任务爬虫选择问题**. 字段不会随着爬虫变化而响应.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3502cdf9..1d4bb06b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - **Upgrade Check**. Check latest version and notifiy users to upgrade.
 - **Spiders Batch Operation**. Allow users to run/stop spider tasks and delete spiders in batches.
 - **Copy Spiders**. Allow users to copy an existing spider to create a new one.
+- **Wechat Group QR Code**.
 
 ### Bug Fixes
 - **Schedule Spider Selection Issue**. Fields not responding to spider change.