From 317fedf52c0aa872dad45a38029e17a4f69b2863 Mon Sep 17 00:00:00 2001
From: "wei.zhang2" <wei.zhang2@baidao.com>
Date: Mon, 16 Oct 2017 14:44:50 +0800
Subject: [PATCH] 1

---
 src/main/resources/public/login.html   | 23 +++++++++++++++++++----
 src/main/resources/static/js/common.js | 15 ---------------
 src/main/resources/static/js/jq.js     |  3 ++-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/public/login.html b/src/main/resources/public/login.html
index df5f0c0..cb71170 100644
--- a/src/main/resources/public/login.html
+++ b/src/main/resources/public/login.html
@@ -32,15 +32,30 @@
 
 </body>
 <script src="../js/libs/jquery-2.1.1.min.js"></script>
-<script src="../js/common.js"></script>
 <script type="text/javascript">
 	if (top != self) {
 		parent.location.href = '/login.html';
 	}
 
-	var user = loginInfo();
-	if (user != "") {
-		location.href = '/index.html';
+	
+	var token = localStorage.getItem("token");
+	if (token != null && token.trim().length != 0) {
+		$.ajax({
+			type : 'get',
+			url : '/users/current?token=' + token,
+			success : function(data) {
+				location.href = '/index.html';
+			},
+			error : function(xhr, textStatus, errorThrown) {
+				var msg = xhr.responseText;
+				var response = JSON.parse(msg);
+				var code = response.code;
+				var message = response.message;
+				if (code == 401) {
+					localStorage.removeItem("token");
+				}
+			}
+		});
 	}
 
 	function login(obj) {
diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js
index 6a600b3..df2d5fe 100644
--- a/src/main/resources/static/js/common.js
+++ b/src/main/resources/static/js/common.js
@@ -31,19 +31,4 @@ function getUrlParam(key) {
 			return param[1];
 		}
 	}
-}
-
-// 检查登录状态
-function loginInfo(){
-	var user = "";
-    $.ajax({
-        type : 'get',
-        url : '/users/current?token='+localStorage.getItem("token"),
-        async: false,
-        success : function(data){
-           user = data;
-        }
-    });
-    
-    return user;
 }
\ No newline at end of file
diff --git a/src/main/resources/static/js/jq.js b/src/main/resources/static/js/jq.js
index 3efbac8..2e3fed5 100644
--- a/src/main/resources/static/js/jq.js
+++ b/src/main/resources/static/js/jq.js
@@ -11,7 +11,8 @@ $.ajaxSetup({
 		if (code == 400) {
 			layer.msg(message);
 		} else if (code == 401) {
-			layer.msg('未登录');
+			localStorage.removeItem("token");
+			location.href = '/login.html';
 		} else if (code == 403) {
 			console.log("未授权:" + message);
 			layer.msg('未授权');