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/assets/js/common.js | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
index 5ffbfdb..cbad2c2 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
@@ -294,9 +294,18 @@
function permissionsInput(res,config) {
if(!strUtil.isEmpty(res)&&res.code==401){
config.removeToken();
- layer.msg('登录过期', {icon: 2, time: 1500}, function () {
- location.replace('/login.html');
- }, 1000);
+ console.log(res);
+ debugger
+ if(res.msg.includes("Access token expired")){
+ layer.msg('登录过期11', {icon: 2, time: 1500}, function () {
+ location.replace('/login.html');
+ }, 5000);
+ }else{
+ layer.msg('您的账号在其他地方登陆，请重新登录或修改密码', {icon: 2, time: 1500}, function () {
+ location.replace('/login.html');
+ }, 5000);
+ }
+
return;
}
var needpPermissions = $(".permissions");
--
Gitblit v1.8.0