From 88b335cf1352479a5ffdb6305ce42b32e0122622 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Tue, 11 Aug 2020 09:45:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js
index 46ba519..4f39373 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js
@@ -128,9 +128,20 @@
                 if (jsonRs) {
                     if (jsonRs.code == 401) {
                         config.removeToken();
-                        layer.msg('登录过期', {icon: 2, time: 1500}, function () {
-                            location.replace('/login.html');
-                        }, 1000);
+                        // var json=JSON.stringify(jsonRs)
+                        // console.log(json,"jsonjsonjsonjsonjsonjsonjson")
+                        debugger
+                        var msg=jsonRs.msg;
+                        if(msg.includes("Access token expired")){
+                            layer.msg('登录过期', {icon: 2, time: 1500}, function () {
+                                location.replace('/login.html');
+                            }, 5000);
+                        }else if(msg.includes("Invalid access token")){
+                            layer.msg('您的账号在其他地方登陆,请重新登录或修改密码', {icon: 2, time: 1500}, function () {
+                                location.replace('/login.html');
+                            }, 5000);
+                        }
+                        
                         return;
                     } else if (jsonRs.code == 403) {
                         layer.msg('没有权限', {icon: 2});

--
Gitblit v1.8.0