From 8561131fbf7aec87cd6b199c987f01ae362d19bc Mon Sep 17 00:00:00 2001
From: HelloWorld <helloworld@qq.com>
Date: Tue, 25 Feb 2020 21:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/home-controller.js | 31 +------------------
 .../scripts/controllers/menus-controller.js   | 11 -------
 routes/api.js                                 |  4 +--
 3 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/public/scripts/controllers/home-controller.js b/public/scripts/controllers/home-controller.js
index 42bee61..6f4fad5 100644
--- a/public/scripts/controllers/home-controller.js
+++ b/public/scripts/controllers/home-controller.js
@@ -4,34 +4,5 @@ app.controller('homeCtr', ['$scope', '$stateParams', '$filter', '$state', '$wind
         $window.location = "http://m.mybookmark.cn/#/tags";
         return;
     }
-    bookmarkService.autoLogin()
-        .then((data) => {
-            if (data.logined) {
-                pubSubService.publish('loginCtr.login', {
-                    'login': data.logined,
-                });
-                $state.go('tags');
-                toastr.success('自动登陆成功，系统将自动跳转到书签分类页面', "提示");
-            } else {
-                console.log('autoLogin failed......................')
-                pubSubService.publish('Common.menuActive', {
-                    login: false,
-                    index: dataService.NotLoginIndexHome
-                });
-                transition();
-            }
-        })
-        .catch((err) => {
-            console.log('autoLogin err', err)
-        });
-    $('.js-segment-home').transition('hide');
-
-    function transition() {
-        var className = 'js-segment-home';
-        $('.' + className).transition('hide');
-        $('.' + className).transition({
-            animation: dataService.animation(),
-            duration: 500,
-        });
-    }
+    $state.go('bookmarks');
 }]);
diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js
index cd8e7f6..32acbc5 100644
--- a/public/scripts/controllers/menus-controller.js
+++ b/public/scripts/controllers/menus-controller.js
@@ -49,17 +49,6 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time
             $scope.login = false;
         });
 
-    bookmarkService.userInfo({})
-        .then((data) => {
-            $scope.user = data;
-            if (data.username === 'lcq') {
-                $scope.loginMenus[dataService.LoginIndexHot].show = false;
-            }
-        })
-        .catch((err) => {
-
-        });
-
     $scope.userLogin = function (username, password) {
         var params = {
             username: username,
diff --git a/routes/api.js b/routes/api.js
index c9f53de..1d576d8 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -412,8 +412,8 @@ api.get('/bookmark', function (req, res) {
 
 api.get('/bookmarks', function (req, res) {
     console.log("bookmarks username = ", req.session.username);
-    var userId = 226; //req.session.user.id;
-    db.getTags(userId)
+    db.getUser('admin')
+        .then((user) => db.getTags(user.id))
         .then((tags) => db.getBookmarksNavigate(tags))
         .then((result) => {
             var data = [];