From 5699977f622c7e2c7bdcd7115cc8598a48f99bfc Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Tue, 16 May 2023 15:48:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-jboot-plugin=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/dev33/satoken/jboot/PathAnalyzer.java | 12 ++++++------ .../cn/dev33/satoken/jboot/SaRedisCache.java | 4 ++-- .../dev33/satoken/jboot/SaTokenCacheDao.java | 18 ++++++++---------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java index beea4dca..6a2bb254 100644 --- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java +++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java @@ -22,14 +22,14 @@ import java.util.regex.Pattern; public class PathAnalyzer { - private static Map cached = new LinkedHashMap<>(); - private Pattern pattern; + private static final Map cached = new LinkedHashMap<>(); + private final Pattern pattern; public static PathAnalyzer get(String expr) { - PathAnalyzer pa = (PathAnalyzer)cached.get(expr); + PathAnalyzer pa = cached.get(expr); if (pa == null) { synchronized(expr.intern()) { - pa = (PathAnalyzer)cached.get(expr); + pa = cached.get(expr); if (pa == null) { pa = new PathAnalyzer(expr); cached.put(expr, pa); @@ -41,7 +41,7 @@ public class PathAnalyzer { } private PathAnalyzer(String expr) { - this.pattern = Pattern.compile(exprCompile(expr), 2); + this.pattern = Pattern.compile(exprCompile(expr), Pattern.CASE_INSENSITIVE); } public Matcher matcher(String uri) { @@ -57,7 +57,7 @@ public class PathAnalyzer { p = p.replace("$", "\\$"); p = p.replace("**", ".[]"); p = p.replace("*", "[^/]*"); - if (p.indexOf("{") >= 0) { + if (p.contains("{")) { if (p.indexOf("_}") > 0) { p = p.replaceAll("\\{[^\\}]+?\\_\\}", "(.+?)"); } diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java index 97e4e5b3..0f169566 100644 --- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java +++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java @@ -37,7 +37,7 @@ import java.util.List; public class SaRedisCache implements JbootCache { protected JbootRedisConfig config; protected JedisPool jedisPool; - private ThreadLocal CACHE_NAME_PREFIX_TL = new ThreadLocal<>(); + private final ThreadLocal CACHE_NAME_PREFIX_TL = new ThreadLocal<>(); public SaRedisCache(JbootRedisConfig config) { this.config = config; @@ -247,7 +247,7 @@ public class SaRedisCache implements JbootCache { return jedisPool.getResource(); } catch (JedisConnectionException e) { throw new JbootIllegalConfigException("can not connect to redis host " + config.getHost() + ":" + config.getPort() + " ," + - " cause : " + e.toString(), e); + " cause : " + e, e); } } diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java index c4d15663..ccb65884 100644 --- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java +++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java @@ -34,19 +34,19 @@ import java.util.concurrent.ConcurrentHashMap; /** * 使用Jboot的缓存方法存取Token数据 */ -@SuppressWarnings({"deprecation", "unchecked", "rawtypes"}) +@SuppressWarnings({"unchecked", "rawtypes"}) public class SaTokenCacheDao implements SaTokenDao { protected SaRedisCache saRedisCache; protected JbootSerializer serializer; - private Map saRedisMap = new ConcurrentHashMap(); + private final Map saRedisMap = new ConcurrentHashMap(); /** * 使用默认redis配置 */ public SaTokenCacheDao() { - JbootRedisConfig config = (JbootRedisConfig) Jboot.config(JbootRedisConfig.class); + JbootRedisConfig config = Jboot.config(JbootRedisConfig.class); this.saRedisCache = new SaRedisCache(config); this.serializer = new SaJdkSerializer(); } @@ -57,21 +57,19 @@ public class SaTokenCacheDao implements SaTokenDao { * @param cacheName 使用的缓存配置名，默认为 default */ public SaTokenCacheDao(String cacheName) { - SaRedisCache saCache = (SaRedisCache) this.saRedisMap.get(cacheName); + SaRedisCache saCache = this.saRedisMap.get(cacheName); if (saCache == null) { synchronized (this) { - saCache = (SaRedisCache) this.saRedisMap.get(cacheName); + saCache = this.saRedisMap.get(cacheName); if (saCache == null) { Map configModels = ConfigUtil.getConfigModels(JbootRedisConfig.class); if (!configModels.containsKey(cacheName)) { throw new JbootIllegalConfigException("Please config \"jboot.redis." + cacheName + ".host\" in your jboot.properties."); } - JbootRedisConfig jbootRedisConfig = (JbootRedisConfig) configModels.get(cacheName); + JbootRedisConfig jbootRedisConfig = configModels.get(cacheName); saCache = new SaRedisCache(jbootRedisConfig); - if (saCache != null) { - this.saRedisMap.put(cacheName, saCache); - } + this.saRedisMap.put(cacheName, saCache); } } } @@ -271,7 +269,7 @@ public class SaTokenCacheDao implements SaTokenDao { Jedis jedis = saRedisCache.getJedis(); try { Set keys = jedis.keys(prefix + "*" + keyword + "*"); - List list = new ArrayList(keys); + List list = new ArrayList<>(keys); return SaFoxUtil.searchList(list, start, size, sortType); } finally { saRedisCache.returnResource(jedis);