fix get cookie; fix cnblogs

Author: Martin

src/blog/cnblogs.js

@@ -5,9 +5,10 @@ const jsdom = require("jsdom");
 const querystring = require('querystring');
 const FormData = require('form-data');
 const fs = require('fs');
-const { Console } = require('console');
+const {Console} = require('console');
 const axios = require('axios')
-const { session } = require('electron')
+const {session} = require('electron')
+
 //上传图片到博客园
 function uploadPictureToCnBlogs(filePath) {
     return new Promise((resolve, reject) => {
@@ -29,8 +30,8 @@ function uploadPictureToCnBlogs(filePath) {
         }, function (res) {
             let str = '';
             res.on('data', function (buffer) {
-                str += buffer;//用字符串拼接
-            }
+                    str += buffer;//用字符串拼接
+                }
             );
             res.on('end', () => {
                 if (res.statusCode === 200) {
@@ -80,35 +81,68 @@ function publishArticleToCnBlogs(title, content, isPublish) {
 }
 
 function publishArticleToCnBlogFact(title, content, resolve,
-    reject, isPublish) {
-    let params = {
+                                    reject, isPublish) {
+    const params = {
         "id": null,
         "postType": 1,
+        "accessPermission": 0,
         "title": title,
+        "url": null,
         "postBody": content,
+        "categoryIds": null,
+        "inSiteCandidate": false,
+        "inSiteHome": false,
+        "siteCategoryId": null,
+        "blogTeamIds": null,
+        "isPublished": true,
+        "displayOnHomePage": true,
+        "isAllowComments": true,
+        "includeInMainSyndication": true,
+        "isPinned": false,
+        "isOnlyForRegisterUser": false,
+        "isUpdateDateAdded": false,
+        "entryName": null,
+        "description": null,
+        "featuredImage": null,
+        "tags": null,
+        "password": null,
+        "datePublished": new Date(),
+        "isMarkdown": true,
+        "isDraft": true,
+        "autoDesc": null,
+        "changePostType": false,
+        "blogId": 0,
+        "author": null,
+        "removeScript": false,
+        "clientInfo": null,
+        "changeCreatedTime": false,
+        "canChangeCreatedTime": false,
+        "isContributeToImpressiveBugActivity": false
     }
     axios({
         method: 'post',
         url: 'https://i.cnblogs.com/api/posts',
         data: JSON.stringify(params),
         headers: {
-            "Accept-Language": "zh-CN,zh;q=0.8,en-US;q=0.5,en;q=0.3",
-            'Referer': 'https://i.cnblogs.com',
-            'Accept': '*/*',
-            'Origin': 'https://i.cnblogs.com',
-            'Content-Type': 'application/json',
-            'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0',
-            'Cookie': dataStore.getCnBlogCookies(),
+            "accept-language": "zh-CN,zh;q=0.8,en-US;q=0.5,en;q=0.3",
+            'referer': 'https://i.cnblogs.com',
+            'accept': '*/*',
+            'origin': 'https://i.cnblogs.com',
+            'content-type': 'application/json',
+            'user-agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0',
+            'cookie': dataStore.getCnBlogCookies(),
             'x-xsrf-token': dataStore.GetCnblogsToken()
         }
     }).then(res => {
-        if (res.status == 200) {
+        if (res.status === 200) {
             resolve(res.data.url)
         }
         // console.log(res)
-    }).catch(res => {
-        reject('发布失败！\n1.文章标题已存在\n2.尚未登录博客园\n3.发布频繁请稍后再试\n4.超过当日100篇限制')
-
+    }).catch(reason => {
+        reject('发布失败！\n' + JSON.stringify(reason.response.data))
+        console.log("cookie: " + dataStore.getCnBlogCookies())
+        console.log('x-xsrf-token: ' + dataStore.GetCnblogsToken())
+        console.log(reason.response.data)
     })
 
 

src/cookie/app-login.js

@@ -1,4 +1,4 @@
-const { BrowserWindow, session } = require('electron');
+const {BrowserWindow, session} = require('electron');
 const https = require('https');
 const jsDom = require("jsdom");
 const icon = require('../common/app-icon');
@@ -8,33 +8,25 @@ const dataStore = new DataStore();
 //登录某网站获取Cookie通用方法
 function getSiteCookie(url, callback) {
     let win = new BrowserWindow(
-        { width: 700, height: 600, icon: icon.iconFile, title: '【登陆成功后关闭窗口即可完成设置】' });
+        {width: 700, height: 600, icon: icon.iconFile, title: '【登陆成功后关闭窗口即可完成设置】'});
     win.loadURL(url).then();
     win.on('close', () => {
         // 查询所有与设置的 URL 相关的所有 cookies.
-        if (url == 'https://www.cnblogs.com/') {
-            url = '.cnblogs.com'
-        } else if (url == 'https://blog.csdn.net/') {
-            url = '.csdn.net'
-        } else if (url.indexOf('jianshu') != -1) {
-            url = '.jianshu.com'
-        } else if (url.indexOf('oschina') != -1) {
-            url = '.oschina.net'
-        }
-        session.defaultSession.cookies.get({ domain: url })
+        session.defaultSession.cookies.get({url: url})
             .then((cookies) => {
                 let cookieString = '';
                 for (let cookie of cookies) {
-                    if (cookie.name == 'XSRF-TOKEN') {
+                    if (cookie.name === 'XSRF-TOKEN') {
                         dataStore.SetCnblogsToken(cookie.value)
                     }
                     cookieString += cookie.name + '=' + cookie.value + '; '
                 }
+                console.log("cookie: " + cookieString.trim())
                 callback(cookieString.trim())
-            }).catch((error) => {
+            })
+            .catch((error) => {
                 console.log(error)
-            });
-
+            })
         win = null
     });
     win.on('page-title-updated', (e) => {
@@ -53,7 +45,7 @@ exports.loginWebBoPicture = loginWebBoPicture;
 
 // 登录博客园
 const loginCnBlog = function (item, focusedWindow, event) {
-    getSiteCookie('https://www.cnblogs.com/', (cookie) => {
+    getSiteCookie('https://i.cnblogs.com/', (cookie) => {
         dataStore.setCnBlogCookie(cookie)
     })
 };