From 1f63f6fb307f665d0568b18dfc7730dfa5ff91fc Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 7 Jan 2020 12:42:01 +0800 Subject: [PATCH 1/7] fixed api url issue --- frontend/.env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.env.development b/frontend/.env.development index 80220bf8..779d28e4 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -1,2 +1,2 @@ NODE_ENV='development' -VUE_APP_BASE_URL=http://localhost:8001 +VUE_APP_BASE_URL=http://localhost:8000 From e0659809a2f85ea5ab20ce30865ddccfe8ebc013 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 7 Jan 2020 13:34:57 +0800 Subject: [PATCH 2/7] updated docker-compose.yml --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5c059f95..fcab07f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,6 @@ services: 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 From 26e69cfabb9862b07e5a9f99b2c1da7f4c227437 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 7 Jan 2020 13:39:53 +0800 Subject: [PATCH 3/7] 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 4/7] 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 5/7] 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 From 816f70b8fa915ec46ce43572f493beeb532cc3c2 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 7 Jan 2020 14:51:09 +0800 Subject: [PATCH 6/7] fixed docker build error issue --- backend/mock/schedule.go | 2 -- backend/mock/schedule_test.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/backend/mock/schedule.go b/backend/mock/schedule.go index 57d757e7..015236f8 100644 --- a/backend/mock/schedule.go +++ b/backend/mock/schedule.go @@ -23,7 +23,6 @@ var scheduleList = []model.Schedule{ EntryId: 10, // 前端展示 SpiderName: "test scedule", - NodeName: "测试节点", CreateTs: time.Now(), UpdateTs: time.Now(), @@ -37,7 +36,6 @@ var scheduleList = []model.Schedule{ EntryId: 10, // 前端展示 SpiderName: "test scedule2", - NodeName: "测试节点", CreateTs: time.Now(), UpdateTs: time.Now(), diff --git a/backend/mock/schedule_test.go b/backend/mock/schedule_test.go index 2c5c2701..87f1131a 100644 --- a/backend/mock/schedule_test.go +++ b/backend/mock/schedule_test.go @@ -80,7 +80,6 @@ func TestPostSchedule(t *testing.T) { EntryId: 10, // 前端展示 SpiderName: "test scedule", - NodeName: "测试节点", CreateTs: time.Now(), UpdateTs: time.Now(), @@ -117,7 +116,6 @@ func TestPutSchedule(t *testing.T) { EntryId: 10, // 前端展示 SpiderName: "test scedule", - NodeName: "测试节点", CreateTs: time.Now(), UpdateTs: time.Now(), From 82199129a1c7e20c7969efcc7e1bddad447a7b7d Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 7 Jan 2020 15:30:20 +0800 Subject: [PATCH 7/7] fixed docker build error --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 73883c64..100f5ac6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ WORKDIR /app # install frontend RUN npm config set unsafe-perm true -RUN npm install -g yarn && yarn install --registry=https://registry.npm.taobao.org # --sass_binary_site=https://npm.taobao.org/mirrors/node-sass/ +RUN npm install -g yarn && yarn install RUN npm run build:prod @@ -37,7 +37,7 @@ RUN apt-get update \ && ln -s /usr/bin/python3 /usr/local/bin/python # install backend -RUN pip install scrapy pymongo bs4 requests -i https://pypi.tuna.tsinghua.edu.cn/simple +RUN pip install scrapy pymongo bs4 requests # copy backend files COPY --from=backend-build /go/bin/crawlab /usr/local/bin