From eb856c050d5c20c69ba490046f597b1f993a06da Mon Sep 17 00:00:00 2001 From: zxh <279049017@qq.com> Date: Tue, 25 Aug 2020 15:53:58 +0800 Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js | 15 ++++++++++++--- 1 files changed, 12 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..f26bf3e 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,18 @@ 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") + 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