修复登陆，再更加保险一点

zythum · Feb 17, 2018 · 4c48128 · 4c48128
1 parent f927156
commit 4c48128
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "weibotuchuang",
   "productName": "围脖是个好图床",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "围脖是个好图床",
   "main": "src/main.js",
   "scripts": {

diff --git a/src/main.js b/src/main.js
@@ -119,6 +119,7 @@ function doUpload (cookies, files) {
             weiboLogin((err, cookies) => {
               storage.set('weibo_cookies', cookies)
               updateMenu()
+              doUpload(cookies, files)
             })
           })
           return
@@ -415,6 +416,7 @@ function updateMenu () {
         weiboLogin((err, cookies) => {
           storage.set('weibo_cookies', cookies)
           updateMenu()
+          notify('微博已登陆成功!', { body: '上传图片请拖拽图片到菜单栏图片' })
         })
       }
     })

diff --git a/src/weiboLogin.js b/src/weiboLogin.js
@@ -3,7 +3,7 @@ const { URL } = require('url')
 const { noop, md5 } = require('./utils')
 
 const WEIBO_BASE = 'https://weibo.com'
-const SUCCESS_URL = '/weibo_is_a_good_image_bed'
+const SUCCESS_URL = '/aj/static/weibo_is_a_good_image_bed.html'
 const LOGIN_URL = '/aj/static/upimgback.html'
 
 const cookieString = cookies => {
@@ -122,7 +122,7 @@ const INSERT_CSS = `
 const EXECUTE_JAVASCRIPT = `;(function () {
   var help = document.createElement('div')
   help.className = 'help'
-  help.innerHTML = '微博登陆加载中...'
+  help.innerHTML = '微博登陆组件加载中...'
   help.onclick = doLogin
   document.body.insertBefore(help, document.body.firstChild)
 
@@ -151,7 +151,7 @@ const EXECUTE_JAVASCRIPT = `;(function () {
       loginSuccessUrl: '${WEIBO_BASE + SUCCESS_URL}'
     });
     setTimeout(function () {
-      help.innerHTML = '<a href="javascropt:;">点击我，完成微博登陆</a>'
+      help.innerHTML = '<a href="javascropt:;">点击我，完成微博登陆</a>';
     }, 1000);
   }
 }());`