From 478bbf6959e1e1f2f6965837f7fd797dce6e9e12 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sat, 26 Dec 2020 11:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90auth=E3=80=91=E6=95=B4=E7=90=86auth?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-d-auth/auth-sdk/pom.xml | 6 +++--- .../roses/kernel/auth/session/DefaultSessionManager.java | 2 +- .../session/cache/logintoken/MemoryLoginTokenCache.java | 2 +- .../auth/session/cache/logintoken/RedisLoginTokenCache.java | 2 +- .../auth/session/cache/loginuser/MemoryLoginUserCache.java | 2 +- .../auth/session/cache/loginuser/RedisLoginUserCache.java | 2 +- kernel-d-auth/auth-spring-boot-starter/pom.xml | 2 +- .../kernel/auth/starter/GunsAuthAutoConfiguration.java | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/kernel-d-auth/auth-sdk/pom.xml b/kernel-d-auth/auth-sdk/pom.xml index 76519ce78..242798772 100644 --- a/kernel-d-auth/auth-sdk/pom.xml +++ b/kernel-d-auth/auth-sdk/pom.xml @@ -62,18 +62,18 @@ - com.sedinbj.kernel + cn.stylefeng.roses cache-api 1.0.0 - com.sedinbj.kernel + cn.stylefeng.roses cache-sdk-memory 1.0.0 provided - com.sedinbj.kernel + cn.stylefeng.roses cache-sdk-redis 1.0.0 provided diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/DefaultSessionManager.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/DefaultSessionManager.java index d2033b044..e051e5523 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/DefaultSessionManager.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/DefaultSessionManager.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.auth.session; import cn.stylefeng.roses.kernel.auth.api.SessionManagerApi; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; -import com.sedinbj.kernel.cache.api.CacheOperatorApi; +import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi; import java.util.HashSet; import java.util.Set; diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/logintoken/MemoryLoginTokenCache.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/logintoken/MemoryLoginTokenCache.java index 1badc23ea..20f74edf7 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/logintoken/MemoryLoginTokenCache.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/logintoken/MemoryLoginTokenCache.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.auth.session.cache.logintoken; import cn.hutool.cache.impl.TimedCache; -import com.sedinbj.kernel.cache.AbstractMemoryCacheOperator; +import cn.stylefeng.roses.kernel.cache.AbstractMemoryCacheOperator; import java.util.Set; diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/logintoken/RedisLoginTokenCache.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/logintoken/RedisLoginTokenCache.java index b19da3dbb..70c4466f6 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/logintoken/RedisLoginTokenCache.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/logintoken/RedisLoginTokenCache.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.auth.session.cache.logintoken; -import com.sedinbj.kernel.cache.AbstractRedisCacheOperator; +import cn.stylefeng.roses.kernel.cache.AbstractRedisCacheOperator; import org.springframework.data.redis.core.RedisTemplate; import java.util.Set; diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/loginuser/MemoryLoginUserCache.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/loginuser/MemoryLoginUserCache.java index 330b6b1cc..1c12a6c8e 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/loginuser/MemoryLoginUserCache.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/loginuser/MemoryLoginUserCache.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.auth.session.cache.loginuser; import cn.hutool.cache.impl.TimedCache; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; -import com.sedinbj.kernel.cache.AbstractMemoryCacheOperator; +import cn.stylefeng.roses.kernel.cache.AbstractMemoryCacheOperator; import static cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants.LOGGED_TOKEN_PREFIX; diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/loginuser/RedisLoginUserCache.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/loginuser/RedisLoginUserCache.java index cb0fcf3f8..2db2aa536 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/loginuser/RedisLoginUserCache.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/session/cache/loginuser/RedisLoginUserCache.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.auth.session.cache.loginuser; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; -import com.sedinbj.kernel.cache.AbstractRedisCacheOperator; +import cn.stylefeng.roses.kernel.cache.AbstractRedisCacheOperator; import org.springframework.data.redis.core.RedisTemplate; import static cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants.LOGGED_TOKEN_PREFIX; diff --git a/kernel-d-auth/auth-spring-boot-starter/pom.xml b/kernel-d-auth/auth-spring-boot-starter/pom.xml index f032f0fde..aae5c9c3c 100644 --- a/kernel-d-auth/auth-spring-boot-starter/pom.xml +++ b/kernel-d-auth/auth-spring-boot-starter/pom.xml @@ -26,7 +26,7 @@ - com.sedinbj.kernel + cn.stylefeng.roses cache-sdk-memory 1.0.0 diff --git a/kernel-d-auth/auth-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/auth/starter/GunsAuthAutoConfiguration.java b/kernel-d-auth/auth-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/auth/starter/GunsAuthAutoConfiguration.java index a1ea8884b..0ebcaafdb 100644 --- a/kernel-d-auth/auth-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/auth/starter/GunsAuthAutoConfiguration.java +++ b/kernel-d-auth/auth-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/auth/starter/GunsAuthAutoConfiguration.java @@ -12,13 +12,13 @@ import cn.stylefeng.roses.kernel.auth.password.RsaPasswordTransferEncrypt; import cn.stylefeng.roses.kernel.auth.session.DefaultSessionManager; import cn.stylefeng.roses.kernel.auth.session.cache.logintoken.MemoryLoginTokenCache; import cn.stylefeng.roses.kernel.auth.session.cache.loginuser.MemoryLoginUserCache; +import cn.stylefeng.roses.kernel.cache.api.constants.CacheConstants; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import java.util.Set; -import static com.sedinbj.kernel.cache.api.constants.CacheConstants.NONE_EXPIRED_TIME; /** * 认证和鉴权模块的自动配置 @@ -67,7 +67,7 @@ public class GunsAuthAutoConfiguration { Long sessionExpiredSeconds = AuthConfigExpander.getSessionExpiredSeconds(); TimedCache loginUsers = CacheUtil.newTimedCache(1000L * sessionExpiredSeconds); - TimedCache> loginTokens = CacheUtil.newTimedCache(NONE_EXPIRED_TIME); + TimedCache> loginTokens = CacheUtil.newTimedCache(CacheConstants.NONE_EXPIRED_TIME); MemoryLoginUserCache memoryLoginUserCache = new MemoryLoginUserCache(loginUsers); MemoryLoginTokenCache memoryLoginTokenCache = new MemoryLoginTokenCache(loginTokens);