From f85839559ad7002dffbe3c5999a75e801ef9c4d1 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 26 Sep 2024 23:34:13 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=BB=9F=E4=B8=80=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoconfigure/JustAuthAutoConfiguration.java | 6 +++--- ...pl.java => AuthStateCacheRedisDefaultImpl.java} | 4 ++-- .../autoconfigure/dao/SaTokenDaoConfiguration.java | 4 ++-- ...isImpl.java => SaTokenDaoRedisDefaultImpl.java} | 4 ++-- .../continew-starter-extension-tenant-mp/pom.xml | 14 +++++++------- .../autoconfigure/TenantAutoConfiguration.java | 6 +++--- ...dlerImpl.java => DefaultTenantLineHandler.java} | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) rename continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/{JustAuthStateCacheRedisImpl.java => AuthStateCacheRedisDefaultImpl.java} (95%) rename continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/{SaTokenDaoRedisImpl.java => SaTokenDaoRedisDefaultImpl.java} (95%) rename continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/{TenantLineHandlerImpl.java => DefaultTenantLineHandler.java} (87%) diff --git a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java index 24101077..3cbcd1be 100644 --- a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java +++ b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; -import top.continew.starter.auth.justauth.core.JustAuthStateCacheRedisImpl; +import top.continew.starter.auth.justauth.core.AuthStateCacheRedisDefaultImpl; import top.continew.starter.core.constant.PropertiesConstants; /** @@ -41,13 +41,13 @@ public class JustAuthAutoConfiguration { private static final Logger log = LoggerFactory.getLogger(JustAuthAutoConfiguration.class); /** - * 自定义 State 缓存实现 + * State 缓存 Redis 实现（默认） */ @Bean @ConditionalOnClass(RedisClient.class) @ConditionalOnProperty(prefix = "justauth.cache", name = "type", havingValue = "redis") public AuthStateCache authStateCache() { - JustAuthStateCacheRedisImpl impl = new JustAuthStateCacheRedisImpl(); + AuthStateCacheRedisDefaultImpl impl = new AuthStateCacheRedisDefaultImpl(); log.debug("[ContiNew Starter] - Auto Configuration 'JustAuth-AuthStateCache-Redis' completed initialization."); return impl; } diff --git a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/AuthStateCacheRedisDefaultImpl.java similarity index 95% rename from continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java rename to continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/AuthStateCacheRedisDefaultImpl.java index 64ef5742..632f4583 100644 --- a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java +++ b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/AuthStateCacheRedisDefaultImpl.java @@ -22,12 +22,12 @@ import top.continew.starter.cache.redisson.util.RedisUtils; import java.time.Duration; /** - * JustAuth State 缓存 Redis 实现 + * 默认 State 缓存 Redis 实现 * * @author Charles7c * @since 1.0.0 */ -public class JustAuthStateCacheRedisImpl implements AuthStateCache { +public class AuthStateCacheRedisDefaultImpl implements AuthStateCache { private static final String KEY_PREFIX = "SOCIAL_AUTH_STATE"; diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java index 78f04b13..32e4ed44 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java @@ -60,7 +60,7 @@ public class SaTokenDaoConfiguration { } /** - * 自定义持久层实现-Redis + * 自定义持久层实现-Redis（默认） */ @ConditionalOnMissingBean(SaTokenDao.class) @ConditionalOnClass(RedisClient.class) @@ -73,7 +73,7 @@ public class SaTokenDaoConfiguration { @Bean public SaTokenDao saTokenDao() { - return new SaTokenDaoRedisImpl(); + return new SaTokenDaoRedisDefaultImpl(); } } diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisDefaultImpl.java similarity index 95% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisDefaultImpl.java index 26d3a511..908dfd29 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisDefaultImpl.java @@ -26,12 +26,12 @@ import java.util.Collection; import java.util.List; /** - * Sa-Token 持久层 Redis 实现（参考：Sa-Token/sa-token-plugin/sa-token-dao-redisx/SaTokenDaoOfRedis.java） + * 默认 Sa-Token 持久层 Redis 实现（参考：Sa-Token/sa-token-plugin/sa-token-dao-redisx/SaTokenDaoOfRedis.java） * * @author Charles7c * @since 1.0.0 */ -public class SaTokenDaoRedisImpl implements SaTokenDao { +public class SaTokenDaoRedisDefaultImpl implements SaTokenDao { @Override public String get(String key) { diff --git a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/pom.xml b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/pom.xml index 1eee9b68..a55f452e 100644 --- a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/pom.xml +++ b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/pom.xml @@ -13,16 +13,10 @@ ContiNew Starter 扩展模块 - 多租户 - MyBatis Plus ORM 模块 - - - top.continew - continew-starter-extension-tenant-core - - com.baomidou - mybatis-plus-spring-boot3-starter + mybatis-plus-extension @@ -31,5 +25,11 @@ dynamic-datasource-spring-boot3-starter true + + + + top.continew + continew-starter-extension-tenant-core + \ No newline at end of file diff --git a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantAutoConfiguration.java b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantAutoConfiguration.java index c92ae968..53bcffb9 100644 --- a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantAutoConfiguration.java +++ b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantAutoConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import top.continew.starter.core.constant.PropertiesConstants; -import top.continew.starter.extension.tenant.handler.TenantLineHandlerImpl; +import top.continew.starter.extension.tenant.handler.DefaultTenantLineHandler; /** * 多租户自动配置 @@ -64,12 +64,12 @@ public class TenantAutoConfiguration { } /** - * 租户行级隔离处理器 + * 租户行级隔离处理器（默认） */ @Bean @ConditionalOnMissingBean public TenantLineHandler tenantLineHandler(TenantProperties properties) { - return new TenantLineHandlerImpl(properties); + return new DefaultTenantLineHandler(properties); } } } diff --git a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/TenantLineHandlerImpl.java b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/DefaultTenantLineHandler.java similarity index 87% rename from continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/TenantLineHandlerImpl.java rename to continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/DefaultTenantLineHandler.java index 55318b9a..d042db20 100644 --- a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/TenantLineHandlerImpl.java +++ b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/DefaultTenantLineHandler.java @@ -8,16 +8,16 @@ import top.continew.starter.extension.tenant.autoconfigure.TenantProperties; import top.continew.starter.extension.tenant.context.TenantContextHolder; /** - * 租户行级隔离处理器 + * 默认租户行级隔离处理器 * * @author Charles7c * @since 2.7.0 */ -public class TenantLineHandlerImpl implements TenantLineHandler { +public class DefaultTenantLineHandler implements TenantLineHandler { private final TenantProperties tenantProperties; - public TenantLineHandlerImpl(TenantProperties tenantProperties) { + public DefaultTenantLineHandler(TenantProperties tenantProperties) { this.tenantProperties = tenantProperties; }