From 91e084a6a397f2fb7712ca937d22186ab3344c2a Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 20 Jul 2020 21:52:32 +0800 Subject: [PATCH 01/31] fixed https://github.com/crawlab-team/crawlab/issues/808 --- backend/services/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/services/repo.go b/backend/services/repo.go index 9acc8387..a2afb8cd 100644 --- a/backend/services/repo.go +++ b/backend/services/repo.go @@ -58,7 +58,7 @@ func DownloadRepo(fullName string, userId bson.ObjectId) (err error) { spider := model.GetSpiderByName(spiderName) if spider.Name == "" { // 新增 - spider := model.Spider{ + spider = model.Spider{ Id: bson.NewObjectId(), Name: spiderName, DisplayName: spiderName, From 3f42f42ff21542a27ea5c49fa8beb463a66ca7a8 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 21 Jul 2020 17:00:34 +0800 Subject: [PATCH 02/31] updated CHANGELOG --- CHANGELOG-zh.md | 6 ++++++ CHANGELOG.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md index 65276eb3..c5baf739 100644 --- a/CHANGELOG-zh.md +++ b/CHANGELOG-zh.md @@ -1,3 +1,9 @@ +# 0.5.1 (TBC) +### 功能 / 优化 + +### Bug 修复 +- **修复在爬虫市场中第一次下载爬虫时会报500错误**. [#808](https://github.com/crawlab-team/crawlab/issues/808) + # 0.5.0 (2020-07-19) ### 功能 / 优化 - **爬虫市场**. 允许用户下载开源爬虫到 Crawlab. diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c78dca3..4b974894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 0.5.1 (TBC) +### Features / Enhancement + +### Bug Fixes +- **Fixed first download repo 500 error in Spider Market page**. [#808](https://github.com/crawlab-team/crawlab/issues/808) + # 0.5.0 (2020-07-19) ### Features / Enhancement - **Spider Market**. Allow users to download open-source spiders into Crawlab. From fe310a73456d6362f068dd55582716512cde8ec8 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Sat, 25 Jul 2020 10:39:15 +0800 Subject: [PATCH 03/31] optimized error message --- frontend/src/utils/request.js | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js index b1d1d0a9..cfc74d0e 100644 --- a/frontend/src/utils/request.js +++ b/frontend/src/utils/request.js @@ -5,23 +5,23 @@ import { getToken } from '@/utils/auth' import i18n from '@/i18n' import router from '@/router' -const codeMessage = { - 200: '服务器成功返回请求的数据。', - 201: '新建或修改数据成功。', - 202: '一个请求已经进入后台排队(异步任务)。', - 204: '删除数据成功。', - 400: '发出的请求有错误,服务器没有进行新建或修改数据的操作。', - 401: '用户没有权限(令牌、用户名、密码错误)。', - 403: '用户得到授权,但是访问是被禁止的。', - 404: '发出的请求针对的是不存在的记录,服务器没有进行操作。', - 406: '请求的格式不可得。', - 410: '请求的资源被永久删除,且不会再得到的。', - 422: '当创建一个对象时,发生一个验证错误。', - 500: '服务器发生错误,请检查服务器。', - 502: '网关错误。', - 503: '服务不可用,服务器暂时过载或维护。', - 504: '网关超时。' -} +// const codeMessage = { +// 200: '服务器成功返回请求的数据。', +// 201: '新建或修改数据成功。', +// 202: '一个请求已经进入后台排队(异步任务)。', +// 204: '删除数据成功。', +// 400: '发出的请求有错误,服务器没有进行新建或修改数据的操作。', +// 401: '用户没有权限(令牌、用户名、密码错误)。', +// 403: '用户得到授权,但是访问是被禁止的。', +// 404: '发出的请求针对的是不存在的记录,服务器没有进行操作。', +// 406: '请求的格式不可得。', +// 410: '请求的资源被永久删除,且不会再得到的。', +// 422: '当创建一个对象时,发生一个验证错误。', +// 500: '服务器发生错误,请检查服务器。', +// 502: '网关错误。', +// 503: '服务不可用,服务器暂时过载或维护。', +// 504: '网关超时。' +// } /** * 异常处理程序 @@ -30,10 +30,10 @@ const errorHandler = (error) => { const { response } = error const routePath = router.currentRoute.path if (response && response.status) { - const errorText = codeMessage[response.status] || response.statusText + const errorText = response.data.error const { status } = response Message({ - message: `请求错误 ${status}: ${response.request.responseURL},${errorText}`, + message: `请求错误 ${status}: ${response.request.responseURL}. ${errorText}`, type: 'error', duration: 5 * 1000 }) From c9b1c73ce68cfa47115a2eb4310ac7a90bc994ba Mon Sep 17 00:00:00 2001 From: marvzhang Date: Sat, 25 Jul 2020 10:43:50 +0800 Subject: [PATCH 04/31] optimized error message --- frontend/src/i18n/zh.js | 1 + frontend/src/utils/request.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js index 10c28b6e..e3cfd442 100644 --- a/frontend/src/i18n/zh.js +++ b/frontend/src/i18n/zh.js @@ -676,6 +676,7 @@ export default { 'Are you sure to stop this task?': '确认停止这个任务?', 'Enabled successfully': '成功启用', 'Disabled successfully': '成功禁用', + 'Request Error': '请求错误', // 其他 'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧' diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js index cfc74d0e..c234e84b 100644 --- a/frontend/src/utils/request.js +++ b/frontend/src/utils/request.js @@ -33,7 +33,7 @@ const errorHandler = (error) => { const errorText = response.data.error const { status } = response Message({ - message: `请求错误 ${status}: ${response.request.responseURL}. ${errorText}`, + message: i18n.t('Request Error') + ` ${status}: ${response.request.responseURL}. ${errorText}`, type: 'error', duration: 5 * 1000 }) From d8bd0d9ee063b99df755f44eb7382b190b793106 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Sat, 25 Jul 2020 10:44:07 +0800 Subject: [PATCH 05/31] updated CHANGELOG --- CHANGELOG-zh.md | 2 ++ CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md index c5baf739..ee380606 100644 --- a/CHANGELOG-zh.md +++ b/CHANGELOG-zh.md @@ -1,8 +1,10 @@ # 0.5.1 (TBC) ### 功能 / 优化 +- **加入错误详情信息**. ### Bug 修复 - **修复在爬虫市场中第一次下载爬虫时会报500错误**. [#808](https://github.com/crawlab-team/crawlab/issues/808) +- **修复一部分翻译问题**. # 0.5.0 (2020-07-19) ### 功能 / 优化 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b974894..77768317 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ # 0.5.1 (TBC) ### Features / Enhancement +- **Added error message details**. ### Bug Fixes - **Fixed first download repo 500 error in Spider Market page**. [#808](https://github.com/crawlab-team/crawlab/issues/808) +- **Fixed some translation issues**. # 0.5.0 (2020-07-19) ### Features / Enhancement From f0ede662ae7500f757ab1db9833690223f783e5c Mon Sep 17 00:00:00 2001 From: marvzhang Date: Sun, 26 Jul 2020 10:40:10 +0800 Subject: [PATCH 06/31] fixed https://github.com/crawlab-team/crawlab/issues/811 --- frontend/src/i18n/zh.js | 3 ++ frontend/src/views/setting/Setting.vue | 60 +++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js index e3cfd442..32b30cbd 100644 --- a/frontend/src/i18n/zh.js +++ b/frontend/src/i18n/zh.js @@ -502,6 +502,7 @@ export default { 'Log Errors': '日志错误', 'No Expire': '不过期', 'Log Expire Duration': '日志过期时间', + 'Change Password': '更改密码', // 挑战 'Challenge': '挑战', @@ -677,6 +678,8 @@ export default { 'Enabled successfully': '成功启用', 'Disabled successfully': '成功禁用', 'Request Error': '请求错误', + 'Changed password successfully': '成功修改密码', + 'Two passwords do not match': '两次密码不匹配', // 其他 'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧' diff --git a/frontend/src/views/setting/Setting.vue b/frontend/src/views/setting/Setting.vue index ff0e98a3..d8986e54 100644 --- a/frontend/src/views/setting/Setting.vue +++ b/frontend/src/views/setting/Setting.vue @@ -48,9 +48,6 @@ - - - + + + + + + + + + + +
+ + {{ $t('Save') }} + +
+
+
+
+ + { + if (!valid) return + if (this.userInfo.password !== this.userInfo.confirm_password) { + this.$message.error(this.$t('Two passwords do not match')) + return + } + if (this.userInfo.password.length < 5) { + this.$message.error(this.$t('Password length should be no shorter than 5')) + return + } + const res = await this.$request.post(`/me/change-password`, { + password: this.userInfo.password + }) + if (!res.data.error) { + this.$message.success(this.$t('Changed password successfully')) + } + }) } } }