From 7dfd71337dc2cc2d3b8cef32feb379fb25d9b469 Mon Sep 17 00:00:00 2001 From: itbac Date: Sun, 7 Mar 2021 16:53:42 +0800 Subject: [PATCH] =?UTF-8?q?JapTokenHelper=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E6=88=90=E9=9D=99=E6=80=81=E7=9A=84=EF=BC=8C?= =?UTF-8?q?Cache=20=E4=BB=8E=E4=B8=8A=E4=B8=8B=E6=96=87=E6=8B=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jap/core/store/SessionJapUserStore.java | 4 ++-- .../jap/core/store/SsoJapUserStore.java | 4 ++-- .../fujieid/jap/core/util/JapTokenHelper.java | 23 ++++++++----------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/jap-core/src/main/java/com/fujieid/jap/core/store/SessionJapUserStore.java b/jap-core/src/main/java/com/fujieid/jap/core/store/SessionJapUserStore.java index aeb8fa2..382483c 100644 --- a/jap-core/src/main/java/com/fujieid/jap/core/store/SessionJapUserStore.java +++ b/jap-core/src/main/java/com/fujieid/jap/core/store/SessionJapUserStore.java @@ -55,7 +55,7 @@ public class SessionJapUserStore implements JapUserStore { JapConfig japConfig = JapAuthentication.getContext().getConfig(); if (!japConfig.isSso()) { String token = JapUtil.createToken(japUser, request); - new JapTokenHelper(JapAuthentication.getContext().getCache()).saveUserToken(japUser.getUserId(), token); + JapTokenHelper.saveUserToken(japUser.getUserId(), token); japUser.setToken(token); } return japUser; @@ -74,7 +74,7 @@ public class SessionJapUserStore implements JapUserStore { if (!japConfig.isSso()) { JapUser japUser = this.get(request, response); if (null != japUser) { - new JapTokenHelper(JapAuthentication.getContext().getCache()).removeUserToken(japUser.getUserId()); + JapTokenHelper.removeUserToken(japUser.getUserId()); } } diff --git a/jap-core/src/main/java/com/fujieid/jap/core/store/SsoJapUserStore.java b/jap-core/src/main/java/com/fujieid/jap/core/store/SsoJapUserStore.java index 5a8455f..84fd2a3 100644 --- a/jap-core/src/main/java/com/fujieid/jap/core/store/SsoJapUserStore.java +++ b/jap-core/src/main/java/com/fujieid/jap/core/store/SsoJapUserStore.java @@ -61,7 +61,7 @@ public class SsoJapUserStore extends SessionJapUserStore { public JapUser save(HttpServletRequest request, HttpServletResponse response, JapUser japUser) { String token = JapSsoHelper.login(japUser.getUserId(), japUser.getUsername(), this.japSsoConfig, request, response); super.save(request, response, japUser); - new JapTokenHelper(JapAuthentication.getContext().getCache()).saveUserToken(japUser.getUserId(), token); + JapTokenHelper.saveUserToken(japUser.getUserId(), token); return japUser.setToken(token); } @@ -75,7 +75,7 @@ public class SsoJapUserStore extends SessionJapUserStore { public void remove(HttpServletRequest request, HttpServletResponse response) { JapUser japUser = this.get(request, response); if(null != japUser) { - new JapTokenHelper(JapAuthentication.getContext().getCache()).removeUserToken(japUser.getUserId()); + JapTokenHelper.removeUserToken(japUser.getUserId()); } super.remove(request, response); JapSsoHelper.logout(request, response); diff --git a/jap-core/src/main/java/com/fujieid/jap/core/util/JapTokenHelper.java b/jap-core/src/main/java/com/fujieid/jap/core/util/JapTokenHelper.java index a47fee7..6befdde 100644 --- a/jap-core/src/main/java/com/fujieid/jap/core/util/JapTokenHelper.java +++ b/jap-core/src/main/java/com/fujieid/jap/core/util/JapTokenHelper.java @@ -18,7 +18,7 @@ package com.fujieid.jap.core.util; import cn.hutool.core.util.ObjectUtil; import com.baomidou.kisso.security.token.SSOToken; import com.fujieid.jap.core.JapConst; -import com.fujieid.jap.core.cache.JapCache; +import com.fujieid.jap.core.context.JapAuthentication; import com.fujieid.jap.sso.JapSsoUtil; import java.util.Map; @@ -32,31 +32,26 @@ import java.util.Map; */ public class JapTokenHelper { - private final JapCache japCache; - public JapTokenHelper(JapCache japCache) { - this.japCache = japCache; + public static void saveUserToken(String userId, String token) { + JapAuthentication.getContext().getCache().set(JapConst.USER_TOKEN_KEY.concat(userId), token); } - public void saveUserToken(String userId, String token) { - japCache.set(JapConst.USER_TOKEN_KEY.concat(userId), token); + public static String getUserToken(String userId) { + return (String) JapAuthentication.getContext().getCache().get(JapConst.USER_TOKEN_KEY.concat(userId)); } - public String getUserToken(String userId) { - return (String) japCache.get(JapConst.USER_TOKEN_KEY.concat(userId)); + public static void removeUserToken(String userId) { + JapAuthentication.getContext().getCache().removeKey(JapConst.USER_TOKEN_KEY.concat(userId)); } - public void removeUserToken(String userId) { - japCache.removeKey(JapConst.USER_TOKEN_KEY.concat(userId)); - } - - public Map checkToken(String token) { + public static Map checkToken(String token) { SSOToken ssoToken = JapSsoUtil.parseToken(token); if (ObjectUtil.isNull(ssoToken)) { return null; } String cacheKey = JapConst.USER_TOKEN_KEY.concat(ssoToken.getId()); - if (!japCache.containsKey(cacheKey)) { + if (!JapAuthentication.getContext().getCache().containsKey(cacheKey)) { return null; } return ssoToken.getClaims(); -- Gitee