From e8becc4fa4ec402b31bd24138156b3c9d94bff85 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Wed, 22 Feb 2017 09:23:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=88=AA=E5=9B=BE=E4=B8=8E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E7=8A=B6=E6=80=81=E6=98=AF=E5=90=A6=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- database/db.js | 15 +++++++++++++++ routes/api.js | 29 +++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/app.js b/app.js index 120becc..463c2f2 100644 --- a/app.js +++ b/app.js @@ -75,7 +75,7 @@ app.use(function(err, req, res, next) { error: {} }); }); - +api.checkSnapState(); api.getSnapByTimer(); module.exports = app; diff --git a/database/db.js b/database/db.js index a606b3d..fcf53fa 100644 --- a/database/db.js +++ b/database/db.js @@ -561,6 +561,21 @@ db.getTagsBookmarks = function(bookmark_ids) { }); } +db.getBookmarks = function() { + var sql = "SELECT id, snap_state FROM `bookmarks`"; // 如果是空的,那查一个不存在的就行了。 + console.log('getBookmarks', sql); + + return new Promise(function(resolve, reject) { + client.query(sql, (err, result) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }); + }); +} + db.getBookmarkWaitSnap = function(today) { var todayNotSnap = today + 31; var sql = "SELECT id, url, snap_state FROM `bookmarks` WHERE `snap_state`>=0 AND `snap_state` <= 64 AND snap_state != " + todayNotSnap + " ORDER BY created_at DESC LIMIT 0, 1"; diff --git a/routes/api.js b/routes/api.js index da737e8..66a2055 100644 --- a/routes/api.js +++ b/routes/api.js @@ -527,13 +527,13 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) { var tags = []; item.tags.forEach((tag) => { - allTags.forEach((at) => { - if (at.name == tag) { - tags.push(at.id); - } + allTags.forEach((at) => { + if (at.name == tag) { + tags.push(at.id); + } + }) }) - }) - // 插入书签 + // 插入书签 db.addBookmark(userId, bookmark) // 插入书签 .then((bookmark_id) => { db.delBookmarkTags(bookmark_id); // 不管3721,先删掉旧的分类 @@ -617,6 +617,23 @@ api.post('/getTitle', function(req, response) { }); }) +api.checkSnapState = function() { + db.getBookmarks() + .then((bookmarks) => { + bookmarks.forEach(bookmark => { + var id = bookmark.id; + var snap_state = bookmark.snap_state; + var finePath = './public/images/snap/' + id + '.png' + fs.exists(finePath, function(exists) { + if (!exists && snap_state == -1) { + db.updateBookmarkSnapState(id, 0); + } + }); + }) + }) + .catch((err) => console.log('getBookmarks err', err)); +} + api.getSnapByTimer = function() { console.log('getSnapByTimer...........'); var timeout = 5000