From 4c65c0be087bbe23284ea53d1f89ad492f5ba084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=A5=E5=88=9D?= <2308850421@qq.com> Date: Mon, 21 Aug 2023 17:15:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81fi?= =?UTF-8?q?nal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-core/pom.xml | 1 - .../main/java/cn/dev33/satoken/application/SaApplication.java | 2 +- .../src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java | 2 +- .../java/cn/dev33/satoken/config/SaTokenConfigFactory.java | 2 +- .../satoken/context/SaTokenContextForThreadLocalStorage.java | 2 +- .../main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java | 4 ++-- .../src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java | 1 - 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml index 7c2341ae..8dc854bc 100644 --- a/sa-token-core/pom.xml +++ b/sa-token-core/pom.xml @@ -3,7 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - cn.dev33 sa-token-parent diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java index ab5e9ebc..e52b284f 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java @@ -34,7 +34,7 @@ public class SaApplication implements SaSetValueInterface { /** * 默认实例 */ - public final static SaApplication defaultInstance = new SaApplication(); + public static SaApplication defaultInstance = new SaApplication(); // ---- 实现接口存取值方法 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java index 40d68521..e5a327d2 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java @@ -29,7 +29,7 @@ public class SaBasicUtil { /** * 底层使用的 SaBasicTemplate 对象 */ - public final static SaBasicTemplate saBasicTemplate = new SaBasicTemplate(); + public static SaBasicTemplate saBasicTemplate = new SaBasicTemplate(); /** * 获取浏览器提交的 Basic 参数 （裁剪掉前缀并解码） diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java index 8ed42171..7018a917 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java @@ -42,7 +42,7 @@ public class SaTokenConfigFactory { /** * 配置文件地址 */ - public final static String configPath = "sa-token.properties"; + public static String configPath = "sa-token.properties"; /** * 根据 configPath 路径获取配置信息 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java index 791532c5..177244db 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java @@ -34,7 +34,7 @@ public class SaTokenContextForThreadLocalStorage { /** * 基于 ThreadLocal 的 [ Box 存储器 ] */ - public static final ThreadLocal boxThreadLocal = new InheritableThreadLocal<>(); + public static ThreadLocal boxThreadLocal = new InheritableThreadLocal<>(); /** * 初始化当前线程的 [ Box 存储器 ] diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java index cf1090ab..dc9cbae7 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java @@ -34,12 +34,12 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao { /** * 存储数据的集合 */ - public final Map dataMap = new ConcurrentHashMap<>(); + public Map dataMap = new ConcurrentHashMap<>(); /** * 存储数据过期时间的集合（单位: 毫秒）, 记录所有 key 的到期时间 （注意存储的是到期时间，不是剩余存活时间） */ - public final Map expireMap = new ConcurrentHashMap<>(); + public Map expireMap = new ConcurrentHashMap<>(); /** * 构造函数 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java index e0b83ad5..967a346a 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java @@ -31,7 +31,6 @@ import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; import java.util.Base64; import java.util.HashMap; -import java.util.Objects; import java.util.UUID; /**