From b62bfa0844e5d231aed33ebc2d63e1fec794aed8 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Wed, 8 Feb 2017 17:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=87=AA=E5=B7=B1=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=9A=84=E6=89=8D=E6=9B=B4=E6=96=B0=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/db.js                                  | 4 ++--
 public/scripts/controllers/search-controller.js | 2 +-
 routes/api.js                                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/database/db.js b/database/db.js
index a391f02..d6df30a 100644
--- a/database/db.js
+++ b/database/db.js
@@ -152,8 +152,8 @@ db.updateLastUseTags = function(user_id, tags) {
     });
 }
 
-db.clickBookmark = function(id) {
-    var sql = "UPDATE `bookmarks` SET `click_count`=`click_count`+1, `last_click`=now() WHERE (`id`='" + id + "')";
+db.clickBookmark = function(id, user_id) {
+    var sql = "UPDATE `bookmarks` SET `click_count`=`click_count`+1, `last_click`=now() WHERE (`id`='" + id + "') AND (`user_id`='" + user_id + "')";
     return new Promise(function(resolve, reject) {
         client.query(sql, (err, result) => {
             if (err) {
diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js
index 72ca12e..36c6723 100644
--- a/public/scripts/controllers/search-controller.js
+++ b/public/scripts/controllers/search-controller.js
@@ -46,7 +46,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
 
     $scope.jumpToUrl = function(url, id) {
         if (!$scope.edit) {
-            $window.open(url, '_blank');
+            $window.open(url);
             bookmarkService.clickBookmark({
                 id: id
             });
diff --git a/routes/api.js b/routes/api.js
index ce7f34b..7686251 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -14,7 +14,7 @@ api.post('/logout', function(req, res) {
 });
 
 api.post('/clickBookmark', function(req, res) {
-    db.clickBookmark(req.body.params.id)
+    db.clickBookmark(req.body.params.id, req.session.userId)
         .then((affectedRows) => res.json({}))
         .catch((err) => console.log('clickBookmark error', err));
 });