From 6202b60b7248a2c83ae4b67748124e011f63886b Mon Sep 17 00:00:00 2001 From: yaozeyuan Date: Sun, 1 Mar 2020 23:35:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=99=BB=E9=99=86?= =?UTF-8?q?=E5=90=8Ecookie=E8=BD=BD=E5=85=A5=E5=A4=B1=E8=B4=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98(=E5=90=8C=E6=97=B6=E6=94=AF=E6=8C=81=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E8=A2=AB=E5=B0=81=E5=BE=AE=E5=8D=9A=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bug原因: 对CommonUtil.getConfig返回值数据结构记忆错误, 把request记成了config, 导致都获取不到用户登陆cookie --- src/config/request.ts | 3 ++- src/library/util/config_helper.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/config/request.ts b/src/config/request.ts index 673ca3b5..3f83b38f 100644 --- a/src/config/request.ts +++ b/src/config/request.ts @@ -6,7 +6,8 @@ let config = CommonUtil.getConfig() class Request { static timeoutMs = 20 * 1000 - static ua = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36' + static ua = + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36' static cookie = _.get(config, ['request', 'cookie'], '') } export default Request diff --git a/src/library/util/config_helper.ts b/src/library/util/config_helper.ts index 5349a101..18cb70b8 100644 --- a/src/library/util/config_helper.ts +++ b/src/library/util/config_helper.ts @@ -4,9 +4,9 @@ import _ from 'lodash' class ConfigHelper { // 重新载入配置文件 - static reloadConfig () { + static reloadConfig() { let config = CommonUtil.getConfig() - RequestConfig.cookie = _.get(config, ['config', 'cookie'], '') + RequestConfig.cookie = _.get(config, ['request', 'cookie'], '') } } From f74b5735df6f6a30e39d3f4c00ab14505e11d49a Mon Sep 17 00:00:00 2001 From: yaozeyuan Date: Sun, 1 Mar 2020 23:41:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=89=93?= =?UTF-8?q?=E5=BC=80=E7=94=B5=E5=AD=90=E4=B9=A6=E6=89=80=E5=9C=A8=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gui/src/view/customer_task/index.vue | 5 +++++ src/index.ts | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/gui/src/view/customer_task/index.vue b/gui/src/view/customer_task/index.vue index 944cb8f9..98daec99 100644 --- a/gui/src/view/customer_task/index.vue +++ b/gui/src/view/customer_task/index.vue @@ -123,6 +123,7 @@ 开始备份 同步用户信息 + 打开电子书所在目录 检查更新 @@ -401,6 +402,10 @@ export default Vue.extend({ // 将面板切换到log上 this.$emit('update:currentTab', 'log') }, + async openOutputDir() { + // 打开电子书存储目录 + ipcRenderer.sendSync('openOutputDir') + }, matchTaskId(content: string) { let parseResult = querystring.parseUrl(content) let rawId = '' diff --git a/src/index.ts b/src/index.ts index e8f06023..b22336d0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -169,6 +169,10 @@ ipcMain.on('start', async (event, taskConfigList) => { isRunning = false }) +ipcMain.on('openOutputDir', async event => { + shell.showItemInFolder(PathConfig.outputPath) +}) + ipcMain.on('startCustomerTask', async event => { if (isRunning) { event.returnValue = '目前尚有任务执行, 请稍后' From 458b97ae20b93f88450e5fd9f42b3da85b24e2af Mon Sep 17 00:00:00 2001 From: yaozeyuan Date: Sun, 1 Mar 2020 23:49:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E7=A6=81=E6=AD=A2=E5=9C=A8=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E9=A1=B5=E4=B8=AD=E7=82=B9=E5=87=BBa=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gui/src/view/manage/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gui/src/view/manage/index.vue b/gui/src/view/manage/index.vue index 381012b6..a2328b75 100644 --- a/gui/src/view/manage/index.vue +++ b/gui/src/view/manage/index.vue @@ -364,5 +364,9 @@ export default { // 所有元素顶部对齐 vertical-align: top; } + .weibo-raw-item{ + // 禁止点a标签跳转(跳过去就回不来了) + pointer-events: none; + } } From 3adc8a36ccc5e7ceaf29148d3ac1e52c6a0b7f10 Mon Sep 17 00:00:00 2001 From: yaozeyuan Date: Sun, 1 Mar 2020 23:52:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8E=E7=95=8C=E9=9D=A2=E5=8D=A1?= =?UTF-8?q?=E6=AD=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.ts b/src/index.ts index b22336d0..21e72f94 100644 --- a/src/index.ts +++ b/src/index.ts @@ -171,6 +171,8 @@ ipcMain.on('start', async (event, taskConfigList) => { ipcMain.on('openOutputDir', async event => { shell.showItemInFolder(PathConfig.outputPath) + event.returnValue = true + return }) ipcMain.on('startCustomerTask', async event => { From 93ae7d1ae6cf6a59a876a270e62d887e0fd788c8 Mon Sep 17 00:00:00 2001 From: yaozeyuan Date: Sun, 1 Mar 2020 23:56:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E7=BB=93=E6=9D=9F=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=A7=8B=E7=BB=88=E9=87=8D=E7=BD=AE=E4=B8=BA=E6=AC=A1?= =?UTF-8?q?=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gui/src/view/customer_task/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gui/src/view/customer_task/index.vue b/gui/src/view/customer_task/index.vue index 98daec99..a10a26a5 100644 --- a/gui/src/view/customer_task/index.vue +++ b/gui/src/view/customer_task/index.vue @@ -298,15 +298,19 @@ export default Vue.extend({ mergeCount: 1000, fetchStartAtPageNo: 0, fetchEndAtPageNo: 100000, - outputStartAtMs: moment('2010-01-01 00:00:00').unix() * 1000, + outputStartAtMs: moment('2001-01-01 00:00:00').unix() * 1000, outputEndAtMs: moment() - .add(1, 'year') + .add(1, 'day') .unix() * 1000, } try { taskConfig = JSON.parse(jsonContent) } catch (e) {} + // 始终重置为次日 + taskConfig.outputEndAtMs = moment() + .add(1, 'day') + .unix() * 1000 this.database.taskConfig = taskConfig if (this.database.taskConfig.configList.length === 0) { this.database.taskConfig.configList.push(_.clone(defaultConfigItem)) From 5c22f1795522e6d05ddbd93cbf8aec619efecb3c Mon Sep 17 00:00:00 2001 From: yaozeyuan Date: Sun, 1 Mar 2020 23:59:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- changelog.md | 6 ++++++ package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6a255fd2..d96455d7 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ # 软件下载 -最新版本: 1.6.0 +最新版本: 1.7.0 -[点击下载-win](http://stablog.bookflaneur.cn/release/%E7%A8%B3%E9%83%A8%E8%90%BD%20Setup%201.6.1.exe) +[点击下载-win](http://stablog.bookflaneur.cn/release/%E7%A8%B3%E9%83%A8%E8%90%BD%20Setup%201.7.0.exe) [点击下载-mac](http://stablog.bookflaneur.cn/release/%E7%A8%B3%E9%83%A8%E8%90%BD-1.6.0.dmg) diff --git a/changelog.md b/changelog.md index 3c27ba9d..f3083927 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,9 @@ +# 1.7.0 + +1. 解决用户未登录问题. 现在账号被封的微博 id 也能通过稳部落备份微博记录了 +2. 添加打开电子书所在目录按钮, 方便用户找到电子书所在位置 +3. 微博备份的截至日期默认值修改成始终为当前日期的下一天, 方便用户使用 + # 1.6.0 1. 解决 mac 上不能生成 pdf 文件问题 diff --git a/package.json b/package.json index 6a7d0f9b..808c43d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stablog", - "version": "1.6.0", + "version": "1.7.0", "description": "稳部落. 专业备份微blog, 老铁, 稳!", "repository": { "type": "git", From 9b836aef8ac77fa6b552f712fcb02189e1dd5249 Mon Sep 17 00:00:00 2001 From: yaozeyuan Date: Mon, 2 Mar 2020 00:01:24 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index f3083927..fb4de48b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # 1.7.0 -1. 解决用户未登录问题. 现在账号被封的微博 id 也能通过稳部落备份微博记录了 +1. 解决用户未登录问题. 现在账号被封的微博 id 也能通过稳部落备份微博记录了(感谢知乎网友@孙老师 的帮助) 2. 添加打开电子书所在目录按钮, 方便用户找到电子书所在位置 3. 微博备份的截至日期默认值修改成始终为当前日期的下一天, 方便用户使用