From 7b29cb9a7de258157220d64ee448623b0904875e Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@juzix.io>
Date: Fri, 27 Jul 2018 13:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=AA=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=99=BB=E9=99=86=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/app-angular.js                 |  2 +-
 .../scripts/controllers/advice-controller.js  |  2 +-
 .../controllers/bookmarks-controller.js       |  8 +--
 public/scripts/controllers/note-controller.js |  2 +-
 .../controllers/settings-controller.js        |  5 +-
 public/scripts/controllers/tags-controller.js | 13 ++--
 public/scripts/services/bookmark-service.js   | 70 +++++++++----------
 public/scripts/services/data-service.js       |  6 ++
 public/views/settings.html                    |  4 +-
 9 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/public/scripts/app-angular.js b/public/scripts/app-angular.js
index 3c9b3e1..6cc5b7c 100644
--- a/public/scripts/app-angular.js
+++ b/public/scripts/app-angular.js
@@ -107,4 +107,4 @@ console.log([
     "          不见满街漂亮妹，哪个归得程序员？",
 ].join('\n'));
 
-console.log = function(){}
+// console.log = function(){}
diff --git a/public/scripts/controllers/advice-controller.js b/public/scripts/controllers/advice-controller.js
index 5fbd1d1..d330313 100644
--- a/public/scripts/controllers/advice-controller.js
+++ b/public/scripts/controllers/advice-controller.js
@@ -51,7 +51,7 @@ app.controller('adviceCtr', ['$scope', '$state', '$timeout', 'bookmarkService',
                     index: dataService.LoginIndexAdvice
                 });
             })
-            .catch((err) => console.log('getAdvices err', err));
+            .catch((err) => dataService.netErrorHandle(err, $state));
     }
 
     setTimeout(function() {
diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index fd6778c..455e1b7 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -285,9 +285,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
                     updateShowStyle();
                     getBookmarks(); // 拿到默认显示风格了，继续取获取书签
                 })
-                .catch((err) => {
-                    console.log('获取信息失败。错误信息：' + JSON.stringify(err), "错误");
-                });
+                .catch((err) => dataService.netErrorHandle(err, $state));
         } else {
             $scope.loadBusy = true;
             if (params.showStyle == 'table' && (!$scope.forbidTransition)) {
@@ -342,8 +340,8 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
                     $scope.forbidTransition = false;
                     $scope.loadBusy = false;
                 })
-                .catch((err) => {
-                    console.log('getBookmarks err', err);
+                .catch((err) => { 
+                    dataService.netErrorHandle(err, $state);
                     $scope.loadBusy = false;
                 });
         }
diff --git a/public/scripts/controllers/note-controller.js b/public/scripts/controllers/note-controller.js
index 97b788a..dfe9966 100644
--- a/public/scripts/controllers/note-controller.js
+++ b/public/scripts/controllers/note-controller.js
@@ -38,7 +38,7 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind
             getNotes();
         })
         .catch((err) => {
-            console.log('autoLogin err', err)
+            dataService.netErrorHandle(err, $state)
         });
 
     $scope.changeCurrentPage = function (currentPage) {
diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js
index da0b314..5df4523 100644
--- a/public/scripts/controllers/settings-controller.js
+++ b/public/scripts/controllers/settings-controller.js
@@ -73,8 +73,7 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
                     }
                 })
                 .catch((err) => {
-                    console.log(err);
-                    toastr.error('获取信息失败。错误信息：' + JSON.stringify(err), "错误");
+                    dataService.netErrorHandle(err, $state)
                     $scope.loadShowStyle = false;
                 });
         }
@@ -89,7 +88,7 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
                     })
                 })
                 .catch((err) => {
-                    console.log('getTags err', err);
+                    dataService.netErrorHandle(err, $state)
                 });
         }
 
diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index e748c31..6db0865 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -1,4 +1,4 @@
-app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function ($scope, $filter, $window, $stateParams, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
+app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$stateParams', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function ($scope, $filter, $state, $window, $stateParams, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
     console.log("Hello tagsCtr...", $stateParams);
     if(dataService.smallDevice()){
         $window.location = "http://m.mybookmark.cn/#/tags";
@@ -493,16 +493,15 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
                     toastr.info('您还没有书签分类，请点击菜单栏的添加按钮进行添加', "提示");
                 }
                 $scope.loadTags = false;
+                pubSubService.publish('Common.menuActive', {
+                    login: true,
+                    index: dataService.LoginIndexTags
+                });
             })
             .catch((err) => {
-                console.log('getTags err', err);
+                dataService.netErrorHandle(err, $state);
                 $scope.loadTags = false;
             });
-
-        pubSubService.publish('Common.menuActive', {
-            login: true,
-            index: dataService.LoginIndexTags
-        });
     }
 
     pubSubService.subscribe('EditCtr.inserBookmarsSuccess', $scope, function (event, data) {
diff --git a/public/scripts/services/bookmark-service.js b/public/scripts/services/bookmark-service.js
index 3748316..8ac477c 100644
--- a/public/scripts/services/bookmark-service.js
+++ b/public/scripts/services/bookmark-service.js
@@ -10,7 +10,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('getArticle error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -23,7 +23,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('getUpdateLog error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -36,7 +36,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('login error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -49,7 +49,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('register error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -62,7 +62,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('register error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -75,7 +75,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('clickBookmark error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -88,7 +88,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('jumpQuickUrl error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -101,7 +101,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('logout error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -112,7 +112,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('autoLogin error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -125,7 +125,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('userInfo error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -144,7 +144,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data, status) {
-                    def.reject('getBookmarks error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -158,7 +158,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data, status) {
-                    def.reject('bookmarksByTag error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -172,7 +172,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data, status) {
-                    def.reject('searchBookmarks error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -186,7 +186,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data, status) {
-                    def.reject('searchHotBookmarks error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -200,7 +200,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data, status) {
-                    def.reject('getBookmark error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -213,7 +213,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('addBookmark error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -226,7 +226,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('favorite error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -239,7 +239,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('updateBookmark error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -252,7 +252,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('delBookmark error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -270,7 +270,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('getTags error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -283,7 +283,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('addTags error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -296,7 +296,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('updateTagName error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -309,7 +309,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('updateTagsIndex error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -322,7 +322,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('delTag error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -335,7 +335,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('updateShowStyle error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -348,7 +348,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('updateSearchHistory error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -361,7 +361,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('updateQuickUrl error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -374,7 +374,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('getAdvices error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -387,7 +387,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('addAdvice error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -401,7 +401,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data, status) {
-                    def.reject('getHotBookmarks error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -414,7 +414,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data, status) {
-                    def.reject('addNote error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -427,7 +427,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('getNotes error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -440,7 +440,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('delNote error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -453,7 +453,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('updateNote error');
+                    def.reject(data);
                 });
             return def.promise;
         },
@@ -466,7 +466,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
                     def.resolve(data);
                 })
                 .error(function(data) {
-                    def.reject('download error');
+                    def.reject(data);
                 });
             return def.promise;
         },
diff --git a/public/scripts/services/data-service.js b/public/scripts/services/data-service.js
index 5a836c5..c6d553c 100644
--- a/public/scripts/services/data-service.js
+++ b/public/scripts/services/data-service.js
@@ -151,6 +151,12 @@ app.factory('dataService', [function() {
             }
 
             return false;
+        },
+        netErrorHandle(err, $state) {
+            if(err == "Unauthorized") {
+                $state.go("login");
+                toastr.error('您好像没有登陆，或者登陆session过期了，请重新登陆！', "提示");
+            }
         }
     };
 
diff --git a/public/views/settings.html b/public/views/settings.html
index e17773e..83d9061 100644
--- a/public/views/settings.html
+++ b/public/views/settings.html
@@ -52,12 +52,12 @@
                             <label>表格</label>
                         </div>
                     </div>
-                    <div class="field" ng-click="updateDefaultShowStyle('card')">
+                    <!-- <div class="field" ng-click="updateDefaultShowStyle('card')">
                         <div class="ui radio checkbox js-radio-default-card">
                             <input type="radio" name="default-show-style">
                             <label>卡片</label>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </form>
             <div class="ui four statistics" style="margin-top:30px;" ng-show="form[1]">