From 469ccbdbfd43b298b5d68413b1b23901b9241632 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Thu, 24 Nov 2016 10:46:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/db.js | 9 +++++---- public/index.html | 1 + public/scripts/app-angular.js | 2 +- public/scripts/controllers/edit-controller.js | 5 +---- public/scripts/controllers/login-controller.js | 11 +++++++---- public/scripts/controllers/search-controller.js | 4 +--- public/scripts/controllers/tags-controller.js | 11 ++--------- public/scripts/externe/angular-cookies.min.js | 9 +++++++++ routes/api.js | 1 + 9 files changed, 28 insertions(+), 25 deletions(-) create mode 100644 public/scripts/externe/angular-cookies.min.js diff --git a/database/db.js b/database/db.js index 46891bc..93d6b04 100644 --- a/database/db.js +++ b/database/db.js @@ -1,8 +1,8 @@ var mysql = require('mysql'); var client = mysql.createConnection({ - host: '127.0.0.1' || '172.24.13.5', - user: 'lcq' || 'root', - password: 'fendoubuxi596320' || 'root123', + host: '127.0.0.1'|| '172.24.13.5', + user: 'lcq'|| 'root', + password: 'fendoubuxi596320'|| 'root123', database: 'mybookmarks', multipleStatements: true, port: 3306 @@ -256,7 +256,7 @@ db.getBookmarksNavigate = function(user_id) { }; db.getBookmarksTable = function(params) { - var user_id = params.user_id; + var user_id = params.userId; params.currentPage = params.currentPage || 1; params.perPageItems = params.perPageItems || 20; @@ -272,6 +272,7 @@ db.getBookmarksTable = function(params) { } else { sql += " LIMIT " + (params.currentPage - 1) * params.perPageItems + ", " + params.perPageItems; var totalItems = result.length; + console.log(totalItems, sql); client.query(sql, (err, result) => { if (err) { reject(err); diff --git a/public/index.html b/public/index.html index 12be2a7..3d9f338 100644 --- a/public/index.html +++ b/public/index.html @@ -28,6 +28,7 @@ + diff --git a/public/scripts/app-angular.js b/public/scripts/app-angular.js index 1f2d11e..31dd631 100644 --- a/public/scripts/app-angular.js +++ b/public/scripts/app-angular.js @@ -1,4 +1,4 @@ -var app = angular.module('bookmarkApp', ['ui.router']); +var app = angular.module('bookmarkApp', ['ui.router', 'ngCookies']); app.config(function($stateProvider, $urlRouterProvider, $httpProvider) { $httpProvider.interceptors.push('httpInterceptor'); diff --git a/public/scripts/controllers/edit-controller.js b/public/scripts/controllers/edit-controller.js index 3dbfc47..300e994 100644 --- a/public/scripts/controllers/edit-controller.js +++ b/public/scripts/controllers/edit-controller.js @@ -107,10 +107,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', 'bookmarkService', 'p $('.ui.modal.js-add-bookmark .ui.dropdown').dropdown('clear'); $('.ui.modal.js-add-bookmark .ui.dropdown').addClass('loading'); init(); - var params = { - user_id: 1 - }; - getTags(params); + getTags({}); }); pubSubService.subscribe('bookmarksCtr.editBookmark', $scope, function(event, params) { diff --git a/public/scripts/controllers/login-controller.js b/public/scripts/controllers/login-controller.js index 0109dba..1210408 100644 --- a/public/scripts/controllers/login-controller.js +++ b/public/scripts/controllers/login-controller.js @@ -1,13 +1,13 @@ -app.controller('loginCtr', ['$scope', '$filter', '$state', 'bookmarkService', 'pubSubService', function($scope, $filter, $state, bookmarkService, pubSubService) { - console.log("Hello loginCtr..."); +app.controller('loginCtr', ['$scope', '$filter', '$state', '$cookieStore', 'bookmarkService', 'pubSubService', function($scope, $filter, $state, $cookieStore, bookmarkService, pubSubService) { + console.log("Hello loginCtr...", $cookieStore.get("username"), $cookieStore.get("password")); pubSubService.publish('Common.menuActive', { login: false, index: 1 }); - $scope.username = "luchenqun"; - $scope.password = "fendoubuxi"; + $scope.username = $cookieStore.get("username") || ""; + $scope.password = $cookieStore.get("password") || ""; $scope.showErr = false; $scope.errInfo = ''; @@ -25,6 +25,8 @@ app.controller('loginCtr', ['$scope', '$filter', '$state', 'bookmarkService', 'p password: $scope.password, autoLogin: autoLogin, }; + $cookieStore.put("username", $scope.username); + $cookieStore.put("password", $scope.password); bookmarkService.login(params) .then((data) => { console.log(data); @@ -37,6 +39,7 @@ app.controller('loginCtr', ['$scope', '$filter', '$state', 'bookmarkService', 'p }) } else { console.log('login failed......................') + toastr.error('账号或者密码错误', "错误"); } }) .catch((err) => console.log('login err', err)); diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js index 0fb3843..75f3f23 100644 --- a/public/scripts/controllers/search-controller.js +++ b/public/scripts/controllers/search-controller.js @@ -27,9 +27,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi } } - bookmarkService.getTags({ - user_id: '1', - }) + bookmarkService.getTags({}) .then((data) => { $scope.tags = data; }) diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js index 32c016b..2fdaeff 100644 --- a/public/scripts/controllers/tags-controller.js +++ b/public/scripts/controllers/tags-controller.js @@ -1,18 +1,11 @@ app.controller('tagsCtr', ['$scope', '$filter', 'bookmarkService', 'pubSubService', function($scope, $filter, bookmarkService, pubSubService) { console.log("Hello tagsCtr..."); - getTags({ - user_id: '1' - }); + getTags({}); $scope.tags = []; // 书签数据 pubSubService.subscribe('MenuCtr.tags', $scope, function(event, data) { console.log('subscribe MenuCtr.tags', data); - var params = { - a: 1, - b: 2, - c: 3 - }; - getTags(params); + getTags({}); }); diff --git a/public/scripts/externe/angular-cookies.min.js b/public/scripts/externe/angular-cookies.min.js new file mode 100644 index 0000000..d767aee --- /dev/null +++ b/public/scripts/externe/angular-cookies.min.js @@ -0,0 +1,9 @@ +/* + AngularJS v1.5.8 + (c) 2010-2016 Google, Inc. http://angularjs.org + License: MIT +*/ +(function(n,c){'use strict';function l(b,a,g){var d=g.baseHref(),k=b[0];return function(b,e,f){var g,h;f=f||{};h=f.expires;g=c.isDefined(f.path)?f.path:d;c.isUndefined(e)&&(h="Thu, 01 Jan 1970 00:00:00 GMT",e="");c.isString(h)&&(h=new Date(h));e=encodeURIComponent(b)+"="+encodeURIComponent(e);e=e+(g?";path="+g:"")+(f.domain?";domain="+f.domain:"");e+=h?";expires="+h.toUTCString():"";e+=f.secure?";secure":"";f=e.length+1;4096 4096 bytes)!");k.cookie=e}}c.module("ngCookies",["ng"]).provider("$cookies",[function(){var b=this.defaults={};this.$get=["$$cookieReader","$$cookieWriter",function(a,g){return{get:function(d){return a()[d]},getObject:function(d){return(d=this.get(d))?c.fromJson(d):d},getAll:function(){return a()},put:function(d,a,m){g(d,a,m?c.extend({},b,m):b)},putObject:function(d,b,a){this.put(d,c.toJson(b),a)},remove:function(a,k){g(a,void 0,k?c.extend({},b,k):b)}}}]}]);c.module("ngCookies").factory("$cookieStore", +["$cookies",function(b){return{get:function(a){return b.getObject(a)},put:function(a,c){b.putObject(a,c)},remove:function(a){b.remove(a)}}}]);l.$inject=["$document","$log","$browser"];c.module("ngCookies").provider("$$cookieWriter",function(){this.$get=l})})(window,window.angular); +//# sourceMappingURL=angular-cookies.min.js.map diff --git a/routes/api.js b/routes/api.js index 0d987c3..c69f700 100644 --- a/routes/api.js +++ b/routes/api.js @@ -23,6 +23,7 @@ api.post('/login', function(req, res) { var params = req.body.params; var username = params.username; var password = md5(params.password); + console.log(password); db.getUser(username) .then((user) => { var ret = {