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

修复插入书签有单引号的问题

This commit is contained in:
luchenqun 2017-03-23 20:18:42 +08:00
parent 35db0fe725
commit 2630a16ae6
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
database/db.js
View File

@ -62,30 +62,37 @@ var db = {
// }
// });
db.addBookmark = function(user_id, bookmark) {
var insertSql = "INSERT INTO `bookmarks` (`user_id`, `title`, `description`, `url`, `public`, `click_count`) VALUES ('" + user_id + "', '" + bookmark.title + "', " + client.escape(bookmark.description) + ", '" + bookmark.url + "', '" + bookmark.public + "', '1')";
var selectSql = "SELECT * FROM `bookmarks` WHERE `user_id` = '" + user_id + "' AND `url` = '" + bookmark.url + "'"
db.getBookmarkbyUrl = function(user_id, url) {
var sql = "SELECT * FROM `bookmarks` WHERE `user_id` = '" + user_id + "' AND `url` = '" + url + "'"
return new Promise(function(resolve, reject) {
client.query(selectSql, (err, result) => {
client.query(sql, (err, result) => {
if (err) {
reject(err);
} else {
if (result.length >= 1) {
resolve(result[0].id);
} else {
client.query(insertSql, (err, result) => {
if (err) {
reject(err);
} else {
resolve(result.insertId);
}
});
resolve(null);
}
}
});
});
};
db.addBookmark = function(user_id, bookmark) {
var sql = "INSERT INTO `bookmarks` (`user_id`, `title`, `description`, `url`, `public`, `click_count`) VALUES ('" + user_id + "', " + client.escape(bookmark.title) + ", " + client.escape(bookmark.description) + ", " + client.escape(bookmark.url) + ", '" + bookmark.public + "', '1')";
console.log(sql);
return new Promise(function(resolve, reject) {
client.query(sql, (err, result) => {
if (err) {
reject(err);
} else {
resolve(result.insertId);
}
});
});
};
db.delBookmark = function(id) {
var sql = "DELETE FROM `bookmarks` WHERE (`id`='" + id + "')";
return new Promise(function(resolve, reject) {

1
public/scripts/controllers/edit-controller.js
View File

@ -107,6 +107,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'bookmar
toastr.error('书签标题不能为空！', "错误");
return;
}
console.log("add bookmark", params);
if ($scope.add) {
bookmarkService.addBookmark(params)
.then((data) => {

18
routes/api.js
View File

@ -694,7 +694,11 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) {
})
})
// 插入书签
db.addBookmark(userId, bookmark) // 插入书签
db.getBookmarkbyUrl(userId, bookmark.url)
.then((bookmarkId) => {
// 如果这个url的书签存在了，那么直接返回书签，否则返回插入的书签
return bookmarkId ? Promise.resolve(bookmarkId) : db.addBookmark(userId, bookmark);
})
.then((bookmark_id) => {
db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类
return bookmark_id;
@ -727,7 +731,11 @@ api.post('/addBookmark', function(req, res) {
var tags = bookmark.tags;
var bookmarkId = -1;
var ret = {};
db.addBookmark(userId, bookmark) // 插入书签
db.getBookmarkbyUrl(userId, bookmark.url)
.then((bookmarkId) => {
// 如果这个url的书签存在了，那么直接返回书签，否则返回插入的书签
return bookmarkId ? Promise.resolve(bookmarkId) : db.addBookmark(userId, bookmark);
})
.then((bookmark_id) => {
db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类
bookmarkId = bookmark_id;
@ -758,7 +766,11 @@ api.post('/favoriteBookmark', function(req, res) {
var bookmarkId = -1;
var ret = {};
db.addBookmark(userId, bookmark) // 插入书签
db.getBookmarkbyUrl(userId, bookmark.url)
.then((bookmarkId) => {
// 如果这个url的书签存在了，那么直接返回书签，否则返回插入的书签
return bookmarkId ? Promise.resolve(bookmarkId) : db.addBookmark(userId, bookmark);
})
.then((bookmark_id) => {
db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类
bookmarkId = bookmark_id;