diff --git a/package.json b/package.json index c13e2d4..44894ca 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "multer": "^1.3.0", "mysql": "^2.11.1", "node-readability": "^2.2.0", + "path": "^0.12.7", "request": "^2.81.0", "supervisor": "^0.11.0", "webshot": "^0.18.0" diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js index edf2e7a..304c48a 100644 --- a/public/scripts/controllers/settings-controller.js +++ b/public/scripts/controllers/settings-controller.js @@ -204,6 +204,12 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$ $window.open(url, '_blank'); } + $scope.exportBookmark = function() { + toastr.warning('功能正在开发中,敬请期待......', '提示'); + return; + $window.open("api/download?fileName=lcq-20170304213023.html"); + } + function updateShowStyle(showStyle) { setTimeout(function() { if (showStyle) { diff --git a/public/scripts/services/bookmark-service.js b/public/scripts/services/bookmark-service.js index a9776c1..932b652 100644 --- a/public/scripts/services/bookmark-service.js +++ b/public/scripts/services/bookmark-service.js @@ -444,6 +444,19 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) { }); 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('download error'); + }); + return def.promise; + }, }; return service; diff --git a/public/views/settings.html b/public/views/settings.html index 6dacb5b..55d9049 100644 --- a/public/views/settings.html +++ b/public/views/settings.html @@ -6,7 +6,7 @@ 我的信息 - 上传书签 + 上传或导出书签 网站说明 @@ -44,12 +44,6 @@ -