From 5f7fd830640a7cd1eb177bb8970b048c4a12b3c7 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 5 Jan 2023 14:43:58 +0800 Subject: [PATCH] , --- admin-core/src/main/resources/static/js/common.js | 2 +- admin-core/src/main/resources/templates/login.html | 8 ++++---- web/src/main/java/com/ibeetl/jlw/web/IndexController.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin-core/src/main/resources/static/js/common.js b/admin-core/src/main/resources/static/js/common.js index c6997c69..318c5ca8 100644 --- a/admin-core/src/main/resources/static/js/common.js +++ b/admin-core/src/main/resources/static/js/common.js @@ -333,7 +333,7 @@ var Common = { if (window.sessionStorage && window.sessionStorage.length) { for (let key of Object.keys(sessionStorage)) { // 只取第一个出现的TOKEN值 - if (key.toUpperCase().endsWith("_UUID_TOKEN")) { + if (key.toUpperCase().endsWith("_TOKEN")) { var tokenKey = sessionStorage.getItem("TOKEN_KEY"); var token = this.cookieGet(tokenKey); if (token != null) { diff --git a/admin-core/src/main/resources/templates/login.html b/admin-core/src/main/resources/templates/login.html index 6c99da12..6757dce5 100644 --- a/admin-core/src/main/resources/templates/login.html +++ b/admin-core/src/main/resources/templates/login.html @@ -103,18 +103,18 @@ // 默认清空,所有的sessionToken for (let key of Object.keys(rsp.data)) { - // key 长得像 {}_{}_{}_UUID_TOKEN + // key 长得像 {}_{}_{}_TOKEN //将用户名Token存入缓存中 - if (key.toUpperCase().endsWith("_UUID_TOKEN")) { + if (key.toUpperCase().endsWith("_TOKEN")) { sessionStorage.removeItem(key); } } var keyIdOrToken = '', tokenKey = '' for (let key of Object.keys(rsp.data)) { - // key 长得像 {}_{}_{}_UUID_TOKEN + // key 长得像 {}_{}_{}_TOKEN //将用户名Token存入缓存中 - if (key.toUpperCase().endsWith("_UUID_TOKEN")) { + if (key.toUpperCase().endsWith("_TOKEN")) { keyIdOrToken = rsp.data[key]; tokenKey = key; sessionStorage.setItem(key, keyIdOrToken); diff --git a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java index 519591b6..e2b837f1 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java @@ -874,7 +874,7 @@ public class IndexController { * @return */ private String createTokenKey(CoreUser user) { - String tokenKey = StrUtil.format("{}_{}_UUID_TOKEN", user.getJobType1(), user.getId()); + String tokenKey = StrUtil.format("{}_{}_TOKEN", user.getJobType1(), user.getId()); return tokenKey; }