From 183f436c553b641770fdb2352452192c97009a84 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Mon, 01 Mar 2021 16:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js | 13 ++++++++++---
1 files changed, 10 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..66bc9a0 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,16 @@
if (jsonRs) {
if (jsonRs.code == 401) {
config.removeToken();
- layer.msg('登录过期', {icon: 2, time: 1500}, function () {
- location.replace('/login.html');
- }, 1000);
+ 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