diff --git a/src/controller/api.js b/src/controller/api.js index 45261db..ed9e874 100644 --- a/src/controller/api.js +++ b/src/controller/api.js @@ -9,7 +9,7 @@ function md5(str) { module.exports = class extends Base { async __before() { - if (['register', 'login'].indexOf(this.ctx.action) >= 0) { + if (['userRegister', 'userLogin'].indexOf(this.ctx.action) >= 0) { return; } try { @@ -29,7 +29,7 @@ module.exports = class extends Base { } // 注册 - async registerAction() { + async userRegisterAction() { try { let post = this.post(); post.password = md5(post.password); // 进行密码加密 @@ -42,7 +42,7 @@ module.exports = class extends Base { } // 登陆 - async loginAction() { + async userLoginAction() { try { let post = this.post(); post.password = md5(post.password); // 进行密码加密 @@ -65,12 +65,12 @@ module.exports = class extends Base { } // 登出 - async logoutAction() { + async userLogoutAction() { await this.session(null); this.json({ code: 0, data: '', msg: "退出成功" }); } - async updateUserAction() { + async userUpdateAction() { let user = this.post(); try { let data = await this.model('users').where({ id: this.ctx.state.user.id }).update(user); @@ -80,7 +80,7 @@ module.exports = class extends Base { } } - async resetUserPwdAction() { + async userResetPwdAction() { let old = md5(this.post("old")); let password = md5(this.post("password")); @@ -98,10 +98,11 @@ module.exports = class extends Base { } // 通过session获取自己信息 - async ownAction() { + async userAction() { let full = this.get("full"); + let id = this.get("id"); if (full) { - let data = await this.model('users').where({ id: this.ctx.state.user.id }).find(); + let data = await this.model('users').where({ id: id || this.ctx.state.user.id }).find(); delete data.password; this.json({ code: 0, data, msg: '' }); } else { @@ -125,7 +126,7 @@ module.exports = class extends Base { this.json({ code: 0, data: tags, msg: '' }); } - async addTagAction() { + async tagAddAction() { let name = this.post().name; try { let res = await this.model("tags").add({ @@ -139,7 +140,7 @@ module.exports = class extends Base { } // 更新分类 - async updateTagAction() { + async tagUpdateAction() { let tag = this.post(); try { let data = await this.model('tags').where({ @@ -153,7 +154,7 @@ module.exports = class extends Base { } // 批量更新排序 - async updateTagSortAction() { + async tagSortAction() { let tags = this.post("tags"); try { let data = 0; @@ -171,7 +172,7 @@ module.exports = class extends Base { } // 删除分类 - async delTagAction() { + async tagDelAction() { let id = this.post("id"); let tagId = id; let userId = this.ctx.state.user.id; @@ -197,7 +198,7 @@ module.exports = class extends Base { } // 添加书签 - async addBookmarkAction() { + async bookmarkAddAction() { let bookmark = this.post(); bookmark.userId = this.ctx.state.user.id; try { @@ -223,7 +224,7 @@ module.exports = class extends Base { } // 删除书签 - async delBookmarkAction() { + async bookmarkDelAction() { let bookmark = this.post(); bookmark.userId = this.ctx.state.user.id; try { @@ -310,7 +311,7 @@ module.exports = class extends Base { } // 点击书签 - async clickBookmarkAction() { + async bookmarkClickAction() { let id = this.post("id"); try { let data = await this.model('bookmarks').where({ @@ -327,7 +328,7 @@ module.exports = class extends Base { } // 快速跳转到网页 - async shortcutBookmarkAction() { + async bookmarShortcutAction() { let url = this.post("url"); try { let bookmark = await this.model('bookmarks').where({ @@ -353,7 +354,7 @@ module.exports = class extends Base { } // 更新书签 - async updateBookmarkAction() { + async bookmarkUpdateAction() { let bookmark = this.post(); try { let data = await this.model('bookmarks').where({ @@ -366,7 +367,7 @@ module.exports = class extends Base { } } // 获取文章 - async getArticleAction() { + async articleAction() { let url = this.get("url"); async function readArticle(url) { return new Promise(function (resolve, reject) { @@ -399,7 +400,7 @@ module.exports = class extends Base { } } // 新增留言 - async addAdviceAction() { + async adviceAddAction() { let advice = this.post(); advice.userId = this.ctx.state.user.id; try { @@ -411,7 +412,7 @@ module.exports = class extends Base { } // 获取所有留言 - async getAdvicesAction() { + async advicesAction() { try { let data = await this.model("advices").order("createdAt DESC").select(); this.json({ code: 0, data }); @@ -421,7 +422,7 @@ module.exports = class extends Base { } // 新增 - async addNoteAction() { + async noteAddAction() { let note = this.post(); note.userId = this.ctx.state.user.id; try { @@ -433,11 +434,10 @@ module.exports = class extends Base { } // 更新备忘 - async updateNoteAction() { + async noteUpdateAction() { let note = this.post(); - note.userId = this.ctx.state.user.id; try { - let data = await this.model('bookmarks').where({ + let data = await this.model('notes').where({ userId: this.ctx.state.user.id, id: note.id }).update(note); @@ -448,7 +448,7 @@ module.exports = class extends Base { } // 更新 - async delNoteAction() { + async noteDelAction() { let note = this.post(); note.userId = this.ctx.state.user.id; try { diff --git a/view/index_index.html b/view/index_index.html index 2da8d19..51a79cb 100644 --- a/view/index_index.html +++ b/view/index_index.html @@ -70,7 +70,6 @@ - diff --git a/www/scripts/controllers/advice-controller.js b/www/scripts/controllers/advice-controller.js index dca0608..90d6dbc 100644 --- a/www/scripts/controllers/advice-controller.js +++ b/www/scripts/controllers/advice-controller.js @@ -9,7 +9,7 @@ app.controller('adviceCtr', ['$scope', '$state', '$timeout', 'pubSubService', 'd $scope.advices = []; $scope.user = {}; - get('own').then(user => { + get('user').then(user => { $scope.user = user; pubSubService.publish('Common.menuActive', { login: true, @@ -28,14 +28,14 @@ app.controller('adviceCtr', ['$scope', '$state', '$timeout', 'pubSubService', 'd return; } - await post('addAdvice', { + await post('adviceAdd', { comment: $scope.comment, }); await getAdvices(); } async function getAdvices() { - let data = await post("getAdvices"); + let data = await get("advices"); data.forEach(element => { element.imgData = new Identicon(md5(element.username)).toString(); }); diff --git a/www/scripts/controllers/bookmark-info-controller.js b/www/scripts/controllers/bookmark-info-controller.js index ff8e68a..00834c9 100644 --- a/www/scripts/controllers/bookmark-info-controller.js +++ b/www/scripts/controllers/bookmark-info-controller.js @@ -42,7 +42,7 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win $scope.jumpToUrl = async function (url, id) { $window.open(url, '_blank'); if ($scope.bookmark.own) { - await post('clickBookmark', { id }); + await post('bookmarkClick', { id }); $scope.bookmark.clickCount += 1; $scope.bookmark.lastClick = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss"); } diff --git a/www/scripts/controllers/edit-controller.js b/www/scripts/controllers/edit-controller.js index 73ab369..abd5e0b 100644 --- a/www/scripts/controllers/edit-controller.js +++ b/www/scripts/controllers/edit-controller.js @@ -18,7 +18,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo } $scope.loadTitle = true; try { - let data = await get('getArticle', { url: newUrl }); + let data = await get('article', { url: newUrl }); $scope.loadTitle = false; $scope.originTitle = data.title; $scope.title = data.title; @@ -92,12 +92,12 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo console.log("add bookmark", params); if ($scope.add) { - let id = await post('addBookmark', params); + let id = await post('bookmarkAdd', params); $('.ui.modal.js-add-bookmark').modal('hide'); params.id = id; pubSubService.publish('EditCtr.inserBookmarsSuccess', params); } else { - await post('updateBookmark', params); + await post('bookmarkUpdate', params); $('.ui.modal.js-add-bookmark').modal('hide'); pubSubService.publish('EditCtr.inserBookmarsSuccess', params); toastr.success('[ ' + params.title + ' ] 更新成功,将自动重新更新书签!', "提示"); @@ -137,7 +137,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo if (tag) { ngDialog.close(dialog); - await post('addTag', { name: tag }); + await post('tagAdd', { name: tag }); await getTags(); } else { toastr.warning('您可能没有输入分类或者输入的分类有误', "提示"); diff --git a/www/scripts/controllers/home-controller.js b/www/scripts/controllers/home-controller.js index 2153da8..34cdc4d 100644 --- a/www/scripts/controllers/home-controller.js +++ b/www/scripts/controllers/home-controller.js @@ -7,7 +7,7 @@ app.controller('homeCtr', ['$scope', '$stateParams', '$filter', '$state', '$wind (async () => { try { - await get('own'); + await get('user'); pubSubService.publish('loginCtr.login', { 'login': true }); $state.go('tags'); } catch (error) { diff --git a/www/scripts/controllers/login-controller.js b/www/scripts/controllers/login-controller.js index ad1c0ed..74308ba 100644 --- a/www/scripts/controllers/login-controller.js +++ b/www/scripts/controllers/login-controller.js @@ -38,7 +38,7 @@ app.controller('loginCtr', ['$scope', '$filter', '$state', '$http', '$cookieStor }; $cookieStore.put("username", $scope.username); - let data = await post('login', params); + let data = await post('userLogin', params); // 更新token信息 axios.defaults.headers.common['Authorization'] = data.token; @@ -81,7 +81,7 @@ app.controller('loginCtr', ['$scope', '$filter', '$state', '$http', '$cookieStor email: $scope.emailRegister, password: $scope.passwordRegister1, }; - await post('register', user); + await post('userRegister', user); $('.ui.modal.js-register').modal('hide'); $scope.username = $scope.usernameRegister; diff --git a/www/scripts/controllers/menus-controller.js b/www/scripts/controllers/menus-controller.js index 003b420..2055519 100644 --- a/www/scripts/controllers/menus-controller.js +++ b/www/scripts/controllers/menus-controller.js @@ -26,7 +26,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time $scope.loginMenus = dataService.loginMenus; // 登陆之后显示的菜单数据。uiSerf:内部跳转链接。 $scope.notLoginMenus = dataService.notLoginMenus; // 未登陆显示的菜单数据 - get('own', { full: true }).then(user => { + get('user', { full: true }).then(user => { $timeout(() => { $scope.user = user; $scope.searchHistory = JSON.parse(user.searchHistory || '[]'); @@ -186,7 +186,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time } $scope.logout = async function () { - await post('logout'); + await post('userLogout'); axios.defaults.headers.common['Authorization'] = ""; localStorage.setItem("authorization", ""); $scope.login = false; @@ -232,7 +232,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time d: item.d, }) }) - await post("updateUser", { searchHistory: JSON.stringify(datas) }); + await post("userUpdate", { searchHistory: JSON.stringify(datas) }); } $timeout(function () { @@ -307,7 +307,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time var url = $scope.quickUrl[key]; if (url) { $window.open(url, '_blank'); - let data = await post('shortcutBookmark', { url }); + let data = await post('bookmarShortcutk', { url }); if (!data) { toastr.info('网址:' + url + "还没添加到你的书签系统,请添加!", "警告"); pubSubService.publish('TagCtr.storeBookmark', { url }); diff --git a/www/scripts/controllers/note-controller.js b/www/scripts/controllers/note-controller.js index b3a8fc3..0231aea 100644 --- a/www/scripts/controllers/note-controller.js +++ b/www/scripts/controllers/note-controller.js @@ -26,7 +26,7 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind var timeagoInstance = timeago(); - get('own').then(user => { + get('user').then(user => { pubSubService.publish('Common.menuActive', { login: true, index: dataService.LoginIndexNote @@ -109,7 +109,7 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind content: $scope.content, } - await post("addNote", note); + await post("noteAdd", note); // 增加成功,重新获取一次备忘录 $scope.tags.forEach((tag) => { @@ -146,7 +146,7 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind id: $scope.currentNoteId } ngDialog.close(dialog); - await post('delNote', params) + await post('noteDel', params) $("#" + $scope.currentNoteId).transition({ animation: dataService.animation(), duration: 500, @@ -193,7 +193,7 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind tagId: $scope.currentTagId, } - await post("updateNote", params); + await post("noteUpdate", params); $scope.notes.forEach((note) => { if (note.id == $scope.currentNoteId) { note.content = $scope.content; diff --git a/www/scripts/controllers/search-controller.js b/www/scripts/controllers/search-controller.js index c064e8a..4c70079 100644 --- a/www/scripts/controllers/search-controller.js +++ b/www/scripts/controllers/search-controller.js @@ -38,7 +38,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi } get('tags').then((tags) => $scope.tags = tags) - get('own').then((user) => $scope.user = user) + get('user').then((user) => $scope.user = user) // 默认登陆 pubSubService.publish('Common.menuActive', { @@ -49,7 +49,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi $scope.jumpToUrl = async function (url, id) { if (!$scope.edit) { $window.open(url); - await post("clickBookmark", { id }); + await post("bookmarkClick", { id }); $scope.bookmarks.forEach(function (bookmark) { if (bookmark.id == id) { @@ -74,7 +74,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi } $scope.confirmDelBookmark = async function (id) { - await post("delBookmark", { id }) + await post("bookmarkDel", { id }) $("#" + id).transition({ animation: dataService.animation(), duration: 500, @@ -98,7 +98,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi } $scope.favoriteBookmark = async function (bookmark) { - let id = await post("addBookmark", bookmark); + let id = await post("bookmarkAdd", bookmark); bookmark = await get("bookmark", { id }); pubSubService.publish('EditCtr.inserBookmarsSuccess', bookmark); } diff --git a/www/scripts/controllers/settings-controller.js b/www/scripts/controllers/settings-controller.js index d396df4..2ec2501 100644 --- a/www/scripts/controllers/settings-controller.js +++ b/www/scripts/controllers/settings-controller.js @@ -23,7 +23,7 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$ $scope.form = $scope.form.map(() => false); $scope.form[index] = true; if (index == 0 || index == 1 || index == 4) { - let user = await get('own', { full: true }); + let user = await get('user', { full: true }); let tags = await get('tags', { bookmarkCount: true, noteCount: true }); $timeout(() => { $scope.user = user @@ -46,8 +46,8 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$ } if ($scope.passwordNew1 == $scope.passwordNew2) { - await post('resetUserPwd', { old: $scope.passwordOrgin, password: $scope.passwordNew1 }); - await post('logout'); + await post('userResetPwd', { old: $scope.passwordOrgin, password: $scope.passwordNew1 }); + await post('userLogout'); axios.defaults.headers.common['Authorization'] = ""; localStorage.setItem("authorization", ""); @@ -154,7 +154,7 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$ }); async function saveQuickUrl() { - await post("updateUser", { quickUrl: JSON.stringify($scope.quickUrl) }); + await post("userUpdate", { quickUrl: JSON.stringify($scope.quickUrl) }); toastr.success('全局快捷键更新成功', "提示"); } diff --git a/www/scripts/controllers/tags-controller.js b/www/scripts/controllers/tags-controller.js index 073d60a..63c1861 100644 --- a/www/scripts/controllers/tags-controller.js +++ b/www/scripts/controllers/tags-controller.js @@ -94,7 +94,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara $scope.jumpToUrl = async function (url, id) { if (!$scope.editMode) { $window.open(url, '_blank'); - await post("clickBookmark", { id }); + await post("bookmarkClick", { id }); $scope.bookmarks.forEach(function (bookmark, index) { if (bookmark.id == id) { @@ -121,7 +121,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara $scope.confirmDelBookmark = async function (id) { ngDialog.close(dialog); - await post("delBookmark", { id }) + await post("bookmarkDel", { id }) $("#" + id).transition({ animation: dataService.animation(), duration: 500, @@ -146,7 +146,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara $scope.detailBookmark = async function (bookmark) { bookmark.own = true; pubSubService.publish('TagCtr.showBookmarkInfo', bookmark); - await post("clickBookmark", { id: bookmark.id }); + await post("bookmarkClick", { id: bookmark.id }); } $scope.copy = function (url) { @@ -184,7 +184,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara } $scope.updateTagShow = async function (tag, show) { - await post("updateTag", { id: tag.id, show }); + await post("tagUpdate", { id: tag.id, show }); toastr.success(tag.name + ' 更新成功!', "提示"); $timeout(() => { tag.show = show; @@ -202,7 +202,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara } try { - await post('updateTag', params); + await post('tagUpdate', params); toastr.success(tag.name + ' 更新成功!', "提示"); } catch (error) { $scope.backTag(tag); @@ -225,7 +225,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara if (tagName == '未分类' || tagName == "收藏") { toastr.error('默认分类不允许删除', "提示"); } else { - await post("delTag", { id }); + await post("tagDel", { id }); let index = 0; for (const tag of $scope.tags) { @@ -279,7 +279,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara if (tag) { ngDialog.close(dialog); - await post("addTag", { name: tag }) + await post("tagAdd", { name: tag }) } else { toastr.warning('您可能没有输入分类或者输入的分类有误', "提示"); } @@ -314,7 +314,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara } } if (needUpdate) { - await post('updateTagSort', { tags: $scope.tagsIndex }); + await post('tagSort', { tags: $scope.tagsIndex }); } }, 300) } diff --git a/www/scripts/controllers/weixin-article-controller.js b/www/scripts/controllers/weixin-article-controller.js index cdc615d..4ae112c 100644 --- a/www/scripts/controllers/weixin-article-controller.js +++ b/www/scripts/controllers/weixin-article-controller.js @@ -26,7 +26,7 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$filter', '$win $scope.user = {}; var timeagoInstance = timeago(); - get('own').then((user) => { + get('user').then((user) => { $scope.user = user; pubSubService.publish('Common.menuActive', { login: true, @@ -50,7 +50,7 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$filter', '$win bookmark.title = b.title; bookmark.url = b.url; - let id = await post("addBookmark", bookmark); + let id = await post("bookmarkAdd", bookmark); bookmark = await get("bookmark", { id }) pubSubService.publish('EditCtr.inserBookmarsSuccess', bookmark); } diff --git a/www/scripts/services/bookmark-service.js b/www/scripts/services/bookmark-service.js deleted file mode 100644 index 22e6569..0000000 --- a/www/scripts/services/bookmark-service.js +++ /dev/null @@ -1,500 +0,0 @@ -app.factory('bookmarkService', ['$http', '$q', function ($http, $q) { - // service interface - var service = { - getArticle: function (params) { - var def = $q.defer(); - $http.post('/api/getArticle/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - getUpdateLog: function (params) { - var def = $q.defer(); - $http.post('/api/getUpdateLog/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - login: function (params) { - var def = $q.defer(); - $http.post('/api/login/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - register: function (params) { - var def = $q.defer(); - $http.post('/api/register/', params) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - resetPassword: function (params) { - var def = $q.defer(); - $http.post('/api/resetPassword/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - clickBookmark: function (params) { - var def = $q.defer(); - $http.post('/api/clickBookmark/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - jumpQuickUrl: function (params) { - var def = $q.defer(); - $http.post('/api/jumpQuickUrl/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - logout: function (params) { - var def = $q.defer(); - $http.post('/api/logout/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - autoLogin: function () { - var def = $q.defer(); - $http.get('/api/autoLogin/') - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - userInfo: function (params) { - var def = $q.defer(); - $http.get('/api/userInfo/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - /** - * @func - * @desc 根据显示页数的索引,获取书签的数据 - * @param {object} params - 参数 - */ - getBookmarks: function (params) { - var def = $q.defer(); - - $http.get('/api/bookmarks/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data, status) { - def.reject(data); - }); - return def.promise; - }, - getBookmarksByTag: function (params) { - var def = $q.defer(); - - $http.get('/api/bookmarksByTag/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data, status) { - def.reject(data); - }); - return def.promise; - }, - searchBookmarks: function (params) { - var def = $q.defer(); - - $http.get('/api/searchBookmarks/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data, status) { - def.reject(data); - }); - return def.promise; - }, - searchHotBookmarks: function (params) { - var def = $q.defer(); - - $http.get('/api/searchHotBookmarks/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data, status) { - def.reject(data); - }); - return def.promise; - }, - getBookmark: function (params) { - var def = $q.defer(); - - $http.get('/api/bookmark/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data, status) { - def.reject(data); - }); - return def.promise; - }, - addBookmark: function (params) { - var def = $q.defer(); - $http.post('/api/addBookmark/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - favoriteBookmark: function (params) { - var def = $q.defer(); - $http.post('/api/favoriteBookmark/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateBookmark: function (params) { - var def = $q.defer(); - $http.post('/api/updateBookmark/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - delBookmark: function (params) { - var def = $q.defer(); - $http.delete('/api/delBookmark/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - /** - * @func - * @desc 根据显示页数的索引,获取书签的数据 - * @param {object} params - 参数 - */ - getTags: function getTags(params) { - var def = $q.defer(); - $http.get('/api/tags/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - addTags: function (params) { - var def = $q.defer(); - $http.post('/api/addTags/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateTagName: function (params) { - var def = $q.defer(); - $http.post('/api/updateTagName/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateTagShow: function (params) { - var def = $q.defer(); - $http.post('/api/updateTagShow/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateTagsIndex: function (params) { - var def = $q.defer(); - $http.post('/api/updateTagsIndex/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - delTag: function (params) { - var def = $q.defer(); - $http.post('/api/delTag/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateShowStyle: function (params) { - var def = $q.defer(); - $http.post('/api/updateShowStyle/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateSearchHistory: function (params) { - var def = $q.defer(); - $http.post('/api/updateSearchHistory/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateQuickUrl: function (params) { - var def = $q.defer(); - $http.post('/api/updateQuickUrl/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - getAdvices: function (params) { - var def = $q.defer(); - $http.get('/api/advices/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - addAdvice: function (params) { - var def = $q.defer(); - $http.post('/api/addAdvice/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - getHotBookmarks: function (params) { - var def = $q.defer(); - - $http.get('/api/hotBookmarks/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data, status) { - def.reject(data); - }); - return def.promise; - }, - addNote: function (params) { - var def = $q.defer(); - $http.post('/api/addNote/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data, status) { - def.reject(data); - }); - return def.promise; - }, - getNotes: function (params) { - var def = $q.defer(); - $http.get('/api/notes/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - delNote: function (params) { - var def = $q.defer(); - $http.delete('/api/delNote/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateNote: function (params) { - var def = $q.defer(); - $http.post('/api/updateNote/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - updateNotePublic: function (params) { - var def = $q.defer(); - $http.post('/api/updateNotePublic/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - download: function (params) { - var def = $q.defer(); - $http.get('/api/download/', { - params: params - }) - .success(function (data) { - def.resolve(data); - }) - .error(function (data) { - def.reject(data); - }); - return def.promise; - }, - }; - - return service; -}]);