自动登陆

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();
-            }
         })
         .catch((err) => {
-            console.log('autoLogin err', err)
+            pubSubService.publish('loginCtr.login', {
+                'login': data.logined,
+            });
+            $state.go('tags');
         });
     $('.js-segment-home').transition('hide');
 

public/scripts/services/data-service.js

@@ -155,8 +155,8 @@ app.factory('dataService', [function() {
         },
         netErrorHandle(err, $state) {
             if(err == "Unauthorized") {
-                $state.go("login");
+                // $state.go("login");
-                toastr.error('您好像没有登陆，或者登陆session过期了，请重新登陆！', "提示");
+                // toastr.error('您好像没有登陆，或者登陆session过期了，请重新登陆！', "提示");
             }
         }
     };

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>

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 username = "xusony";
+    db.getUser(username)
+    .then((user) => {
         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;
-                }
+        req.session.user = user;
-                res.json(ret);
+        req.session.username = ret.user.username;
-                return ret.logined ? db.updateUserLastLogin(ret.user.id) : Promise.resolve(0);
+        req.session.userId = ret.user.id;
-            })
+        ret.user.password = "*";
-            .catch((err) => {
         res.json(ret);
     })
-    } else {
+    .catch((err) => console.log('login error', err));
-        res.json(ret);
-    }
 });
 
 api.delete('/delBookmark', function(req, res) {