liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

转码

This commit is contained in:
luchenqun 2018-10-12 12:39:45 +08:00
parent 144b9bfe50
commit 2eddeb2035
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
database/db.js
View File

@ -1187,7 +1187,6 @@ db.getNote = function(id) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
console.log(result[0].public);
if(result.length > 0) { if(result.length > 0) {
result[0].public == 1 ? resolve(result[0].content) : resolve("提示：备忘处于私密状态！"); result[0].public == 1 ? resolve(result[0].content) : resolve("提示：备忘处于私密状态！");
} else { } else {

3
routes/api.js
View File

@ -1233,10 +1233,9 @@ api.getFaviconByTimer = function() {
if (bookmarks.length == 1) { if (bookmarks.length == 1) {
var id = bookmarks[0].id; var id = bookmarks[0].id;
var faviconState = bookmarks[0].favicon_state; var faviconState = bookmarks[0].favicon_state;
var url = bookmarks[0].url; var url = encodeURI(bookmarks[0].url);
var faviconPath = './public/images/favicon/' + id + '.ico'; var faviconPath = './public/images/favicon/' + id + '.ico';
var defaultFile = './public/images/favicon/default.ico'; var defaultFile = './public/images/favicon/default.ico';
console.log("getBookmarkWaitFavicon url:" + url);
if (!/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(url)) { if (!/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(url)) {
copyFile(defaultFile, faviconPath); copyFile(defaultFile, faviconPath);