diff --git a/data/version b/data/version index a051966f..fd3e5013 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -{"version":"2.3","updatedTime":"2017-01-20T07:21:51.505Z"} \ No newline at end of file +{"version":"2.4","updatedTime":"2017-02-10T07:21:51.505Z"} \ No newline at end of file diff --git a/node_modules/file.js b/node_modules/file.js index bb9c771e..6e09385b 100644 --- a/node_modules/file.js +++ b/node_modules/file.js @@ -11,6 +11,12 @@ var Images = dbClient.images; var Attachs = db.attachs; var Web = require('web'); +// timeout 0无限等待, 60,000 1分钟 +needle.defaults({ + timeout: 60000, + rejectUnauthorized: false +}); + function log(o) { console.trace(o); } @@ -676,6 +682,17 @@ var File = { }); } else { + if (url.indexOf('https://leanote.com') == 0) { + needle.defaults({ + timeout: 60000, + rejectUnauthorized: true + }); + } else { + needle.defaults({ + timeout: 60000, + rejectUnauthorized: false + }); + } // 远程的图片 needle.get(src, function(err, resp) { // console.log(resp); diff --git a/public/js/app/note.js b/public/js/app/note.js index 77635e50..13b3599e 100644 --- a/public/js/app/note.js +++ b/public/js/app/note.js @@ -1108,15 +1108,15 @@ Note._getNoteHtmlObjct = function(note, isShared) { tmp = tt(Note.getItemTplNoImg(), classes, this.newNoteSeq(), note.NoteId, note.Title || getMsg('UnTitled'), Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc); } // blog ? + var $tmp = $(tmp); if (!note.IsBlog) { - tmp = $(tmp); - tmp.removeClass('item-b'); + $tmp.removeClass('item-b'); } else { - tmp.addClass('item-b'); + $tmp.addClass('item-b'); } // star ? if (note.Star) { - $(tmp).addClass('item-is-star'); + $tmp.addClass('item-is-star'); } return tmp;