1.4.3

.electron-vue/webpack.renderer.config.js

@@ -133,7 +133,8 @@ let rendererConfig = {
   resolve: {
     alias: {
       '@': path.join(__dirname, '../src/renderer'),
-      'vue$': 'vue/dist/vue.esm.js'
+      'vue$': 'vue/dist/vue.esm.js',
+      'utils': path.join(__dirname, '../src/renderer/utils')
     },
     extensions: ['.js', '.vue', '.json', '.css', '.node']
   },

.gitignore

@@ -3,6 +3,7 @@ dist/electron/*
 dist/web/*
 build/*
 !build/icons
+!build/installer.nsh
 coverage
 node_modules/
 npm-debug.log

.vscode/launch.json

@@ -4,14 +4,34 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "Launch",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceRoot}/src/main/index.dev.js",
+      "env": {
+        "DEBUG_ENV": "debug"
+      },
+      "stopOnEntry": false,
+      "args": [],
+      "cwd": "${workspaceRoot}",
+                      // this points to the electron task runner
+      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
+      "runtimeArgs": [
+        "--nolazy"
+      ],
+      "sourceMaps": true
+    },
     {
       "name": "Attach",
       "type": "node",
       "request": "attach",
       "port": 5858,
-      "sourceMaps": false,
+      "sourceMaps": true,
+      "restart": true,
       "outFiles": [],
       "localRoot": "${workspaceRoot}",
+      "protocol": "inspector",
       "remoteRoot": null
     }
   ]

README.md

@@ -22,11 +22,13 @@
 
 ## 应用说明
 
-PicGo目前支持了`微博图床`，`七牛图床`，`腾讯云COS`，`又拍云`。未来将支持更多图床。
+PicGo目前支持了`微博图床`，`七牛图床`，`腾讯云COS v4版本`，`又拍云`。未来将支持更多图床。
 
-暂时只支持macOS系统，未来将支持windows和linux。
+支持macOS、windows 64位（v1.3.0以上）系统，未来将支持linux。
 
-点击此处下载[应用](https://github.com/Molunerfinn/PicGo/releases)，macOS用户请下载最新版本的`dmg`文件。
+支持快捷键`command+shift+p`（macOS）或者`control+shift+p`（windows）用以支持快捷上传剪贴板里的图片（第一张）。PicGo v1.4.0版本及以上支持自定义快捷键啦，使用方法见[配置手册](https://github.com/Molunerfinn/PicGo/wiki/%E8%AF%A6%E7%BB%86%E7%AA%97%E5%8F%A3%E7%9A%84%E4%BD%BF%E7%94%A8#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%BF%AB%E6%8D%B7%E9%94%AE)。
+
+点击此处下载[应用](https://github.com/Molunerfinn/PicGo/releases)，macOS用户请下载最新版本的`dmg`文件，windows用户请下载最新版本的`exe`文件。**如果是国内用户下载github release文件速度很慢的话，推荐使用[Free Download Manager](http://www.freedownloadmanager.org/download.htm)来下载，速度会快。**
 
 如果第一次使用，请参考应用使用[手册](https://github.com/Molunerfinn/PicGo/wiki)。
 
@@ -36,13 +38,14 @@ PicGo目前支持了`微博图床`，`七牛图床`，`腾讯云COS`，`又拍
 
 ## 开发说明
 
-> 目前仅针对Mac平台。Windows和Linux平台并未测试。
+> 目前仅针对Mac、Windows。Linux平台并未测试。
 
 如果你想要学习、开发、修改或自行构建PicGo，可以依照下面的指示：
 
 1. 你需要有node、git环境。需要了解npm的相关知识。
 2. `git clone https://github.com/Molunerfinn/PicGo.git` 并进入项目
 3. `npm install` 下载依赖
+4. Mac需要有Xcode环境，Windows需要有VS环境。
 
 ### 开发模式
 

appveyor.yml

@@ -21,13 +21,12 @@ init:
 
 install:
   - ps: Install-Product node 8 x64
-  - choco install yarn --ignore-dependencies
   - git reset --hard HEAD
-  - yarn
+  - npm install
   - node --version
 
 build_script:
   #- yarn test
-  - yarn build
+  - npm run release
 
 test: off

build/installer.nsh

@@ -0,0 +1,8 @@
+ !macro preInit
+    SetRegView 64
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\PicGo"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\PicGo"
+    SetRegView 32
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\PicGo"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\PicGo"
+ !macroend

docs/APP.vue

@@ -6,6 +6,7 @@
       h1.title PicGo
       h2.desc 图片上传+管理新体验
       button.download(@click="goLink('https://github.com/Molunerfinn/picgo/releases')") 免费下载Mac版
+      button.download(@click="goLink('https://github.com/Molunerfinn/picgo/releases')") 免费下载Windows版
       button.download(@click="goLink('https://github.com/Molunerfinn/picgo')") 在github上查看
       h3.desc
         | 基于#[a(href="https://github.com/SimulatedGREG/electron-vue" target="_blank") electron-vue]开发
@@ -32,7 +33,7 @@ export default {
         {
           url: 'https://ws1.sinaimg.cn/large/8700af19ly1fma907llb5j20m30ed46a',
           title: '精致设计',
-          desc: 'macOS系统下，支持拖拽至menubar图标实现上传。menubar app 窗口显示最新上传的5张图片以及剪贴板里的图片。点击图片自动将上传的链接复制到剪贴板。'
+          desc: 'macOS系统下，支持拖拽至menubar图标实现上传。menubar app 窗口显示最新上传的5张图片以及剪贴板里的图片。点击图片自动将上传的链接复制到剪贴板。（Windows平台不支持）'
         },
         {
           url: 'https://ws1.sinaimg.cn/large/8700af19ly1fmd56zm2nej218g0p0teb',
@@ -42,7 +43,7 @@ export default {
         {
           url: 'https://ws1.sinaimg.cn/large/8700af19ly1fmd5ck9m0wj20lr0cxmzs',
           title: '可选图床',
-          desc: '目前支持微博图床和七牛图床。未来将支持更多。方便不同图床的上传需求。'
+          desc: '目前支持微博图床、七牛图床、腾讯云COS、又拍云。未来将支持更多。方便不同图床的上传需求。'
         },
         {
           url: 'https://ws1.sinaimg.cn/large/8700af19gy1fmayjwttnbj218g0p0q4e',
@@ -172,6 +173,8 @@ h1
       text-decoration none
       color #fff
 @media (max-width: 768px)
+  #header
+    padding 10vh
   #container
     .display-list
       &__item

package.json

@@ -1,11 +1,12 @@
 {
   "name": "picgo",
-  "version": "1.2.1",
+  "version": "1.4.3",
   "author": "Molunerfinn <marksz@teamsz.xyz>",
   "description": "Easy to upload your pic & copy to write",
   "license": "MIT",
   "main": "./dist/electron/main.js",
   "scripts": {
+    "render": "webpack-dev-server --hot --colors --config .electron-vue/webpack.renderer.config.js --port 9080 --content-base app/dist",
     "build": "node .electron-vue/build.js && electron-builder",
     "release": "node .electron-vue/build.js && electron-builder",
     "build:dir": "node .electron-vue/build.js && electron-builder --dir",
@@ -29,7 +30,7 @@
   },
   "build": {
     "productName": "PicGo",
-    "appId": "org.simulatedgreg.electron-vue",
+    "appId": "com.molunerfinn.picgo",
     "directories": {
       "output": "build"
     },
@@ -58,7 +59,12 @@
       }
     },
     "win": {
-      "icon": "build/icons/icon.ico"
+      "icon": "build/icons/icon.ico",
+      "target": "nsis"
+    },
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true
     },
     "linux": {
       "icon": "build/icons"
@@ -67,8 +73,10 @@
   "dependencies": {
     "axios": "^0.16.1",
     "element-ui": "^2.0.5",
+    "fecha": "^2.3.3",
     "fs-extra": "^4.0.2",
     "image-size": "^0.6.1",
+    "keycode": "^2.1.9",
     "lodash-id": "^0.14.0",
     "lowdb": "^1.0.0",
     "md5": "^2.2.1",

src/datastore/index.js

@@ -29,4 +29,10 @@ if (!db.has('picBed').value()) {
   }).write()
 }
 
+if (!db.has('shortKey').value()) {
+  db.set('shortKey', {
+    upload: 'CommandOrControl+Shift+P'
+  }).write()
+}
+
 export default db

src/main/index.dev.js

@@ -24,4 +24,15 @@ require('electron').app.on('ready', () => {
 })
 
 // Require `main` process to boot app
+if (process.env.DEBUG_ENV === 'debug') {
+  require('babel-core/register')({
+    'presets': [
+      ['env', {
+        'targets': {
+          'node': true
+        }
+      }]
+    ]
+  })
+}
 require('./index')

src/main/index.js

@@ -13,11 +13,15 @@ import pkg from '../../package.json'
 if (process.env.NODE_ENV !== 'development') {
   global.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
 }
+if (process.env.DEBUG_ENV === 'debug') {
+  global.__static = require('path').join(__dirname, '../../static').replace(/\\/g, '\\\\')
+}
 
 let window
 let settingWindow
 let tray
 let menu
+let contextMenu
 const winURL = process.env.NODE_ENV === 'development'
   ? `http://localhost:9080`
   : `file://${__dirname}/index.html`
@@ -34,8 +38,9 @@ const uploadFailed = () => {
 }
 
 function createTray () {
-  tray = new Tray(`${__static}/menubar.png`)
-  const contextMenu = Menu.buildFromTemplate([
+  const menubarPic = process.platform === 'darwin' ? `${__static}/menubar.png` : `${__static}/menubar-nodarwin.png`
+  tray = new Tray(menubarPic)
+  contextMenu = Menu.buildFromTemplate([
     {
       label: '关于',
       click () {
@@ -100,6 +105,15 @@ function createTray () {
         }
       ]
     },
+    {
+      label: '打开更新助手',
+      type: 'checkbox',
+      checked: db.get('picBed.showUpdateTip').value(),
+      click () {
+        const value = db.read().get('picBed.showUpdateTip').value()
+        db.read().set('picBed.showUpdateTip', !value).write()
+      }
+    },
     {
       role: 'quit',
       label: '退出'
@@ -110,21 +124,32 @@ function createTray () {
     tray.popUpContextMenu(contextMenu)
   })
   tray.on('click', () => {
-    let img = clipboard.readImage()
-    let obj = []
-    if (!img.isEmpty()) {
-      // 从剪贴板来的图片默认转为png
-      const imgUrl = 'data:image/png;base64,' + Buffer.from(img.toPNG(), 'binary').toString('base64')
-      obj.push({
-        width: img.getSize().width,
-        height: img.getSize().height,
-        imgUrl
-      })
+    if (process.platform === 'darwin') {
+      let img = clipboard.readImage()
+      let obj = []
+      if (!img.isEmpty()) {
+        // 从剪贴板来的图片默认转为png
+        const imgUrl = 'data:image/png;base64,' + Buffer.from(img.toPNG(), 'binary').toString('base64')
+        obj.push({
+          width: img.getSize().width,
+          height: img.getSize().height,
+          imgUrl
+        })
+      }
+      toggleWindow()
+      setTimeout(() => {
+        window.webContents.send('clipboardFiles', obj)
+      }, 0)
+    } else {
+      window.hide()
+      if (settingWindow === null) {
+        createSettingWindow()
+        settingWindow.show()
+      } else {
+        settingWindow.show()
+        settingWindow.focus()
+      }
     }
-    toggleWindow()
-    setTimeout(() => {
-      window.webContents.send('clipboardFiles', obj)
-    }, 0)
   })
 
   tray.on('drag-enter', () => {
@@ -188,7 +213,7 @@ const createWindow = () => {
 }
 
 const createSettingWindow = () => {
-  settingWindow = new BrowserWindow({
+  const options = {
     height: 450,
     width: 800,
     show: false,
@@ -196,14 +221,20 @@ const createSettingWindow = () => {
     center: true,
     fullscreenable: false,
     resizable: false,
-    title: 'Pic',
+    title: 'PicGo',
     vibrancy: 'ultra-dark',
     transparent: true,
     titleBarStyle: 'hidden',
     webPreferences: {
       backgroundThrottling: false
     }
-  })
+  }
+  if (process.platform === 'win32') {
+    options.show = true
+    options.frame = false
+    options.backgroundColor = '#3f3c37'
+  }
+  settingWindow = new BrowserWindow(options)
 
   settingWindow.loadURL(settingWinURL)
 
@@ -278,18 +309,27 @@ const uploadClipboardFiles = async () => {
       imgUrl
     }
   }
-  img = await uploader(uploadImg, 'imgFromClipboard', window.webContents)
+  const win = settingWindow || window
+  img = await uploader(uploadImg, 'imgFromClipboard', win.webContents)
   if (img !== false) {
-    const pasteStyle = db.read().get('picBed.pasteStyle').value() || 'markdown'
-    clipboard.writeText(pasteTemplate(pasteStyle, img[0].imgUrl))
-    const notification = new Notification({
-      title: '上传成功',
-      body: img[0].imgUrl,
-      icon: img[0].imgUrl
-    })
-    notification.show()
-    window.webContents.send('clipboardFiles', [])
-    window.webContents.send('uploadFiles', img)
+    if (img.length > 0) {
+      const pasteStyle = db.read().get('picBed.pasteStyle').value() || 'markdown'
+      clipboard.writeText(pasteTemplate(pasteStyle, img[0].imgUrl))
+      const notification = new Notification({
+        title: '上传成功',
+        body: img[0].imgUrl,
+        icon: img[0].imgUrl
+      })
+      notification.show()
+      window.webContents.send('clipboardFiles', [])
+      window.webContents.send('uploadFiles', img)
+    } else {
+      const notification = new Notification({
+        title: '上传不成功',
+        body: '你剪贴板最新的一条记录不是图片哦'
+      })
+      notification.show()
+    }
   } else {
     uploadFailed()
   }
@@ -314,6 +354,10 @@ ipcMain.on('uploadClipboardFiles', async (evt, file) => {
   }
 })
 
+ipcMain.on('uploadClipboardFilesFromUploadPage', () => {
+  uploadClipboardFiles()
+})
+
 ipcMain.on('uploadChoosedFiles', async (evt, files) => {
   const imgs = await uploader(files, 'imgFromUploader', settingWindow.webContents)
   if (imgs !== false) {
@@ -337,6 +381,43 @@ ipcMain.on('uploadChoosedFiles', async (evt, files) => {
   }
 })
 
+ipcMain.on('updateShortKey', (evt, oldKey) => {
+  globalShortcut.unregisterAll()
+  for (let key in oldKey) {
+    globalShortcut.register(db.read().get('shortKey').value()[key], () => {
+      return shortKeyHash[key]()
+    })
+  }
+  const notification = new Notification({
+    title: '操作成功',
+    body: '你的快捷键已经修改成功'
+  })
+  notification.show()
+})
+
+ipcMain.on('updateCustomLink', (evt, oldLink) => {
+  const notification = new Notification({
+    title: '操作成功',
+    body: '你的自定义链接格式已经修改成功'
+  })
+  notification.show()
+})
+
+ipcMain.on('updteDefaultPicBed', (evt) => {
+  const types = ['weibo', 'qiniu', 'tcyun', 'upyun']
+  let submenuItem = contextMenu.items[2].submenu.items
+  submenuItem.forEach((item, index) => {
+    const result = db.read().get('picBed.current').value() === types[index]
+    if (result) {
+      item.click() // It's a bug which can not set checked status
+    }
+  })
+})
+
+const shortKeyHash = {
+  upload: uploadClipboardFiles
+}
+
 const isSecondInstance = app.makeSingleInstance(() => {
   if (settingWindow) {
     if (settingWindow.isMinimized()) {
@@ -347,16 +428,19 @@ const isSecondInstance = app.makeSingleInstance(() => {
 })
 
 if (isSecondInstance) {
-  console.log('is 2')
   app.quit()
 }
 
+if (process.platform === 'win32') {
+  app.setAppUserModelId(pkg.build.appId)
+}
+
 app.on('ready', () => {
   createWindow()
   createTray()
   updateChecker()
 
-  globalShortcut.register('CommandOrControl+Shift+P', () => {
+  globalShortcut.register(db.read().get('shortKey.upload').value(), () => {
     uploadClipboardFiles()
   })
 })

src/main/utils/img2base64.js

@@ -1,6 +1,7 @@
 import fs from 'fs-extra'
 import path from 'path'
 import sizeOf from 'image-size'
+import fecha from 'fecha'
 
 const imgFromPath = async (imgPath) => {
   let results = []
@@ -13,7 +14,8 @@ const imgFromPath = async (imgPath) => {
       base64Image,
       fileName,
       width: imgSize.width,
-      height: imgSize.height
+      height: imgSize.height,
+      extname: path.extname(item.name)
     })
   }))
   return results
@@ -22,12 +24,13 @@ const imgFromPath = async (imgPath) => {
 const imgFromClipboard = (file) => {
   let result = []
   if (file !== null) {
-    const today = new Date().toLocaleString().replace(/[ ]+/g, '-').replace(/\/+/g, '-')
+    const today = fecha.format(new Date(), 'YYYYMMDDHHmmss')
     result.push({
       base64Image: file.imgUrl.replace(/^data\S+,/, ''),
       fileName: `${today}.png`,
       width: file.width,
-      height: file.height
+      height: file.height,
+      extname: '.png'
     })
   }
   return result
@@ -44,7 +47,8 @@ const imgFromUploader = async (files) => {
       base64Image,
       fileName,
       width: imgSize.width,
-      height: imgSize.height
+      height: imgSize.height,
+      extname: path.extname(item.name)
     })
   }))
   return results

src/main/utils/pasteTemplate.js

@@ -1,9 +1,13 @@
+import db from '../../datastore'
+
 export default (style, url) => {
+  const customLink = db.read().get('customLink').value() || '$url'
   const tpl = {
     'markdown': `![](${url})`,
     'HTML': `<img src="${url}"/>`,
     'URL': url,
-    'UBB': `[IMG]${url}[/IMG]`
+    'UBB': `[IMG]${url}[/IMG]`,
+    'Custom': customLink.replace(/\$url/, url)
   }
   return tpl[style]
 }

src/main/utils/qiniuUpload.js

@@ -6,7 +6,8 @@ import { Notification } from 'electron'
 
 function postOptions (fileName, token, imgBase64) {
   const area = selectArea(db.read().get('picBed.qiniu.area').value() || 'z0')
-  const base64FileName = Buffer.from(fileName, 'utf-8').toString('base64').replace(/\+/g, '-').replace(/\//g, '_')
+  const path = db.read().get('picBed.qiniu.path').value() || ''
+  const base64FileName = Buffer.from(path + fileName, 'utf-8').toString('base64').replace(/\+/g, '-').replace(/\//g, '_')
   return {
     method: 'POST',
     url: `http://upload${area}.qiniu.com/putb64/-1/key/${base64FileName}`,

src/main/utils/tcYunUpload.js

@@ -52,13 +52,20 @@ const tcYunUpload = async (img, type, webContents) => {
     webContents.send('uploadProgress', 30)
     const singature = generateSignature()
     const length = imgList.length
+    const tcYunOptions = db.read().get('picBed.tcyun').value()
+    const customUrl = tcYunOptions.customUrl
+    const path = tcYunOptions.path
     for (let i in imgList) {
       const options = postOptions(imgList[i].fileName, singature, imgList[i].base64Image)
       const res = await request(options)
       const body = JSON.parse(res)
       if (body.message === 'SUCCESS') {
         delete imgList[i].base64Image
-        imgList[i]['imgUrl'] = body.data.source_url
+        if (customUrl) {
+          imgList[i]['imgUrl'] = `${customUrl}/${path}${imgList[i].fileName}`
+        } else {
+          imgList[i]['imgUrl'] = body.data.source_url
+        }
         imgList[i]['type'] = 'tcyun'
         if (i - length === -1) {
           webContents.send('uploadProgress', 60)

src/main/utils/upYunUpload.js

@@ -8,12 +8,12 @@ import MD5 from 'md5'
 // generate COS signature string
 const generateSignature = (fileName) => {
   const options = db.read().get('picBed.upyun').value()
-  // const apiKey = options.apiKey
+  const path = options.path || ''
   const operator = options.operator
   const password = options.password
   const md5Password = MD5(password)
   const date = new Date().toGMTString()
-  const uri = `/${options.bucket}/${encodeURI(fileName)}`
+  const uri = `/${options.bucket}/${path}${encodeURI(fileName)}`
   const value = `PUT&${uri}&${date}`
   const sign = crypto.createHmac('sha1', md5Password).update(value).digest('base64')
   return `UPYUN ${operator}:${sign}`
@@ -22,9 +22,10 @@ const generateSignature = (fileName) => {
 const postOptions = (fileName, signature, imgBase64) => {
   const options = db.read().get('picBed.upyun').value()
   const bucket = options.bucket
+  const path = options.path || ''
   return {
     method: 'PUT',
-    url: `https://v0.api.upyun.com/${bucket}/${encodeURI(fileName)}`,
+    url: `https://v0.api.upyun.com/${bucket}/${path}${encodeURI(fileName)}`,
     headers: {
       Authorization: signature,
       Date: new Date().toGMTString()
@@ -41,24 +42,21 @@ const upYunUpload = async (img, type, webContents) => {
     webContents.send('uploadProgress', 30)
     const length = imgList.length
     const upyunOptions = db.read().get('picBed.upyun').value()
+    const path = upyunOptions.path || ''
     for (let i in imgList) {
       const singature = generateSignature(imgList[i].fileName)
       const options = postOptions(imgList[i].fileName, singature, imgList[i].base64Image)
       const body = await request(options)
       if (body.statusCode === 200) {
         delete imgList[i].base64Image
-        imgList[i]['imgUrl'] = `${upyunOptions.url}/${imgList[i].fileName}${upyunOptions.options}`
+        imgList[i]['imgUrl'] = `${upyunOptions.url}/${path}${imgList[i].fileName}${upyunOptions.options}`
         imgList[i]['type'] = 'upyun'
         if (i - length === -1) {
           webContents.send('uploadProgress', 60)
         }
       } else {
         webContents.send('uploadProgress', -1)
-        const notification = new Notification({
-          title: '上传失败！',
-          body: '服务端出错，请稍后再试'
-        })
-        notification.show()
+        return new Error()
       }
     }
     webContents.send('uploadProgress', 100)

src/main/utils/updateChecker.js

@@ -22,7 +22,7 @@ const checkVersion = async () => {
           type: 'info',
           title: '发现新版本',
           buttons: ['Yes', 'No'],
-          message: '发现新版本，是否去下载最新的版本？',
+          message: '发现新版本，更新了很多功能，是否去下载最新的版本？',
           checkboxLabel: '以后不再提醒',
           checkboxChecked: false
         }, (res, checkboxChecked) => {

src/main/utils/weiboUpload.js

@@ -28,26 +28,51 @@ const weiboUpload = async function (img, type, webContents) {
       password: db.read().get('picBed.weibo.password').value()
     }
     const quality = db.read().get('picBed.weibo.quality').value()
+    const cookie = db.read().get('picBed.weibo.cookie').value()
+    const chooseCookie = db.read().get('picBed.weibo.chooseCookie').value()
     const options = postOptions(formData)
-    const res = await rp(options)
+    let res
+    if (!chooseCookie) {
+      res = await rp(options)
+    }
     webContents.send('uploadProgress', 30)
-    if (res.body.retcode === 20000000) {
-      for (let i in res.body.data.crossdomainlist) {
-        await rp.get(res.body.data.crossdomainlist[i])
+    if (chooseCookie || res.body.retcode === 20000000) {
+      if (res) {
+        for (let i in res.body.data.crossdomainlist) {
+          await rp.get(res.body.data.crossdomainlist[i])
+        }
       }
       webContents.send('uploadProgress', 60)
       const imgList = await img2Base64[type](img)
       for (let i in imgList) {
-        let result = await rp.post(UPLOAD_URL, {
+        let opt = {
           formData: {
             b64_data: imgList[i].base64Image
           }
-        })
+        }
+        if (chooseCookie) {
+          opt.headers = {
+            Cookie: cookie
+          }
+        }
+        let result = await rp.post(UPLOAD_URL, opt)
         result = result.replace(/<.*?\/>/, '').replace(/<(\w+).*?>.*?<\/\1>/, '')
         delete imgList[i].base64Image
         const resTextJson = JSON.parse(result)
-        imgList[i]['imgUrl'] = `https://ws1.sinaimg.cn/${quality}/${resTextJson.data.pics.pic_1.pid}`
-        imgList[i]['type'] = 'weibo'
+        if (resTextJson.data.pics.pic_1.pid === undefined) {
+          webContents.send('uploadProgress', -1)
+          const notification = new Notification({
+            title: '上传失败！',
+            body: '微博Cookie失效，请在网页版重新登录一遍'
+          })
+          notification.show()
+          return new Error()
+        } else {
+          const extname = imgList[i].extname === '.gif' ? '.gif' : '.jpg'
+          imgList[i]['imgUrl'] = `https://ws1.sinaimg.cn/${quality}/${resTextJson.data.pics.pic_1.pid}${extname}`
+          imgList[i]['type'] = 'weibo'
+        }
+        delete imgList[i].extname
       }
       webContents.send('uploadProgress', 100)
       return imgList
@@ -58,6 +83,7 @@ const weiboUpload = async function (img, type, webContents) {
         body: res.body.msg
       })
       notification.show()
+      return new Error()
     }
   } catch (err) {
     webContents.send('uploadProgress', -1)

src/renderer/App.vue

@@ -20,4 +20,16 @@
   #app
     overflow-x hidden
     user-select none
+  .el-button-group
+    width 100%
+    .el-button
+      width 50%
+  *::-webkit-scrollbar
+    width 8px
+    height 8px
+  *::-webkit-scrollbar-thumb
+    border-radius 4px
+    background #6f6f6f
+  *::-webkit-scrollbar-track
+    background-color transparent
 </style>

src/renderer/components/SettingPage.vue

@@ -2,8 +2,12 @@
   <div id="setting-page">
     <div class="fake-title-bar">
       PicGo - {{ version }}
+      <div class="handle-bar" v-if="os === 'win32'">
+        <i class="el-icon-minus" @click="minimizeWindow"></i>
+        <i class="el-icon-close" @click="closeWindow"></i>
+      </div>
     </div>
-    <el-row style="padding-top: 22px;">
+    <el-row style="padding-top: 22px;" class="main-content">
       <el-col :span="5">
         <el-menu
           class="picgo-sidebar"
@@ -59,23 +63,122 @@
         </el-col>
       </el-row>
     </el-dialog>
+    <el-dialog
+      title="修改快捷键"
+      :visible.sync="keyBindingVisible"
+    >
+      <el-form
+        label-width="80px"
+      >
+        <el-form-item
+          label="快捷上传"
+        >
+          <el-input 
+            class="align-center"
+            @keydown.native.prevent="keyDetect('upload', $event)"
+            v-model="shortKey.upload"
+            :autofocus="true"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer">
+        <el-button @click="cancelKeyBinding">取消</el-button>
+        <el-button type="primary" @click="confirmKeyBinding">确定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="修改快捷键"
+      :visible.sync="keyBindingVisible"
+    >
+      <el-form
+        label-width="80px"
+      >
+        <el-form-item
+          label="快捷上传"
+        >
+          <el-input 
+            class="align-center"
+            @keydown.native.prevent="keyDetect('upload', $event)"
+            v-model="shortKey.upload"
+            :autofocus="true"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer">
+        <el-button @click="cancelKeyBinding">取消</el-button>
+        <el-button type="primary" @click="confirmKeyBinding">确定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="自定义链接格式"
+      :visible.sync="customLinkVisible"
+    >
+      <el-form
+        label-position="top"
+        :model="customLink"
+        ref="customLink"
+        :rules="rules"
+      >
+        <el-form-item
+          label="用占位符$url来表示url的位置"
+          prop="value"
+        >
+          <el-input 
+            class="align-center"
+            v-model="customLink.value"
+            :autofocus="true"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div>
+        如[]($url)
+      </div>
+      <span slot="footer">
+        <el-button @click="cancelCustomLink">取消</el-button>
+        <el-button type="primary" @click="confirmCustomLink">确定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 import pkg from '../../../package.json'
+import keyDetect from 'utils/key-binding'
 import { remote } from 'electron'
-const { Menu, dialog } = remote
+import db from '../../datastore'
+const { Menu, dialog, BrowserWindow } = remote
 export default {
   name: 'setting-page',
   data () {
+    const customLinkRule = (rule, value, callback) => {
+      if (!/\$url/.test(value)) {
+        return callback(new Error('必须含有$url'))
+      } else {
+        return callback()
+      }
+    }
     return {
-      version: pkg.version,
+      version: process.env.NODE_ENV === 'production' ? pkg.version : 'Dev',
       defaultActive: 'upload',
       menu: null,
-      visible: false
+      visible: false,
+      keyBindingVisible: false,
+      customLinkVisible: false,
+      customLink: {
+        value: db.read().get('customLink').value() || '$url'
+      },
+      rules: {
+        value: [
+          { validator: customLinkRule, trigger: 'blur' }
+        ]
+      },
+      os: '',
+      shortKey: {
+        upload: db.read().get('shortKey.upload').value()
+      }
     }
   },
   created () {
+    this.os = process.platform
     this.buildMenu()
   },
   methods: {
@@ -84,6 +187,14 @@ export default {
         name: index
       })
     },
+    minimizeWindow () {
+      const window = BrowserWindow.getFocusedWindow()
+      window.minimize()
+    },
+    closeWindow () {
+      const window = BrowserWindow.getFocusedWindow()
+      window.close()
+    },
     buildMenu () {
       const _this = this
       const template = [
@@ -102,12 +213,61 @@ export default {
           click () {
             _this.visible = true
           }
+        },
+        {
+          label: '修改快捷键',
+          click () {
+            _this.keyBindingVisible = true
+          }
+        },
+        {
+          label: '自定义链接格式',
+          click () {
+            _this.customLinkVisible = true
+          }
+        },
+        {
+          label: '打开更新助手',
+          type: 'checkbox',
+          checked: _this.$db.get('picBed.showUpdateTip').value(),
+          click () {
+            const value = _this.$db.read().get('picBed.showUpdateTip').value()
+            _this.$db.read().set('picBed.showUpdateTip', !value).write()
+          }
         }
       ]
       this.menu = Menu.buildFromTemplate(template)
     },
     openDialog () {
       this.menu.popup(remote.getCurrentWindow)
+    },
+    keyDetect (type, event) {
+      this.shortKey[type] = keyDetect(event).join('+')
+    },
+    cancelKeyBinding () {
+      this.keyBindingVisible = false
+      this.shortKey = db.read().get('shortKey').value()
+    },
+    confirmKeyBinding () {
+      const oldKey = db.read().get('shortKey').value()
+      db.read().set('shortKey', this.shortKey).write()
+      this.keyBindingVisible = false
+      this.$electron.ipcRenderer.send('updateShortKey', oldKey)
+    },
+    cancelCustomLink () {
+      this.customLinkVisible = false
+      this.customLink.value = db.read().get('customLink').value() || '$url'
+    },
+    confirmCustomLink () {
+      this.$refs.customLink.validate((valid) => {
+        if (valid) {
+          db.read().set('customLink', this.customLink.value).write()
+          this.customLinkVisible = false
+          this.$electron.ipcRenderer.send('updateCustomLink')
+        } else {
+          return false
+        }
+      })
     }
   },
   beforeRouteEnter: (to, from, next) => {
@@ -128,6 +288,23 @@ export default {
     font-size 12px
     line-height h
     position fixed
+    z-index 100
+    .handle-bar
+      position absolute
+      top 2px
+      right 4px
+      width 40px
+      z-index 10000
+      -webkit-app-region no-drag
+      i
+        cursor pointer
+        font-size 16px
+      .el-icon-minus
+        &:hover
+          color #409EFF
+      .el-icon-close
+        &:hover
+          color #F15140
   .picgo-sidebar
     height calc(100vh - 22px)
   .el-menu
@@ -160,9 +337,18 @@ export default {
           right 0
           top 18px
           background active-color
+  .main-content
+    padding-top 22px
+    position relative
+    z-index 10
+  .el-dialog__body 
+    padding 20px
   .support
     text-align center
     &-title
       text-align center
       color #878d99
+  .align-center
+    input
+      text-align center
 </style>

src/renderer/components/SettingView/Qiniu.vue

@@ -58,8 +58,16 @@
             >
             <el-input v-model="form.options" @keyup.native.enter="confirm" placeholder="例如?imageslim"></el-input>
           </el-form-item>
+          <el-form-item
+            label="指定存储路径"
+            >
+            <el-input v-model="form.path" @keyup.native.enter="confirm" placeholder="例如img/"></el-input>
+          </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="confirm">确定</el-button>
+            <el-button-group>
+              <el-button type="primary" @click="confirm" round>确定</el-button>
+              <el-button type="success" @click="setDefaultPicBed('qiniu')" round :disabled="defaultPicBed === 'qiniu'">设为默认图床</el-button>
+            </el-button-group>
           </el-form-item>
         </el-form>
       </el-col>
@@ -79,7 +87,8 @@ export default {
         bucket: '',
         url: '',
         area: 'z0',
-        options: ''
+        options: '',
+        path: ''
       }
     }
   },
@@ -122,11 +131,10 @@ export default {
       line-height 22px
       padding-bottom 0
       color #eee
-    .el-button
-      width 100%
-      border-radius 19px
     .el-input__inner
       border-radius 19px
+    &-item
+      margin-bottom 10.5px
   .el-radio-group
     width 100%
     label

src/renderer/components/SettingView/TcYun.vue

@@ -56,8 +56,16 @@
             >
             <el-input v-model="form.path" @keyup.native.enter="confirm" placeholder="例如img/"></el-input>
           </el-form-item>
+          <el-form-item
+            label="设定自定义域名"
+            >
+            <el-input v-model="form.customUrl" @keyup.native.enter="confirm" placeholder="例如https://xxxx.com"></el-input>
+          </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="confirm">确定</el-button>
+            <el-button-group>
+              <el-button type="primary" @click="confirm" round>确定</el-button>
+              <el-button type="success" @click="setDefaultPicBed('tcyun')" round :disabled="defaultPicBed === 'tcyun'">设为默认图床</el-button>
+            </el-button-group>
           </el-form-item>
         </el-form>
       </el-col>
@@ -77,7 +85,8 @@ export default {
         bucket: '',
         appId: '',
         area: '',
-        path: ''
+        path: '',
+        customUrl: ''
       }
     }
   },
@@ -120,11 +129,10 @@ export default {
       line-height 22px
       padding-bottom 0
       color #eee
-    .el-button
-      width 100%
-      border-radius 19px
     .el-input__inner
       border-radius 19px
+    &-item
+      margin-bottom 10.5px
   .el-radio-group
     width 100%
     label

src/renderer/components/SettingView/UpYun.vue

@@ -48,8 +48,16 @@
             >
             <el-input v-model="form.options" @keyup.native.enter="confirm" placeholder="例如!imgslim"></el-input>
           </el-form-item>
+          <el-form-item
+            label="指定存储路径"
+            >
+            <el-input v-model="form.path" @keyup.native.enter="confirm" placeholder="例如img/"></el-input>
+          </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="confirm">确定</el-button>
+            <el-button-group>
+              <el-button type="primary" @click="confirm" round>确定</el-button>
+              <el-button type="success" @click="setDefaultPicBed('upyun')" round :disabled="defaultPicBed === 'upyun'">设为默认图床</el-button>
+            </el-button-group>
           </el-form-item>
         </el-form>
       </el-col>
@@ -67,7 +75,8 @@ export default {
         bucket: '',
         operator: '',
         password: '',
-        options: ''
+        options: '',
+        path: ''
       }
     }
   },
@@ -110,9 +119,6 @@ export default {
       line-height 22px
       padding-bottom 0
       color #eee
-    .el-button
-      width 100%
-      border-radius 19px
     .el-input__inner
       border-radius 19px
   .el-radio-group

src/renderer/components/SettingView/Upload.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="upload-view">
     <el-row :gutter="16">
-      <el-col :span="16" :offset="4">
+      <el-col :span="20" :offset="2">
         <div class="view-title">
           图片上传
         </div>
@@ -25,19 +25,28 @@
           :status="showError ? 'exception' : ''"
         ></el-progress>
         <div class="paste-style">
-          <div class="paste-style__text">
-            链接格式
+          <div class="el-col-16">
+            <div class="paste-style__text">
+              链接格式
+            </div>
+            <el-radio-group v-model="pasteStyle" size="mini"
+              @change="handlePasteStyleChange"
+            >
+              <el-radio-button label="markdown">
+                Markdown
+              </el-radio-button>
+              <el-radio-button label="HTML"></el-radio-button>
+              <el-radio-button label="URL"></el-radio-button>
+              <el-radio-button label="UBB"></el-radio-button>
+              <el-radio-button label="Custom" title="自定义"></el-radio-button>
+            </el-radio-group>
+          </div>
+          <div class="el-col-8">
+            <div class="paste-style__text">
+              快捷上传
+            </div>
+            <el-button type="primary" round size="mini" @click="uploadClipboardFiles">剪贴板图片上传</el-button>
           </div>
-          <el-radio-group v-model="pasteStyle" size="mini"
-            @change="handlePasteStyleChange"
-          >
-            <el-radio-button label="markdown">
-              Markdown
-            </el-radio-button>
-            <el-radio-button label="HTML">          </el-radio-button>
-            <el-radio-button label="URL">           </el-radio-button>
-            <el-radio-button label="UBB">            </el-radio-button>
-          </el-radio-group>
         </div>
       </el-col>
     </el-row>
@@ -114,6 +123,9 @@ export default {
     handlePasteStyleChange (val) {
       this.$db.read().set('picBed.pasteStyle', val)
         .write()
+    },
+    uploadClipboardFiles () {
+      this.$electron.ipcRenderer.send('uploadClipboardFilesFromUploadPage')
     }
   }
 }
@@ -130,6 +142,8 @@ export default {
     border 2px dashed #dddddd
     border-radius 8px
     text-align center
+    width 450px
+    margin-left 25px
     color #dddddd
     cursor pointer
     transition all .2s ease-in-out
@@ -152,6 +166,8 @@ export default {
     margin-top 20px
     opacity 0
     transition all .2s ease-in-out
+    width 450px
+    margin-left 25px
     &.show
       opacity 1
     .el-progress-bar__inner

src/renderer/components/SettingView/Weibo.vue

@@ -1,30 +1,47 @@
 <template>
   <div id="weibo-view">
     <el-row :gutter="16">
-      <el-col :span="12" :offset="6">
+      <el-col :span="16" :offset="4">
         <div class="view-title">
           微博图床设置
         </div>
         <el-form 
           ref="weiboForm"
-          label-position="top"
-          label-width="80px"
+          label-position="right"
+          label-width="120px"
+          size="small"
           :model="form">
           <el-form-item
             label="设定用户名"
             prop="username"
             :rules="{
-              required: true, message: '用户名不能为空', trigger: 'blur'
+              required: !chooseCookie, message: '用户名不能为空', trigger: 'blur'
             }">
-            <el-input v-model="form.username" placeholder="用户名" @keyup.native.enter="confirm('weiboForm')"></el-input>
+            <el-input v-model="form.username" placeholder="用户名" @keyup.native.enter="confirm('weiboForm')" :disabled="chooseCookie"></el-input>
           </el-form-item>
           <el-form-item
             label="设定密码"
             prop="password"
+            :rules="{required: !chooseCookie,messsage: '密码不能为空',trigger: 'blur'}">
+            <el-input v-model="form.password" type="password" @keyup.native.enter="confirm('weiboForm')" placeholder="密码" :disabled="chooseCookie"></el-input>
+          </el-form-item>
+          <el-form-item
+            label="使用Cookie上传"
+          >
+            <el-switch
+              v-model="chooseCookie"
+              active-text="cookie模式"
+              @change="handleSwitchChange"
+            ></el-switch>
+            <i class="el-icon-question" @click="openWiki"></i>
+          </el-form-item>
+          <el-form-item
+            label="设定Cookie"
+            prop="cookie"
             :rules="{
-              required: true, message: '密码不能为空', trigger: 'blur'
+              required: chooseCookie, message: '密码不能为空', trigger: 'blur'
             }">
-            <el-input v-model="form.password" type="password" @keyup.native.enter="confirm('weiboForm')" placeholder="密码"></el-input>
+            <el-input v-model="form.cookie" @keyup.native.enter="confirm('weiboForm')" placeholder="Cookie" :disabled="!chooseCookie"></el-input>
           </el-form-item>
           <el-form-item label="* 图片质量">
             <el-radio-group v-model="quality">
@@ -34,7 +51,10 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="confirm('weiboForm')" round>确定</el-button>
+            <el-button-group>
+              <el-button type="primary" @click="confirm('weiboForm')" round>确定</el-button>
+              <el-button type="success" @click="setDefaultPicBed('weibo')" round :disabled="defaultPicBed === 'weibo'">设为默认图床</el-button>
+            </el-button-group>
           </el-form-item>
         </el-form>
       </el-col>
@@ -50,8 +70,10 @@ export default {
     return {
       form: {
         username: '',
-        password: ''
+        password: '',
+        cookie: ''
       },
+      chooseCookie: false,
       quality: 'large'
     }
   },
@@ -61,6 +83,8 @@ export default {
       this.form.username = config.username
       this.form.password = config.password
       this.quality = config.quality || 'large'
+      this.form.cookie = config.cookie
+      this.chooseCookie = config.chooseCookie
     }
   },
   methods: {
@@ -70,7 +94,9 @@ export default {
           this.$db.read().set('picBed.weibo', {
             username: this.form.username,
             password: this.form.password,
-            quality: this.quality
+            quality: this.quality,
+            cookie: this.form.cookie,
+            chooseCookie: this.chooseCookie
           }).write()
           const successNotification = new window.Notification('设置结果', {
             body: '设置成功'
@@ -82,6 +108,12 @@ export default {
           return false
         }
       })
+    },
+    handleSwitchChange () {
+      this.$refs['weiboForm'].resetFields()
+    },
+    openWiki () {
+      this.$electron.remote.shell.openExternal('https://github.com/Molunerfinn/PicGo/wiki/%E8%AF%A6%E7%BB%86%E7%AA%97%E5%8F%A3%E7%9A%84%E4%BD%BF%E7%94%A8#%E5%BE%AE%E5%8D%9A%E5%9B%BE%E5%BA%8A')
     }
   }
 }
@@ -100,10 +132,25 @@ export default {
       line-height 22px
       padding-bottom 0
       color #eee
-    .el-button
+    .el-button-group
       width 100%
+      .el-button
+        width 50%
     .el-input__inner
       border-radius 19px
     .el-radio-group
       margin-left 25px
+    .el-switch__label
+      color #eee
+      &.is-active
+        color #409EFF
+    .el-icon-question
+      font-size 20px
+      float right
+      margin-top 9px
+      color #eee
+      cursor pointer
+      transition .2s color ease-in-out
+      &:hover
+        color #409EFF
 </style>

src/renderer/components/mixin.js

@@ -1,7 +1,13 @@
+import db from '../../datastore'
 export default {
   mounted () {
     this.disableDragEvent()
   },
+  data () {
+    return {
+      defaultPicBed: db.read().get('picBed.current').value()
+    }
+  },
   methods: {
     disableDragEvent () {
       window.addEventListener('dragenter', this.disableDrag, false)
@@ -15,6 +21,17 @@ export default {
         e.dataTransfer.effectAllowed = 'none'
         e.dataTransfer.dropEffect = 'none'
       }
+    },
+    setDefaultPicBed (type) {
+      db.read().set('picBed.current', type).write()
+      this.defaultPicBed = type
+      this.$electron.ipcRenderer.send('updateDefaultPicBed')
+      const successNotification = new window.Notification('设置默认图床', {
+        body: '设置成功'
+      })
+      successNotification.onclick = () => {
+        return true
+      }
     }
   },
   beforeDestroy () {

src/renderer/utils/key-binding.js

@@ -0,0 +1,38 @@
+import keycode from 'keycode'
+
+const isSpecialKey = (keyCode) => {
+  const keyArr = [
+    16, // Shift
+    17, // Ctrl
+    18, // Alt
+    91, // Left Meta
+    93 // Right Meta
+  ]
+
+  return keyArr.includes(keyCode)
+}
+
+const keyDetect = (event) => {
+  const meta = process.platform === 'darwin' ? 'Cmd' : 'Super'
+  let specialKey = {
+    Ctrl: event.ctrlKey,
+    Shift: event.shiftKey,
+    Alt: event.altKey
+  }
+  specialKey[meta] = event.metaKey
+
+  let pressKey = []
+
+  for (let i in specialKey) {
+    if (specialKey[i]) {
+      pressKey.push(i)
+    }
+  }
+
+  if (!isSpecialKey(event.keyCode)) {
+    pressKey.push(keycode(event.keyCode).toUpperCase())
+  }
+  return pressKey
+}
+
+export default keyDetect

yarn.lock

@@ -3556,6 +3556,10 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
+fecha@^2.3.3:
+  version "2.3.3"
+  resolved "http://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
+
 figures@^1.4.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
@@ -4884,6 +4888,10 @@ keyboardevents-areequal@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
 
+keycode@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa"
+
 keypress@0.1.x:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz#4a3188d4291b66b4f65edb99f806aa9ae293592a"