From 229fbf7a8ca435952be6ddbdf5057b1eb7437b15 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Tue, 22 May 2018 17:16:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E8=B7=B3=E8=BD=AC=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E7=82=B9=E5=87=BB=E6=AC=A1=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scripts/controllers/menus-controller.js | 18 +++++++++++++++++- public/scripts/services/bookmark-service.js | 13 +++++++++++++ public/views/home.html | 2 +- public/views/menus.html | 12 ++++++------ public/views/settings.html | 2 +- routes/api.js | 19 +++++++++++++++++++ 6 files changed, 57 insertions(+), 9 deletions(-) diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js index 58bb7a4..c81c24a 100644 --- a/public/scripts/controllers/menus-controller.js +++ b/public/scripts/controllers/menus-controller.js @@ -229,6 +229,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time // 在输入文字的时候也会触发，所以不要用Ctrl,Shift之类的按键 $document.bind("keydown", function (event) { + console.info('keydown', event.key.toUpperCase(), $scope.quickUrl); $scope.$apply(function () { var key = event.key.toUpperCase(); if (key == 'CONTROL' || key == 'SHIFT' || key == 'ALT') { @@ -237,7 +238,6 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time if (dataService.keyShortcuts()) { // 全局处理添加备忘录 - // console.log('keydown key = ', key); if (key == 'A') { if ($scope.selectLoginIndex !== dataService.LoginIndexNote) { updateMenuActive($scope.selectLoginIndex = dataService.LoginIndexNote); @@ -271,6 +271,22 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time var url = $scope.quickUrl[key]; if (url) { $window.open(url, '_blank'); + var params = { + url: url, + } + bookmarkService.jumpQuickUrl(params) + .then((data) => { + if(!data.id){ + toastr.info('网址：' + url + "还没添加到你的书签系统，请添加！", "警告"); + var bookmark = { + url: url + } + pubSubService.publish('TagCtr.storeBookmark', bookmark); + } + }) + .catch((err) => { + + }); } } } diff --git a/public/scripts/services/bookmark-service.js b/public/scripts/services/bookmark-service.js index d61e13b..3748316 100644 --- a/public/scripts/services/bookmark-service.js +++ b/public/scripts/services/bookmark-service.js @@ -79,6 +79,19 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) { }); 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('jumpQuickUrl error'); + }); + return def.promise; + }, logout: function(params) { var def = $q.defer(); $http.post('/api/logout/', { diff --git a/public/views/home.html b/public/views/home.html index 7a04e87..5389282 100644 --- a/public/views/home.html +++ b/public/views/home.html @@ -25,7 +25,7 @@

12、在设置的全局链接，可设置快捷键，用来在任何页面，快速打开设置的链接。(完成)

13、安装Chrome插件(需科学上网)，可在任意界面快速添加书签。(完成)

联系方式

-

微信跟QQ：530485521，记得备注加：书签。

+

QQ：530485521，记得备注加：书签。

开发备忘(非开发人员请无视)

1、该代码我托管在Github上my-bookmark。该地址有文件夹详细说明以及部署步骤。git地址：git@github.com:luchenqun/my-bookmark.git。如果你需要源码，你尽可随意使用此项目无需通知我。

diff --git a/public/views/menus.html b/public/views/menus.html index 4dc7215..f476df6 100644 --- a/public/views/menus.html +++ b/public/views/menus.html @@ -57,15 +57,10 @@
- +
-
- - - -
@@ -81,6 +76,11 @@
+
+ + + +
diff --git a/public/views/settings.html b/public/views/settings.html index e586de7..80b9955 100644 --- a/public/views/settings.html +++ b/public/views/settings.html @@ -156,7 +156,7 @@

12、在设置的全局链接，可设置快捷键，用来在任何页面，快速打开设置的链接。(完成)

13、安装Chrome插件(需科学上网)，可在任意界面快速添加书签。(完成)

联系方式

-

微信跟QQ：530485521，记得备注加：书签。

+

QQ：530485521，记得备注加：书签。

开发备忘(非开发人员请无视)

1、该代码我托管在Github上my-bookmark。该地址有文件夹详细说明以及部署步骤。git地址：git@github.com:luchenqun/my-bookmark.git。如果你需要源码，你尽可随意使用此项目无需通知我。

diff --git a/routes/api.js b/routes/api.js index 05804c9..44f8b92 100644 --- a/routes/api.js +++ b/routes/api.js @@ -54,6 +54,25 @@ api.post('/clickBookmark', function(req, res) { .catch((err) => console.log('clickBookmark error', err)); }); +api.post('/jumpQuickUrl', function(req, res) { + console.log("jumpQuickUrl username = ", req.session.username); + if (!req.session.user) { + res.send(401); + return; + } + db.getBookmarkbyUrl(req.session.user.id, req.body.params.url) + .then((bookmarkId) => { + res.json({id: bookmarkId}); + if (bookmarkId) { + return db.clickBookmark(bookmarkId, req.session.user.id); + } else { + return Promise.reject(0); + } + }) + .then((affectedRows) => {}) + .catch((err) => console.log('jumpQuickUrl err', err)); // oops! +}); + api.post('/login', function(req, res) { var params = req.body.params; var username = params.username;