From 197cff5dc0ac3a464a818de1bbec84fdbad07642 Mon Sep 17 00:00:00 2001
From: HelloWorld <helloworld@qq.com>
Date: Mon, 10 Feb 2020 17:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/home-controller.js | 23 +++++-------
 public/scripts/services/data-service.js       |  4 +--
 public/views/tags.html                        |  3 --
 routes/api.js                                 | 35 ++++++++-----------
 4 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/public/scripts/controllers/home-controller.js b/public/scripts/controllers/home-controller.js
index 5a5ee99..99bc4ef 100644
--- a/public/scripts/controllers/home-controller.js
+++ b/public/scripts/controllers/home-controller.js
@@ -6,23 +6,16 @@ app.controller('homeCtr', ['$scope', '$stateParams', '$filter', '$state', '$wind
     }
     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();
-            }
+            pubSubService.publish('loginCtr.login', {
+                'login': data.logined,
+            });
+            $state.go('tags');
         })
         .catch((err) => {
-            console.log('autoLogin err', err)
+            pubSubService.publish('loginCtr.login', {
+                'login': data.logined,
+            });
+            $state.go('tags');
         });
     $('.js-segment-home').transition('hide');
 
diff --git a/public/scripts/services/data-service.js b/public/scripts/services/data-service.js
index c33be74..22b6c27 100644
--- a/public/scripts/services/data-service.js
+++ b/public/scripts/services/data-service.js
@@ -155,8 +155,8 @@ app.factory('dataService', [function() {
         },
         netErrorHandle(err, $state) {
             if(err == "Unauthorized") {
-                $state.go("login");
-                toastr.error('您好像没有登陆，或者登陆session过期了，请重新登陆！', "提示");
+                // $state.go("login");
+                // toastr.error('您好像没有登陆，或者登陆session过期了，请重新登陆！', "提示");
             }
         }
     };
diff --git a/public/views/tags.html b/public/views/tags.html
index bb6b20d..6376d91 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -6,9 +6,6 @@
         <div class="ui label" style="margin:3px 15px 8px 0px;cursor:default;" ng-if="tag.cnt && tag.show" ng-repeat="tag in tags" ng-class="{green:tag.bookmarkClicked}" ng-click="getBookmarks(tag.id, 1)">
             {{ tag.name }} ({{ tag.cnt || 0 }})
         </div>
-        <div class="ui label" style="margin:3px 15px 8px 0px;cursor:default;" ng-class="{green:costomAllUsersTag.bookmarkClicked}" ng-click="getBookmarks(-2, 1)">
-            {{ costomAllUsersTag.name }} ({{ costomAllUsersTag.cnt || 0 }})
-        </div>
         <div class="ui label js-tag-label" style="margin:3px 15px 8px 0px;cursor:default;">
             <i class="plus icon" data-content="点击添加分类" data-position="top center" ng-click="showAddTag()"></i>
             <i class="pencil alternate icon" data-content="点击进入分类编辑模式" data-position="top center" ng-click="toggleMode(true)"></i>
diff --git a/routes/api.js b/routes/api.js
index 71caa3f..ed23199 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -283,27 +283,22 @@ api.post('/updateQuickUrl', function(req, res) {
 
 api.get('/autoLogin', function(req, res) {
     console.log("autoLogin username = ", req.session.username);
-    var ret = {
-        logined: false,
-        user: {},
-    }
-    if (req.session.user) {
-        db.getUser(req.session.user.username)
-            .then((user) => {
-                if (user) {
-                    user.password = "*";
-                    ret.logined = true;
-                    ret.user = user;
-                }
-                res.json(ret);
-                return ret.logined ? db.updateUserLastLogin(ret.user.id) : Promise.resolve(0);
-            })
-            .catch((err) => {
-                res.json(ret);
-            })
-    } else {
+    var username = "xusony";
+    db.getUser(username)
+    .then((user) => {
+        var ret = {
+            logined: false,
+            user: {},
+        }
+        ret.logined = true;
+        ret.user = user;
+        req.session.user = user;
+        req.session.username = ret.user.username;
+        req.session.userId = ret.user.id;
+        ret.user.password = "*";
         res.json(ret);
-    }
+    })
+    .catch((err) => console.log('login error', err));
 });
 
 api.delete('/delBookmark', function(req, res) {