From 6b9969116fe01d0ed88b78dd7b3ffc19e9d0bacd Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Sun, 12 Feb 2017 20:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=8B=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=85=A8=E7=AB=99=E4=B9=A6=E7=AD=BE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/db.js                                | 33 ++++++++++++++-----
 .../scripts/controllers/search-controller.js  |  2 +-
 public/views/home.html                        |  1 +
 routes/api.js                                 | 24 +++++++++-----
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/database/db.js b/database/db.js
index 56568c6..0d62c9a 100644
--- a/database/db.js
+++ b/database/db.js
@@ -31,15 +31,15 @@ client.connect();
 // update delete 返回影响的行数
 var db = {
 
-    }
-    // var sql = "SELECT * FROM `users` WHERE `username` = 'luchenqun'";
-    // client.query(sql, (err, result) => {
-    //     if (err) {
-    //         console.log(err);
-    //     } else {
-    //         console.log(result);
-    //     }
-    // });
+}
+// var sql = "SELECT * FROM `users` WHERE `username` = 'luchenqun'";
+// client.query(sql, (err, result) => {
+//     if (err) {
+//         console.log(err);
+//     } else {
+//         console.log(result);
+//     }
+// });
 
 db.addBookmark = function(user_id, bookmark) {
     var insertSql = "INSERT INTO `bookmarks` (`user_id`, `title`, `description`, `url`, `public`, `click_count`) VALUES ('" + user_id + "', '" + bookmark.title + "', '" + bookmark.description + "', '" + bookmark.url + "', '" + bookmark.public + "', '1')";
@@ -290,6 +290,21 @@ db.getTags = function(user_id) {
     });
 };
 
+db.getTagsByIds = function(tagIds) {
+    var sql = "SELECT * FROM `tags` WHERE id in(" + (tagIds.toString() || ("-1")) + ") GROUP BY id"; // 如果是空的，那查一个不存在的就行了。
+    console.log('db getTagsByIds = ', sql);
+
+    return new Promise(function(resolve, reject) {
+        client.query(sql, (err, result) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(result);
+            }
+        });
+    });
+}
+
 db.getAdvices = function(params) {
     console.log('getAdvices');
     var sql = "SELECT mod(CEIL(RAND()*100), 5) as head_id, a.id, a.user_id, u.username, a.comment, a.category, DATE_FORMAT(a.created_at, '%Y-%m-%d %H:%i:%s') as created_at, a.state  FROM `advices` as a LEFT OUTER JOIN users as u ON a.user_id = u.id ORDER BY a.created_at DESC LIMIT 0, 100";
diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js
index 36c6723..911038f 100644
--- a/public/scripts/controllers/search-controller.js
+++ b/public/scripts/controllers/search-controller.js
@@ -37,6 +37,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
         searchWord: $scope.searchWord,
         currentPage: 1,
         perPageItems: perPageItems,
+        userRange: '1', // 默认搜索自己的书签
     }
     if ($scope.searchWord) {
         searchBookmarks(searchParams);
@@ -102,7 +103,6 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
             params.searchWord = $scope.searchWord;
         }
 
-
         var dateCreate = $('.js-create-date').dropdown('get value') || undefined;
         if (dateCreate) {
             if (dateCreate != 0) {
diff --git a/public/views/home.html b/public/views/home.html
index cf19724..bab635a 100644
--- a/public/views/home.html
+++ b/public/views/home.html
@@ -8,6 +8,7 @@
         <p>4、查阅不方便。一旦一个分类目录你收藏的过多，尼玛你在那个目录下面找起来想死的心都有。</p>
         <p>5、无法查看别人收藏的书签。</p>
         <p>6、在别人的电脑上无法查看我收藏的书签。</p>
+        <p>7、如果公用一台电脑，那么收藏夹里面会收藏其他人的网址。</p>
         <p>PS：注册在登录界面的右下角。</p>
         <h2 class="ui dividing header">主要功能(有好的功能，可以在留言里面进行留言)</h2>
         <p>1、需要注册账号用户。(初步完成)</p>
diff --git a/routes/api.js b/routes/api.js
index 280ad9f..0b4d6ef 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -390,8 +390,14 @@ api.get('/searchBookmarks', function(req, res) {
             }
         })
         .then((tbs) => {
-            tagsBookmarks = tbs;
-            return db.getTags(userId);
+            if (tbs.length > 0) {
+                var tagIds = tbs.map((tb) => tb.tag_id);
+                tagsBookmarks = tbs;
+                return db.getTagsByIds(tagIds);
+            } else {
+                res.json(sendData);
+                return Promise.reject('没有搜到到任何书签');
+            }
         })
         .then((tags) => {
             var data = [];
@@ -475,7 +481,7 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) {
 
     var file = req.file;
     res.json(file);
-    parseHtml(file.path, function(data){
+    parseHtml(file.path, function(data) {
         console.log(data);
         var bookmarks = data.bookmarks;
         var tagsName = data.tags;
@@ -520,13 +526,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，先删掉旧的分类