From ce2b5cdeab13037ea3a0336a32597679b4ac17e9 Mon Sep 17 00:00:00 2001 From: PiEgg Date: Tue, 10 Nov 2020 10:47:19 +0800 Subject: [PATCH] :bug: Fix: url encode before uploading by url ISSUES CLOSED: #581 --- package.json | 2 +- src/main/apis/app/uploader/index.ts | 5 +++-- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index a26accb..6687fd5 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "keycode": "^2.2.0", "lodash-id": "^0.14.0", "lowdb": "^1.0.0", - "picgo": "^1.4.11", + "picgo": "^1.4.12", "qrcode.vue": "^1.7.0", "vue": "^2.6.10", "vue-gallery": "^2.0.1", diff --git a/src/main/apis/app/uploader/index.ts b/src/main/apis/app/uploader/index.ts index 78db89f..3c91d10 100644 --- a/src/main/apis/app/uploader/index.ts +++ b/src/main/apis/app/uploader/index.ts @@ -10,6 +10,7 @@ import picgo from '@core/picgo' import db from '#/datastore' import windowManager from 'apis/app/window/windowManager' import { IWindowList } from 'apis/app/window/constants' +import util from 'util' const waitForShow = (webcontent: WebContents) => { return new Promise((resolve, reject) => { @@ -101,11 +102,11 @@ class Uploader { } picgo.removeAllListeners('failed') }) - picgo.once('failed', ctx => { + picgo.once('failed', (e: Error) => { setTimeout(() => { const notification = new Notification({ title: '上传失败', - body: '请检查配置和上传的文件是否符合要求' + body: util.format(e.stack) }) notification.show() }, 500) diff --git a/yarn.lock b/yarn.lock index 15f5564..e956f08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8289,10 +8289,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picgo@^1.4.11: - version "1.4.11" - resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.11.tgz#759dde14232cd94b62aa2d3256669014f132babe" - integrity sha512-OdhLpSycS/YjHgHSvWDh46eoW8hYPaMtwNQkW67QkNgji7VHU7rinKnaE5xmOhh6BsgFcgEt8bC+e2uKX3qXYA== +picgo@^1.4.12: + version "1.4.12" + resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.12.tgz#c8d1e496cba03795d41d94255fd8dc7567854e66" + integrity sha512-vPopTG66D97o/NmkLxx64oUNwCVWPuOoEaKYQa501VjKbWfmi63S0kLxXbIsoDNIM8rkU11VQinLnouL1Ufv/A== dependencies: chalk "^2.4.1" commander "^2.17.0"