From 6d5d4080319e217fea98b44b0461313586c576e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com> Date: Tue, 7 Jan 2020 04:01:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E8=BF=90=E8=A1=8C=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/services/schedule.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/services/schedule.go b/backend/services/schedule.go index d737c3ac..769079e5 100644 --- a/backend/services/schedule.go +++ b/backend/services/schedule.go @@ -75,12 +75,12 @@ func AddScheduleTask(s model.Schedule) func() { if err := AddTask(t); err != nil { return } - - if err := AssignTask(t); err != nil { - log.Errorf(err.Error()) - debug.PrintStack() - return - } + // AddTask 方法已执行AssignTask + //if err := AssignTask(t); err != nil { + // log.Errorf(err.Error()) + // debug.PrintStack() + // return + //} } } else { return From 7853a34dbbe4ca7cc792e55f3a08889467c41a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com> Date: Tue, 7 Jan 2020 04:01:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=94=99=E8=AF=AF=E7=9A=84=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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue index 215d8122..69843a85 100644 --- a/frontend/src/views/schedule/ScheduleList.vue +++ b/frontend/src/views/schedule/ScheduleList.vue @@ -117,7 +117,7 @@ - + From b301b00778f6369b9f955a459139cb4bb0541b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com> Date: Tue, 7 Jan 2020 04:36:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix=20=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/layout/components/TagsView.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/layout/components/TagsView.vue b/frontend/src/views/layout/components/TagsView.vue index 231b44f0..b72d874a 100644 --- a/frontend/src/views/layout/components/TagsView.vue +++ b/frontend/src/views/layout/components/TagsView.vue @@ -130,9 +130,10 @@ export default { refreshSelectedTag (view) { this.$store.dispatch('delCachedView', view).then(() => { const { fullPath } = view + console.log('fullPath', fullPath) this.$nextTick(() => { this.$router.replace({ - path: '/redirect' + fullPath + path: fullPath }) }) }) From 26e69cfabb9862b07e5a9f99b2c1da7f4c227437 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 7 Jan 2020 13:39:53 +0800 Subject: [PATCH 4/6] fixed github star placeholder color --- frontend/src/views/layout/components/Navbar.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue index f47380c8..10c98427 100644 --- a/frontend/src/views/layout/components/Navbar.vue +++ b/frontend/src/views/layout/components/Navbar.vue @@ -40,7 +40,9 @@ 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')"> + :aria-label="$t('Star crawlab-team/crawlab on GitHub')" + style="color: white" + > Star From edece9a768e0e39f87898ee4c9df7ac46f3bd867 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 7 Jan 2020 13:54:24 +0800 Subject: [PATCH 5/6] fixed duplicated AssignTask method --- backend/services/schedule.go | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/backend/services/schedule.go b/backend/services/schedule.go index 769079e5..c321c393 100644 --- a/backend/services/schedule.go +++ b/backend/services/schedule.go @@ -39,11 +39,6 @@ func AddScheduleTask(s model.Schedule) func() { if err := AddTask(t); err != nil { return } - if err := AssignTask(t); err != nil { - log.Errorf(err.Error()) - debug.PrintStack() - return - } } } else if s.RunType == constants.RunTypeRandom { // 随机 @@ -57,11 +52,6 @@ func AddScheduleTask(s model.Schedule) func() { debug.PrintStack() return } - if err := AssignTask(t); err != nil { - log.Errorf(err.Error()) - debug.PrintStack() - return - } } else if s.RunType == constants.RunTypeSelectedNodes { // 指定节点 for _, nodeId := range s.NodeIds { @@ -75,33 +65,10 @@ func AddScheduleTask(s model.Schedule) func() { if err := AddTask(t); err != nil { return } - // AddTask 方法已执行AssignTask - //if err := AssignTask(t); err != nil { - // log.Errorf(err.Error()) - // debug.PrintStack() - // return - //} } } else { return } - - //node, err := model.GetNodeByKey(s.NodeKey) - //if err != nil || node.Id.Hex() == "" { - // log.Errorf("get node by key error: %s", err.Error()) - // debug.PrintStack() - // return - //} - // - //spider := model.GetSpiderByName(s.SpiderName) - //if spider == nil || spider.Id.Hex() == "" { - // log.Errorf("get spider by name error: %s", err.Error()) - // debug.PrintStack() - // return - //} - // - //// 同步ID到定时任务 - //s.SyncNodeIdAndSpiderId(node, *spider) } } From 27156b4d405227324aac066a7ba20f261bc7cdeb Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 7 Jan 2020 13:54:54 +0800 Subject: [PATCH 6/6] updated CHANGELOG --- CHANGELOG-zh.md | 3 +++ CHANGELOG.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md index c00c4fc1..85c964d4 100644 --- a/CHANGELOG-zh.md +++ b/CHANGELOG-zh.md @@ -15,6 +15,9 @@ - **定时任务问题**. [#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) ### 功能 / 优化 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c64fbd8..ebfed440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,9 @@ - **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) +- **Cron Jobs not Running Correctly** +- **Schedule List Columns Mis-positioned** +- **Clicking Refresh Button Redirected to 404 Page** # 0.4.2 (2019-12-26) ### Features / Enhancement