release: v2.7.0

Spring Boot 3.2.7 => 3.2.10
MyBatis Plus 3.5.7 => 3.5.8
Redisson 3.35.0 => 3.36.0
CosID 2.9.6 => 2.9.8
SMS4J 3.2.1 => 3.3.3
X File Storage 2.2.0 => 2.2.1

CHANGELOG.md

@@ -1,3 +1,36 @@
+## [v2.7.0](https://github.com/continew-org/continew-starter/compare/v2.6.0...v2.7.0) (2024-09-28)
+
+### ✨ 新特性
+
+- 【data/mp】新增乐观锁插件启用配置（默认关闭） ([08ef09c](https://github.com/continew-org/continew-starter/commit/08ef09c9b594dca75b39e36add38998826b234bf))
+- 【extension/tenant】新增 continew-starter-extension-tenant 多租户模块 ([1a97a1b](https://github.com/continew-org/continew-starter/commit/1a97a1b709ee0c04300fd39758506fd479da0713)) ([f843791](https://github.com/continew-org/continew-starter/commit/f8437918de342ee45d15df30c20de5e8d3b18379))
+- 【extension/datapermission】新增数据权限模块（原 data/mp 中数据权限移除） ([7666d56](https://github.com/continew-org/continew-starter/commit/7666d56019bb309dca004d43b0717f6bb0e56c8f))
+
+### 💎 功能优化
+
+- 【data/mp】移除多数据源依赖，如需使用可手动引入 ([06d3a6c](https://github.com/continew-org/continew-starter/commit/06d3a6ca412b0bdeba9c0e460db6a0b05215b6b3))
+- 完善 ConditionalOnProperty 配置 ([0cede6b](https://github.com/continew-org/continew-starter/commit/0cede6bf9fc89e0c5009e9721b5cea2cf73b890c))
+- 优化部分代码写法 ([1fc80cd](https://github.com/continew-org/continew-starter/commit/1fc80cda9eb5b377b30d834692dff58d8f93053b))
+- 优化代码格式 ([46773df](https://github.com/continew-org/continew-starter/commit/46773df9dd2dc473459d58fc17f650d3da260545))
+- 【data/mp】移除 QueryIgnore 的无用属性 ([0c334da](https://github.com/continew-org/continew-starter/commit/0c334dadcce9d74301dbcc3c336dc28ffc4cf62e))
+- 【file/excel】导出方法增加排除字段参数 ([3535ac6](https://github.com/continew-org/continew-starter/commit/3535ac64f79c7c3d8e03d8ed2a996ebdfab1ff92))
+- 统一部分命名风格 ([f858395](https://github.com/continew-org/continew-starter/commit/f85839559ad7002dffbe3c5999a75e801ef9c4d1))
+- 优化部分依赖传递范围 ([cd69b2a](https://github.com/continew-org/continew-starter/commit/cd69b2adb67cf17b12619f06b8e81492cbb41c26))
+
+### 🐛 问题修复
+
+- 【log/interceptor】修复 continew-starter.log.exclude-patterns 配置不生效的问题 ([ca1b92c](https://github.com/continew-org/continew-starter/commit/ca1b92cde3cf8f9d9ee0b7420f5b13f200e80781))
+- 【log/interceptor】修复全局配置和局部配置包含请求、响应体冲突 ([be4dec5](https://github.com/continew-org/continew-starter/commit/be4dec5a3039625e62d346dbb148206b602af6aa))
+
+### 📦 依赖升级
+
+- Spring Boot 3.2.7 => 3.2.10 ([802dcb5](https://github.com/continew-org/continew-starter/commit/802dcb5735562e911e3a51741cfcf17dbe59a89e))
+- MyBatis Plus 3.5.7 => 3.5.8
+- Redisson 3.35.0 => 3.36.0
+- CosID 2.9.6 => 2.9.8
+- SMS4J 3.2.1 => 3.3.3
+- X File Storage 2.2.0 => 2.2.1
+
 ## [v2.6.0](https://github.com/continew-org/continew-starter/compare/v2.5.2...v2.6.0) (2024-09-06)
 
 ### ✨ 新特性
@@ -27,9 +60,7 @@
 - MyBatis Flex 1.9.3 => 1.9.7
 - Redisson 3.32.0 => 3.35.0
 - Cos ID 2.9.1 => 2.9.6
-- SMS4J 3.2.1 => 3.3.2
+- Hutool 5.8.29 => 5.8.32
-- X File Storage 2.2.0 => 2.2.1
-- Hutool 5.8.32 => 5.8.29
 - aws-java-sdk-s3 1.12.761 => 1.12.771
 - snakeyaml 2.2 => 2.3
 

README.md

@@ -72,6 +72,11 @@ ContiNew Starter 就是将脚手架项目中的通用基础配置进行了封装
 
 第一种方式：如您使用的是 Spring Boot Parent 的方式，则替换 Spring Boot Parent 为 ContiNew Starter
 
+> 最新稳定版（latest-version）
+<a href="https://central.sonatype.com/search?q=continew-starter" target="_blank" rel="noopener" style="display: inline-block;">
+<img src="https://img.shields.io/maven-central/v/top.continew/continew-starter.svg?label=Maven%20Central&logo=sonatype&logoColor=FFF" alt="Release" />
+</a>
+
 ```xml
 <parent>
     <groupId>top.continew</groupId>
@@ -137,100 +142,54 @@ continew-starter.web:
 
 ## 模块结构
 
-### 核心模块
+```
-
+continew-starter
-| 模块名称              | 模块说明                             | 依赖版本                                                                                                                                                                                      |
+├─ continew-starter-core（核心模块：包含线程池等自动配置）
-| --------------------- | ------------------------------------ |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+├─ continew-starter-json（JSON 模块）
-| continew-starter-core | 核心模块：包含线程池、项目等自动配置 | <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a>：3.1.11<br /><a href="https://www.hutool.cn/" target="_blank">Hutool</a>：5.8.29<br />mica-ip2region：3.2.6 |
+│  └─ continew-starter-json-jackson
-
+├─ continew-starter-api-doc（接口文档模块：Spring Doc + Knife4j）
-### JSON模块
+├─ continew-starter-web（Web 开发模块：包含跨域、全局异常+响应、链路追踪等自动配置）
-
+├─ continew-starter-auth（认证模块）
-| 模块名称                      | 模块说明             |
+│  ├─ continew-starter-auth-satoken（国产轻量认证鉴权）
-| ----------------------------- | -------------------- |
+│  └─ continew-starter-auth-justauth（第三方登录）
-| continew-starter-json-jackson | Jackson 序列化等配置 |
+├─ continew-starter-data（数据访问模块）
-
+│  ├─ continew-starter-data-core（通用模块）
-### 接口文档
+│  ├─ continew-starter-data-mp（MyBatis Plus）
-
+│  └─ continew-starter-data-mf（MyBatis Flex）
-| 模块名称                 | 模块说明         |
+├─ continew-starter-cache（缓存模块）
-| ------------------------ | ---------------- |
+│  ├─ continew-starter-cache-redisson（Redisson）
-| continew-starter-api-doc | Knife4j 自动配置 |
+│  ├─ continew-starter-cache-jetcache（JetCache 多级缓存）
-
+│  └─ continew-starter-cache-springcache（Spring 缓存）
-### 安全模块
+├─ continew-starter-security（安全模块）
-
+│  ├─ continew-starter-security-crypto（加密：字段加解密）
-| 模块名称                           | 模块说明          |
+│  ├─ continew-starter-security-mask（脱敏：JSON 数据脱敏）
-| ---------------------------------- | ----------------- |
+│  ├─ continew-starter-security-limiter（限流）
-| continew-starter-security-password | 密码编码器        |
+│  └─ continew-starter-security-password（密码编码器）
-| continew-starter-security-mask     | JSON 脱敏         |
+├─ continew-starter-captcha（验证码模块）
-| continew-starter-security-crypto   | 数据库字段加/解密 |
+│  ├─ continew-starter-captcha-graphic（静态验证码）
-| continew-starter-security-limiter  | 限流器            |
+│  └─ continew-starter-captcha-behavior（动态验证码）
-
+├─ continew-starter-messaging（消息模块）
-### Web模块
+│  ├─ continew-starter-messaging-mail（邮件）
-
+│  └─ continew-starter-messaging-websocket（WebSocket）
-| 模块名称             | 模块说明                           |
+├─ continew-starter-log（日志模块）
-| -------------------- | ---------------------------------- |
+│  ├─ continew-starter-log-core（通用模块）
-| continew-starter-web | 跨域、全局异常、错误处理等自动配置 |
+│  └─ continew-starter-log-interceptor（拦截器版（Spring Boot Actuator HttpTrace 增强版））
-
+├─ continew-starter-file（文件处理模块）
-### 日志模块
+│  └─ continew-starter-file-excel（Easy Excel）
-
+├─ continew-starter-storage（存储模块）
-| 模块名称                             | 模块说明                                  |
+│  └─ continew-starter-storage-local（本地存储）
-|----------------------------------| ----------------------------------------- |
+└─ continew-starter-extension（扩展模块）
-| continew-starter-log-core        | 日志核心模块                              |
+   ├─ continew-starter-extension-datapermission（数据权限模块）
-| continew-starter-log-interceptor | 拦截器版（Spring Boot Actuator HttpTrace 增强版） |
+   │  ├─ continew-starter-extension-datapermission-core（通用模块）
-
+   │  └─ continew-starter-extension-datapermission-mp（MyBatis Plus）
-### 存储模块
+   ├─ continew-starter-extension-tenant（多租户模块）
-
+   │  ├─ continew-starter-extension-tenant-core（通用模块）
-| 模块名称                       | 模块说明 |
+   │  └─ continew-starter-extension-tenant-mp（MyBatis Plus）
-| ------------------------------ | -------- |
+   └─ continew-starter-extension-crud（CRUD 模块）
-| continew-starter-storage-local | 本地存储 |
+      ├─ continew-starter-extension-crud-core（通用模块）
-
+      ├─ continew-starter-extension-crud-mp（MyBatis Plus）
-### 文件处理模块
+      └─ continew-starter-extension-crud-mf（MyBatis Flex）
-
+```
-| 模块名称                    | 模块说明       |
-| --------------------------- | -------------- |
-| continew-starter-file-excel | Excel 相关配置 |
-
-### 验证码模块
-
-| 模块名称                          | 模块说明   |
-| --------------------------------- | ---------- |
-| continew-starter-captcha-graphic  | 图形验证码 |
-| continew-starter-captcha-behavior | 行为验证码 |
-
-### 缓存模块
-
-| 模块名称                           | 模块说明              |
-| ---------------------------------- | --------------------- |
-| continew-starter-cache-redisson    | Redisson 自动配置     |
-| continew-starter-cache-springcache | Spring Cache 自动配置 |
-| continew-starter-cache-jetcache    | JetCache 自动配置     |
-
-### 数据访问模块
-
-| 模块名称                       | 模块说明              |
-|----------------------------| --------------------- |
-| continew-starter-data-core | 数据访问核心模块      |
-| continew-starter-data-mp   | MyBatis Plus 自动配置 |
-| continew-starter-data-mf   | MyBatis Flex 自动配置 |
-
-### 认证模块
-
-| 模块名称                       | 模块说明          |
-| ------------------------------ | ----------------- |
-| continew-starter-auth-satoken  | SaToken 自动配置  |
-| continew-starter-auth-justauth | JustAuth 自动配置 |
-
-### 消息模块
-
-| 模块名称                             | 模块说明  |
-| ------------------------------------ | --------- |
-| continew-starter-messaging-mail      | 邮件      |
-| continew-starter-messaging-websocket | WebSocket |
-
-### 扩展模块
-
-| 模块名称                        | 模块说明                                      |
-| ------------------------------- | --------------------------------------------- |
-| continew-starter-extension-crud | 扩展模块：BaseController 自定义 CRUD API 封装 |
 
 ## 贡献代码
 

continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java

@@ -28,7 +28,9 @@ import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.configuration.SpringDocConfiguration;
-import org.springdoc.core.customizers.*;
+import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
+import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
+import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
 import org.springdoc.core.properties.SpringDocConfigProperties;
 import org.springdoc.core.providers.JavadocProvider;
 import org.springdoc.core.service.OpenAPIService;
@@ -48,7 +50,9 @@ import top.continew.starter.apidoc.handler.OpenApiHandler;
 import top.continew.starter.core.autoconfigure.project.ProjectProperties;
 import top.continew.starter.core.util.GeneralPropertySourceFactory;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 /**

continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/handler/BaseEnumParameterHandler.java

@@ -26,12 +26,12 @@ import io.swagger.v3.oas.models.parameters.Parameter;
 import org.springdoc.core.customizers.ParameterCustomizer;
 import org.springdoc.core.customizers.PropertyCustomizer;
 import org.springframework.core.MethodParameter;
+import top.continew.starter.apidoc.util.DocUtils;
+import top.continew.starter.core.enums.BaseEnum;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.List;
-import top.continew.starter.apidoc.util.DocUtils;
-import top.continew.starter.core.enums.BaseEnum;
 
 /**
  * 自定义 BaseEnum 枚举参数处理器

continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/handler/OpenApiHandler.java

@@ -146,12 +146,15 @@ public class OpenApiHandler extends OpenAPIService {
         super(openAPI, securityParser, springDocConfigProperties, propertyResolverUtils, openApiBuilderCustomizers, serverBaseUrlCustomizers, javadocProvider);
         if (openAPI.isPresent()) {
             this.openAPI = openAPI.get();
-            if (this.openAPI.getComponents() == null)
+            if (this.openAPI.getComponents() == null) {
                 this.openAPI.setComponents(new Components());
-            if (this.openAPI.getPaths() == null)
+            }
+            if (this.openAPI.getPaths() == null) {
                 this.openAPI.setPaths(new Paths());
-            if (!CollectionUtils.isEmpty(this.openAPI.getServers()))
+            }
+            if (!CollectionUtils.isEmpty(this.openAPI.getServers())) {
                 this.isServersPresent = true;
+            }
         }
         this.propertyResolverUtils = propertyResolverUtils;
         this.securityParser = securityParser;
@@ -159,8 +162,9 @@ public class OpenApiHandler extends OpenAPIService {
         this.openApiBuilderCustomisers = openApiBuilderCustomizers;
         this.serverBaseUrlCustomizers = serverBaseUrlCustomizers;
         this.javadocProvider = javadocProvider;
-        if (springDocConfigProperties.isUseFqn())
+        if (springDocConfigProperties.isUseFqn()) {
             TypeNameResolver.std.setUseFqn(true);
+        }
     }
 
     @Override
@@ -172,10 +176,11 @@ public class OpenApiHandler extends OpenAPIService {
         buildTagsFromMethod(handlerMethod.getMethod(), tags, tagsStr, locale);
         buildTagsFromClass(handlerMethod.getBeanType(), tags, tagsStr, locale);
 
-        if (!CollectionUtils.isEmpty(tagsStr))
+        if (!CollectionUtils.isEmpty(tagsStr)) {
             tagsStr = tagsStr.stream()
                 .map(str -> propertyResolverUtils.resolve(str, locale))
                 .collect(Collectors.toSet());
+        }
 
         if (springdocTags.containsKey(handlerMethod)) {
             Tag tag = springdocTags.get(handlerMethod);
@@ -186,9 +191,9 @@ public class OpenApiHandler extends OpenAPIService {
         }
 
         if (!CollectionUtils.isEmpty(tagsStr)) {
-            if (CollectionUtils.isEmpty(operation.getTags()))
+            if (CollectionUtils.isEmpty(operation.getTags())) {
                 operation.setTags(new ArrayList<>(tagsStr));
-            else {
+            } else {
                 Set<String> operationTagsSet = new HashSet<>(operation.getTags());
                 operationTagsSet.addAll(tagsStr);
                 operation.getTags().clear();
@@ -223,8 +228,9 @@ public class OpenApiHandler extends OpenAPIService {
         if (!CollectionUtils.isEmpty(tags)) {
             // Existing tags
             List<Tag> openApiTags = openAPI.getTags();
-            if (!CollectionUtils.isEmpty(openApiTags))
+            if (!CollectionUtils.isEmpty(openApiTags)) {
                 tags.addAll(openApiTags);
+            }
             openAPI.setTags(new ArrayList<>(tags));
         }
 
@@ -232,10 +238,11 @@ public class OpenApiHandler extends OpenAPIService {
         io.swagger.v3.oas.annotations.security.SecurityRequirement[] securityRequirements = securityParser
             .getSecurityRequirements(handlerMethod);
         if (securityRequirements != null) {
-            if (securityRequirements.length == 0)
+            if (securityRequirements.length == 0) {
                 operation.setSecurity(Collections.emptyList());
-            else
+            } else {
                 securityParser.buildSecurityRequirement(securityRequirements, operation);
+            }
         }
 
         return operation;
@@ -263,8 +270,9 @@ public class OpenApiHandler extends OpenAPIService {
             tagsSet.forEach(tag -> {
                 tag.name(propertyResolverUtils.resolve(tag.getName(), locale));
                 tag.description(propertyResolverUtils.resolve(tag.getDescription(), locale));
-                if (tags.stream().noneMatch(t -> t.getName().equals(tag.getName())))
+                if (tags.stream().noneMatch(t -> t.getName().equals(tag.getName()))) {
                     tags.add(tag);
+                }
             });
         });
     }

continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/util/DocUtils.java

@@ -16,14 +16,15 @@
 
 package top.continew.starter.apidoc.util;
 
+import org.springframework.web.bind.annotation.RestController;
+import top.continew.starter.core.enums.BaseEnum;
+
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.springframework.web.bind.annotation.RestController;
-import top.continew.starter.core.enums.BaseEnum;
 
 /**
  * 接口文档工具类

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;
 
 /**
@@ -35,19 +35,19 @@ import top.continew.starter.core.constant.PropertiesConstants;
  * @since 1.0.0
  */
 @AutoConfiguration(before = com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration.class)
-@ConditionalOnProperty(prefix = "justauth", name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = "justauth", name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 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;
     }

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";
 

continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java

@@ -29,7 +29,10 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import top.continew.starter.auth.satoken.autoconfigure.dao.SaTokenDaoConfiguration;
@@ -78,8 +81,7 @@ public class SaTokenAutoConfiguration implements WebMvcConfigurer {
     @Configuration
     @Import({SaTokenDaoConfiguration.Default.class, SaTokenDaoConfiguration.Redis.class,
         SaTokenDaoConfiguration.Custom.class})
-    protected static class SaTokenDaoAutoConfiguration {
+    protected static class SaTokenDaoAutoConfiguration {}
-    }
 
     /**
      * 整合 JWT（简单模式）

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();
         }
     }
 

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) {

continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java

@@ -46,7 +46,7 @@ import java.util.List;
  * @since 1.0.0
  */
 @AutoConfiguration
-@ConditionalOnProperty(prefix = "spring.data.redisson", name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.data.redisson", name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 @EnableConfigurationProperties(RedissonProperties.class)
 public class RedissonAutoConfiguration {
 

continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaAutoConfiguration.java

@@ -49,7 +49,7 @@ import java.util.Properties;
  */
 @AutoConfiguration
 @EnableConfigurationProperties(BehaviorCaptchaProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.CAPTCHA_BEHAVIOR, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.CAPTCHA_BEHAVIOR, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public class BehaviorCaptchaAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(BehaviorCaptchaAutoConfiguration.class);

continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaAutoConfiguration.java

@@ -35,7 +35,7 @@ import top.continew.starter.core.constant.PropertiesConstants;
  */
 @AutoConfiguration
 @EnableConfigurationProperties(GraphicCaptchaProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.CAPTCHA_GRAPHIC, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.CAPTCHA_GRAPHIC, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public class GraphicCaptchaAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(GraphicCaptchaAutoConfiguration.class);

continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/core/GraphicCaptchaService.java

@@ -16,8 +16,8 @@
 
 package top.continew.starter.captcha.graphic.core;
 
-import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.ReflectUtil;
 import com.wf.captcha.base.Captcha;
 import top.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaProperties;
 

continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java

@@ -31,5 +31,4 @@ import org.springframework.context.annotation.Import;
 @ComponentScan("cn.hutool.extra.spring")
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 @EnableConfigurationProperties(ProjectProperties.class)
-public class ProjectAutoConfiguration {
+public class ProjectAutoConfiguration {}
-}

continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java

@@ -42,7 +42,7 @@ import java.util.concurrent.Executor;
 @Lazy
 @AutoConfiguration
 @EnableAsync(proxyTargetClass = true)
-@ConditionalOnProperty(prefix = "spring.task.execution.extension", name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.task.execution.extension", name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public class AsyncAutoConfiguration implements AsyncConfigurer {
 
     private static final Logger log = LoggerFactory.getLogger(AsyncAutoConfiguration.class);

continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java

@@ -52,7 +52,7 @@ public class ThreadPoolAutoConfiguration {
      * 异步任务线程池配置
      */
     @Bean
-    @ConditionalOnProperty(prefix = "spring.task.execution.extension", name = PropertiesConstants.ENABLED, matchIfMissing = true)
+    @ConditionalOnProperty(prefix = "spring.task.execution.extension", name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
     public ThreadPoolTaskExecutorCustomizer threadPoolTaskExecutorCustomizer(ThreadPoolExtensionProperties properties) {
         return executor -> {
             // 核心（最小）线程数
@@ -71,7 +71,7 @@ public class ThreadPoolAutoConfiguration {
      * 定时任务线程池配置
      */
     @EnableScheduling
-    @ConditionalOnProperty(prefix = "spring.task.scheduling.extension", name = PropertiesConstants.ENABLED, matchIfMissing = true)
+    @ConditionalOnProperty(prefix = "spring.task.scheduling.extension", name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
     public static class TaskSchedulerConfiguration {
         @Bean
         public ThreadPoolTaskSchedulerCustomizer threadPoolTaskSchedulerCustomizer(ThreadPoolExtensionProperties properties) {

continew-starter-core/src/main/java/top/continew/starter/core/constant/PropertiesConstants.java

@@ -119,6 +119,16 @@ public class PropertiesConstants {
      */
     public static final String MESSAGING_WEBSOCKET = MESSAGING + StringConstants.DOT + "websocket";
 
+    /**
+     * 数据权限配置
+     */
+    public static final String DATA_PERMISSION = CONTINEW_STARTER + StringConstants.DOT + "data-permission";
+
+    /**
+     * 多租户配置
+     */
+    public static final String TENANT = CONTINEW_STARTER + StringConstants.DOT + "tenant";
+
     private PropertiesConstants() {
     }
 }

continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java

@@ -120,8 +120,7 @@ public class StringConstants {
     public static final String DOT = StrPool.DOT;
 
     /**
-     * 字符串常量：双点 {@code ".."} <br>
+     * 字符串常量：双点 {@code ".."} <br> 用途：作为指向上级文件夹的路径，如：{@code "../path"}
-     * 用途：作为指向上级文件夹的路径，如：{@code "../path"}
      */
     public static final String DOUBLE_DOT = StrPool.DOUBLE_DOT;
 
@@ -136,8 +135,7 @@ public class StringConstants {
     public static final String BACKSLASH = StrPool.BACKSLASH;
 
     /**
-     * 字符串常量：回车符 {@code "\r"} <br>
+     * 字符串常量：回车符 {@code "\r"} <br> 解释：该字符常用于表示 Linux 系统和 MacOS 系统下的文本换行
-     * 解释：该字符常用于表示 Linux 系统和 MacOS 系统下的文本换行
      */
     public static final String CR = StrPool.CR;
 
@@ -147,8 +145,7 @@ public class StringConstants {
     public static final String LF = StrPool.LF;
 
     /**
-     * 字符串常量：Windows 换行 {@code "\r\n"} <br>
+     * 字符串常量：Windows 换行 {@code "\r\n"} <br> 解释：该字符串常用于表示 Windows 系统下的文本换行
-     * 解释：该字符串常用于表示 Windows 系统下的文本换行
      */
     public static final String CRLF = StrPool.CRLF;
 

continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java

@@ -27,12 +27,4 @@ import java.lang.annotation.*;
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface QueryIgnore {
+public @interface QueryIgnore {}
-
-    /**
-     * 获取是否忽略查询解析
-     *
-     * @return 是否忽略查询解析
-     */
-    boolean value() default true;
-}

continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/service/IService.java

@@ -23,5 +23,4 @@ package top.continew.starter.data.mf.service;
  * @author hellokaton
  * @since 1.2.0
  */
-public interface IService<T> extends com.mybatisflex.core.service.IService<T> {
+public interface IService<T> extends com.mybatisflex.core.service.IService<T> {}
-}

continew-starter-data/continew-starter-data-mf/src/main/java/top/continew/starter/data/mf/util/QueryWrapperHelper.java

@@ -143,7 +143,7 @@ public class QueryWrapperHelper {
             }
             // 设置了 @QueryIgnore 注解，直接忽略
             QueryIgnore queryIgnoreAnnotation = field.getAnnotation(QueryIgnore.class);
-            if (null != queryIgnoreAnnotation && queryIgnoreAnnotation.value()) {
+            if (null != queryIgnoreAnnotation) {
                 return Collections.emptyList();
             }
             // 建议：数据库表列建议采用下划线连接法命名，程序变量建议采用驼峰法命名

continew-starter-data/continew-starter-data-mp/pom.xml

@@ -19,12 +19,6 @@
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
-        <!-- Dynamic Datasource（基于 Spring Boot 的快速集成多数据源的启动器） -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
-        </dependency>
-
         <!-- P6Spy（SQL 性能分析组件） -->
         <dependency>
             <groupId>p6spy</groupId>

continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MyBatisPlusExtensionProperties.java

@@ -49,40 +49,21 @@ public class MyBatisPlusExtensionProperties {
     @NestedConfigurationProperty
     private MyBatisPlusIdGeneratorProperties idGenerator;
 
-    /**
-     * 数据权限插件配置
-     */
-    private DataPermissionProperties dataPermission;
-
     /**
      * 分页插件配置
      */
     private PaginationProperties pagination;
 
+    /**
+     * 启用乐观锁插件
+     */
+    private boolean optimisticLockerEnabled = false;
+
     /**
      * 启用防全表更新与删除插件
      */
     private boolean blockAttackPluginEnabled = true;
 
-    /**
-     * 数据权限插件配置属性
-     */
-    public static class DataPermissionProperties {
-
-        /**
-         * 是否启用数据权限插件
-         */
-        private boolean enabled = false;
-
-        public boolean isEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
-    }
-
     /**
      * 分页插件配置属性
      */
@@ -165,14 +146,6 @@ public class MyBatisPlusExtensionProperties {
         this.idGenerator = idGenerator;
     }
 
-    public DataPermissionProperties getDataPermission() {
-        return dataPermission;
-    }
-
-    public void setDataPermission(DataPermissionProperties dataPermission) {
-        this.dataPermission = dataPermission;
-    }
-
     public PaginationProperties getPagination() {
         return pagination;
     }
@@ -181,6 +154,14 @@ public class MyBatisPlusExtensionProperties {
         this.pagination = pagination;
     }
 
+    public boolean isOptimisticLockerEnabled() {
+        return optimisticLockerEnabled;
+    }
+
+    public void setOptimisticLockerEnabled(boolean optimisticLockerEnabled) {
+        this.optimisticLockerEnabled = optimisticLockerEnabled;
+    }
+
     public boolean isBlockAttackPluginEnabled() {
         return blockAttackPluginEnabled;
     }

continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/autoconfigure/MybatisPlusAutoConfiguration.java

@@ -19,11 +19,7 @@ package top.continew.starter.data.mp.autoconfigure;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusPropertiesCustomizer;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.*;
-import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import jakarta.annotation.PostConstruct;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
@@ -40,8 +36,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import top.continew.starter.core.constant.PropertiesConstants;
 import top.continew.starter.core.util.GeneralPropertySourceFactory;
 import top.continew.starter.data.mp.autoconfigure.idgenerator.MyBatisPlusIdGeneratorConfiguration;
-import top.continew.starter.data.mp.datapermission.DataPermissionFilter;
-import top.continew.starter.data.mp.datapermission.DataPermissionHandlerImpl;
 import top.continew.starter.data.mp.handler.MybatisBaseEnumTypeHandler;
 
 import java.util.Map;
@@ -84,18 +78,15 @@ public class MybatisPlusAutoConfiguration {
         if (!innerInterceptors.isEmpty()) {
             innerInterceptors.values().forEach(interceptor::addInnerInterceptor);
         }
-        // 数据权限插件
-        MyBatisPlusExtensionProperties.DataPermissionProperties dataPermissionProperties = properties
-            .getDataPermission();
-        if (null != dataPermissionProperties && dataPermissionProperties.isEnabled()) {
-            interceptor.addInnerInterceptor(new DataPermissionInterceptor(SpringUtil
-                .getBean(DataPermissionHandler.class)));
-        }
         // 分页插件
         MyBatisPlusExtensionProperties.PaginationProperties paginationProperties = properties.getPagination();
         if (null != paginationProperties && paginationProperties.isEnabled()) {
             interceptor.addInnerInterceptor(this.paginationInnerInterceptor(paginationProperties));
         }
+        // 乐观锁插件
+        if (properties.isOptimisticLockerEnabled()) {
+            interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+        }
         // 防全表更新与删除插件
         if (properties.isBlockAttackPluginEnabled()) {
             interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
@@ -111,16 +102,6 @@ public class MybatisPlusAutoConfiguration {
         MyBatisPlusIdGeneratorConfiguration.Custom.class})
     protected static class MyBatisPlusIdGeneratorAutoConfiguration {}
 
-    /**
-     * 数据权限处理器
-     */
-    @Bean
-    @ConditionalOnMissingBean
-    @ConditionalOnEnabledDataPermission
-    public DataPermissionHandler dataPermissionHandler(DataPermissionFilter dataPermissionFilter) {
-        return new DataPermissionHandlerImpl(dataPermissionFilter);
-    }
-
     /**
      * 分页插件配置（<a href="https://baomidou.com/pages/97710a/#paginationinnerinterceptor">PaginationInnerInterceptor</a>）
      */

continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/IService.java

@@ -23,5 +23,4 @@ package top.continew.starter.data.mp.service;
  * @author Charles7c
  * @since 1.2.0
  */
-public interface IService<T> extends com.baomidou.mybatisplus.extension.service.IService<T> {
+public interface IService<T> extends com.baomidou.mybatisplus.extension.service.IService<T> {}
-}

continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/util/QueryWrapperHelper.java

@@ -16,13 +16,13 @@
 
 package top.continew.starter.data.mp.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Sort;
 import top.continew.starter.core.exception.BadRequestException;
 import top.continew.starter.core.util.ReflectUtils;
@@ -33,7 +33,10 @@ import top.continew.starter.data.core.enums.QueryType;
 import top.continew.starter.data.core.util.SqlInjectionUtils;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -134,7 +137,7 @@ public class QueryWrapperHelper {
             }
             // 设置了 @QueryIgnore 注解，直接忽略
             QueryIgnore queryIgnoreAnnotation = field.getAnnotation(QueryIgnore.class);
-            if (null != queryIgnoreAnnotation && queryIgnoreAnnotation.value()) {
+            if (null != queryIgnoreAnnotation) {
                 return Collections.emptyList();
             }
             // 建议：数据库表列建议采用下划线连接法命名，程序变量建议采用驼峰法命名

continew-starter-dependencies/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.2.7</version>
+        <version>3.2.10</version>
         <relativePath/>
     </parent>
 
@@ -43,23 +43,23 @@
 
     <properties>
         <!-- 项目版本号 -->
-        <revision>2.6.0</revision>
+        <revision>2.7.0</revision>
         <snail-job.version>1.1.2</snail-job.version>
         <sa-token.version>1.39.0</sa-token.version>
         <just-auth.version>1.16.6</just-auth.version>
-        <mybatis-plus.version>3.5.7</mybatis-plus.version>
+        <mybatis-plus.version>3.5.8</mybatis-plus.version>
         <mybatis-flex.version>1.9.7</mybatis-flex.version>
         <dynamic-datasource.version>4.3.1</dynamic-datasource.version>
         <p6spy.version>3.9.1</p6spy.version>
         <jetcache.version>2.7.6</jetcache.version>
-        <redisson.version>3.35.0</redisson.version>
+        <redisson.version>3.36.0</redisson.version>
-        <cosid.version>2.9.6</cosid.version>
+        <cosid.version>2.9.8</cosid.version>
-        <sms4j.version>3.2.1</sms4j.version>
+        <sms4j.version>3.3.3</sms4j.version>
         <aj-captcha.version>1.3.0</aj-captcha.version>
         <easy-captcha.version>1.6.2</easy-captcha.version>
         <easy-excel.version>3.3.4</easy-excel.version>
         <nashorn.version>15.4</nashorn.version>
-        <x-file-storage.version>2.2.0</x-file-storage.version>
+        <x-file-storage.version>2.2.1</x-file-storage.version>
         <aws-s3.version>1.12.771</aws-s3.version>
         <graceful-response.version>5.0.0-boot3</graceful-response.version>
         <crane4j.version>2.9.0</crane4j.version>
@@ -346,14 +346,12 @@
                 <artifactId>continew-starter-extension-crud-core</artifactId>
                 <version>${revision}</version>
             </dependency>
-
             <!-- 扩展模块 - CRUD - MyBatis Plus ORM 模块 -->
             <dependency>
                 <groupId>top.continew</groupId>
                 <artifactId>continew-starter-extension-crud-mp</artifactId>
                 <version>${revision}</version>
             </dependency>
-
             <!-- 扩展模块 - CRUD - MyBatis Flex ORM 模块 -->
             <dependency>
                 <groupId>top.continew</groupId>
@@ -361,6 +359,32 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!-- 扩展模块 - 数据权限 - 核心模块 -->
+            <dependency>
+                <groupId>top.continew</groupId>
+                <artifactId>continew-starter-extension-datapermission-core</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <!-- 扩展模块 - 数据权限 - MyBatis Plus ORM 模块 -->
+            <dependency>
+                <groupId>top.continew</groupId>
+                <artifactId>continew-starter-extension-datapermission-mp</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 扩展模块 - 多租户 - 核心模块 -->
+            <dependency>
+                <groupId>top.continew</groupId>
+                <artifactId>continew-starter-extension-tenant-core</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <!-- 扩展模块 - 多租户 - MyBatis Plus ORM 模块 -->
+            <dependency>
+                <groupId>top.continew</groupId>
+                <artifactId>continew-starter-extension-tenant-mp</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <!-- 认证模块 - JustAuth -->
             <dependency>
                 <groupId>top.continew</groupId>

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml

@@ -53,5 +53,11 @@
             <groupId>top.continew</groupId>
             <artifactId>continew-starter-file-excel</artifactId>
         </dependency>
+
+        <!-- API 文档模块 -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-api-doc</artifactId>
+        </dependency>
     </dependencies>
 </project>

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/EnableCrudRestController.java

@@ -31,5 +31,4 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Import({CrudRestControllerAutoConfiguration.class})
-public @interface EnableCrudRestController {
+public @interface EnableCrudRestController {}
-}

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java

@@ -33,13 +33,11 @@ public interface ValidateGroup extends Default {
         /**
          * 分组校验-创建
          */
-        interface Add extends Crud {
+        interface Add extends Crud {}
-        }
 
         /**
          * 分组校验-修改
          */
-        interface Update extends Crud {
+        interface Update extends Crud {}
-        }
     }
 }

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseService.java

@@ -18,8 +18,8 @@ package top.continew.starter.extension.crud.service;
 
 import cn.hutool.core.lang.tree.Tree;
 import jakarta.servlet.http.HttpServletResponse;
-import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.query.PageQuery;
+import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.resp.LabelValueResp;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java

@@ -34,15 +34,15 @@ import top.continew.starter.core.constant.StringConstants;
 import top.continew.starter.core.util.ReflectUtils;
 import top.continew.starter.core.util.validate.ValidationUtils;
 import top.continew.starter.data.mf.base.BaseMapper;
-import top.continew.starter.data.mf.util.QueryWrapperHelper;
 import top.continew.starter.data.mf.service.impl.ServiceImpl;
+import top.continew.starter.data.mf.util.QueryWrapperHelper;
 import top.continew.starter.extension.crud.annotation.TreeField;
+import top.continew.starter.extension.crud.model.entity.BaseIdDO;
 import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 import top.continew.starter.extension.crud.service.BaseService;
 import top.continew.starter.extension.crud.util.TreeUtils;
-import top.continew.starter.extension.crud.model.entity.BaseIdDO;
 import top.continew.starter.file.excel.util.ExcelUtils;
 
 import java.lang.reflect.Field;

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java

@@ -30,13 +30,13 @@ import org.springframework.web.bind.annotation.*;
 import top.continew.starter.core.constant.StringConstants;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
 import top.continew.starter.extension.crud.enums.Api;
+import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.req.BaseReq;
 import top.continew.starter.extension.crud.model.resp.BaseIdResp;
-import top.continew.starter.extension.crud.util.ValidateGroup;
-import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 import top.continew.starter.extension.crud.service.BaseService;
+import top.continew.starter.extension.crud.util.ValidateGroup;
 
 import java.util.List;
 

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.continew</groupId>
+        <artifactId>continew-starter-extension-datapermission</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>continew-starter-extension-datapermission-core</artifactId>
+    <description>ContiNew Starter 扩展模块 - 数据权限 - 核心模块</description>
+</project>

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/annotation/DataPermission.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.starter.data.mp.datapermission;
+package top.continew.starter.extension.datapermission.annotation;
 
 import java.lang.annotation.*;
 

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/autoconfigure/DataPermissionProperties.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.starter.extension.datapermission.autoconfigure;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import top.continew.starter.core.constant.PropertiesConstants;
+
+/**
+ * 数据权限配置属性
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+@ConfigurationProperties(PropertiesConstants.DATA_PERMISSION)
+public class DataPermissionProperties {
+
+    /**
+     * 是否启用多租户
+     */
+    private boolean enabled = true;
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+}

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/enums/DataScope.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.starter.data.mp.datapermission;
+package top.continew.starter.extension.datapermission.enums;
 
 /**
  * 数据权限枚举

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/filter/DataPermissionUserContextProvider.java

@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
-package top.continew.starter.data.mp.datapermission;
+package top.continew.starter.extension.datapermission.filter;
+
+import top.continew.starter.extension.datapermission.model.UserContext;
 
 /**
- * 数据权限过滤器接口
+ * 数据权限用户上下文提供者
  *
  * @author Charles7c
  * @since 1.1.0
  */
-public interface DataPermissionFilter {
+public interface DataPermissionUserContextProvider {
 
     /**
      * 是否过滤
@@ -32,9 +34,9 @@ public interface DataPermissionFilter {
     boolean isFilter();
 
     /**
-     * 获取当前用户信息
+     * 获取用户上下文
      *
-     * @return 当前用户信息
+     * @return 用户上下文
      */
-    DataPermissionCurrentUser getCurrentUser();
+    UserContext getUserContext();
 }

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/model/RoleContext.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.starter.extension.datapermission.model;
+
+import top.continew.starter.extension.datapermission.enums.DataScope;
+
+/**
+ * 角色上下文
+ *
+ * @author Charles7c
+ * @since 1.1.0
+ */
+public class RoleContext {
+
+    /**
+     * 角色 ID
+     */
+    private String roleId;
+
+    /**
+     * 数据权限
+     */
+    private DataScope dataScope;
+
+    public RoleContext() {
+    }
+
+    public RoleContext(String roleId, DataScope dataScope) {
+        this.roleId = roleId;
+        this.dataScope = dataScope;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public DataScope getDataScope() {
+        return dataScope;
+    }
+
+    public void setDataScope(DataScope dataScope) {
+        this.dataScope = dataScope;
+    }
+}

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/model/UserContext.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package top.continew.starter.data.mp.datapermission;
+package top.continew.starter.extension.datapermission.model;
 
 import java.util.Set;
 
 /**
- * 当前用户信息
+ * 用户上下文
  *
  * @author Charles7c
  * @since 1.1.0
  */
-public class DataPermissionCurrentUser {
+public class UserContext {
 
     /**
      * 用户 ID
@@ -34,53 +34,13 @@ public class DataPermissionCurrentUser {
     /**
      * 角色列表
      */
-    private Set<CurrentUserRole> roles;
+    private Set<RoleContext> roles;
 
     /**
      * 部门 ID
      */
     private String deptId;
 
-    /**
-     * 当前用户角色信息
-     */
-    public static class CurrentUserRole {
-
-        /**
-         * 角色 ID
-         */
-        private String roleId;
-
-        /**
-         * 数据权限
-         */
-        private DataScope dataScope;
-
-        public CurrentUserRole() {
-        }
-
-        public CurrentUserRole(String roleId, DataScope dataScope) {
-            this.roleId = roleId;
-            this.dataScope = dataScope;
-        }
-
-        public String getRoleId() {
-            return roleId;
-        }
-
-        public void setRoleId(String roleId) {
-            this.roleId = roleId;
-        }
-
-        public DataScope getDataScope() {
-            return dataScope;
-        }
-
-        public void setDataScope(DataScope dataScope) {
-            this.dataScope = dataScope;
-        }
-    }
-
     public String getUserId() {
         return userId;
     }
@@ -89,11 +49,11 @@ public class DataPermissionCurrentUser {
         this.userId = userId;
     }
 
-    public Set<CurrentUserRole> getRoles() {
+    public Set<RoleContext> getRoles() {
         return roles;
     }
 
-    public void setRoles(Set<CurrentUserRole> roles) {
+    public void setRoles(Set<RoleContext> roles) {
         this.roles = roles;
     }
 

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.continew</groupId>
+        <artifactId>continew-starter-extension-datapermission</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>continew-starter-extension-datapermission-mp</artifactId>
+    <description>ContiNew Starter 扩展模块 - 数据权限 - MyBatis Plus ORM 模块</description>
+
+    <dependencies>
+        <!-- MyBatis Plus（MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率） -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
+
+        <!-- 核心模块 -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-extension-datapermission-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/autoconfigure/DataPermissionAutoConfiguration.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.starter.extension.datapermission.autoconfigure;
+
+import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.ResolvableType;
+import top.continew.starter.core.constant.PropertiesConstants;
+import top.continew.starter.extension.datapermission.filter.DataPermissionUserContextProvider;
+import top.continew.starter.extension.datapermission.handler.DefaultDataPermissionHandler;
+
+/**
+ * 数据权限自动配置
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+@AutoConfiguration
+@EnableConfigurationProperties(DataPermissionProperties.class)
+@ConditionalOnProperty(prefix = PropertiesConstants.DATA_PERMISSION, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
+public class DataPermissionAutoConfiguration {
+
+    private static final Logger log = LoggerFactory.getLogger(DataPermissionAutoConfiguration.class);
+
+    private DataPermissionAutoConfiguration() {
+    }
+
+    /**
+     * 数据权限拦截器
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public DataPermissionInterceptor dataPermissionInterceptor(DataPermissionHandler dataPermissionHandler) {
+        return new DataPermissionInterceptor(dataPermissionHandler);
+    }
+
+    /**
+     * 数据权限处理器
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public DataPermissionHandler dataPermissionHandler(DataPermissionUserContextProvider dataPermissionUserContextProvider) {
+        return new DefaultDataPermissionHandler(dataPermissionUserContextProvider);
+    }
+
+    /**
+     * 数据权限用户上下文提供者
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public DataPermissionUserContextProvider dataPermissionUserContextProvider() {
+        if (log.isErrorEnabled()) {
+            log.error("Consider defining a bean of type '{}' in your configuration.", ResolvableType
+                .forClass(DataPermissionUserContextProvider.class));
+        }
+        throw new NoSuchBeanDefinitionException(DataPermissionUserContextProvider.class);
+    }
+
+    static {
+        log.debug("[ContiNew Starter] - Auto Configuration 'DataPermission' completed initialization.");
+    }
+}

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.starter.data.mp.datapermission;
+package top.continew.starter.extension.datapermission.handler;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -30,29 +30,36 @@ import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.select.*;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.SelectItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import top.continew.starter.core.constant.StringConstants;
+import top.continew.starter.extension.datapermission.annotation.DataPermission;
+import top.continew.starter.extension.datapermission.enums.DataScope;
+import top.continew.starter.extension.datapermission.filter.DataPermissionUserContextProvider;
+import top.continew.starter.extension.datapermission.model.RoleContext;
+import top.continew.starter.extension.datapermission.model.UserContext;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Set;
 
 /**
- * 数据权限处理器实现类
+ * 默认数据权限处理器
  *
  * @author <a href="https://gitee.com/baomidou/mybatis-plus/issues/I37I90">DataPermissionInterceptor 如何使用？</a>
  * @author Charles7c
  * @since 1.1.0
  */
-public class DataPermissionHandlerImpl implements DataPermissionHandler {
+public class DefaultDataPermissionHandler implements DataPermissionHandler {
 
-    private static final Logger log = LoggerFactory.getLogger(DataPermissionHandlerImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(DefaultDataPermissionHandler.class);
-    private final DataPermissionFilter dataPermissionFilter;
+    private final DataPermissionUserContextProvider dataPermissionUserContextProvider;
 
-    public DataPermissionHandlerImpl(DataPermissionFilter dataPermissionFilter) {
+    public DefaultDataPermissionHandler(DataPermissionUserContextProvider dataPermissionUserContextProvider) {
-        this.dataPermissionFilter = dataPermissionFilter;
+        this.dataPermissionUserContextProvider = dataPermissionUserContextProvider;
     }
 
     @Override
@@ -68,7 +75,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
                 if (null == dataPermission || !CharSequenceUtil.equalsAny(methodName, name, name + "_COUNT")) {
                     continue;
                 }
-                if (dataPermissionFilter.isFilter()) {
+                if (dataPermissionUserContextProvider.isFilter()) {
                     return buildDataScopeFilter(dataPermission, where);
                 }
             }
@@ -87,19 +94,19 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
      */
     private Expression buildDataScopeFilter(DataPermission dataPermission, Expression where) {
         Expression expression = null;
-        DataPermissionCurrentUser currentUser = dataPermissionFilter.getCurrentUser();
+        UserContext userContext = dataPermissionUserContextProvider.getUserContext();
-        Set<DataPermissionCurrentUser.CurrentUserRole> roles = currentUser.getRoles();
+        Set<RoleContext> roles = userContext.getRoles();
-        for (DataPermissionCurrentUser.CurrentUserRole role : roles) {
+        for (RoleContext roleContext : roles) {
-            DataScope dataScope = role.getDataScope();
+            DataScope dataScope = roleContext.getDataScope();
             if (DataScope.ALL.equals(dataScope)) {
                 return where;
             }
             switch (dataScope) {
                 case DEPT_AND_CHILD -> expression = this
-                    .buildDeptAndChildExpression(dataPermission, currentUser, expression);
+                    .buildDeptAndChildExpression(dataPermission, userContext, expression);
-                case DEPT -> expression = this.buildDeptExpression(dataPermission, currentUser, expression);
+                case DEPT -> expression = this.buildDeptExpression(dataPermission, userContext, expression);
-                case SELF -> expression = this.buildSelfExpression(dataPermission, currentUser, expression);
+                case SELF -> expression = this.buildSelfExpression(dataPermission, userContext, expression);
-                case CUSTOM -> expression = this.buildCustomExpression(dataPermission, role, expression);
+                case CUSTOM -> expression = this.buildCustomExpression(dataPermission, roleContext, expression);
                 default -> throw new IllegalArgumentException("暂不支持 [%s] 数据权限".formatted(dataScope));
             }
         }
@@ -115,12 +122,12 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
      * </p>
      *
      * @param dataPermission 数据权限
-     * @param currentUser    当前用户
+     * @param userContext    用户上下文
      * @param expression     处理前的表达式
      * @return 处理完后的表达式
      */
     private Expression buildDeptAndChildExpression(DataPermission dataPermission,
-                                                   DataPermissionCurrentUser currentUser,
+                                                   UserContext userContext,
                                                    Expression expression) {
         ParenthesedSelect subSelect = new ParenthesedSelect();
         PlainSelect select = new PlainSelect();
@@ -128,10 +135,10 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
         select.setFromItem(new Table(dataPermission.deptTableAlias()));
         EqualsTo equalsTo = new EqualsTo();
         equalsTo.setLeftExpression(new Column(dataPermission.id()));
-        equalsTo.setRightExpression(new LongValue(currentUser.getDeptId()));
+        equalsTo.setRightExpression(new LongValue(userContext.getDeptId()));
         Function function = new Function();
         function.setName("find_in_set");
-        function.setParameters(new ExpressionList(new LongValue(currentUser.getDeptId()), new Column("ancestors")));
+        function.setParameters(new ExpressionList(new LongValue(userContext.getDeptId()), new Column("ancestors")));
         select.setWhere(new OrExpression(equalsTo, function));
         subSelect.setSelect(select);
         // 构建父查询
@@ -149,16 +156,16 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
      * </p>
      *
      * @param dataPermission 数据权限
-     * @param currentUser    当前用户
+     * @param userContext    用户上下文
      * @param expression     处理前的表达式
      * @return 处理完后的表达式
      */
     private Expression buildDeptExpression(DataPermission dataPermission,
-                                           DataPermissionCurrentUser currentUser,
+                                           UserContext userContext,
                                            Expression expression) {
         EqualsTo equalsTo = new EqualsTo();
         equalsTo.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.deptId()));
-        equalsTo.setRightExpression(new LongValue(currentUser.getDeptId()));
+        equalsTo.setRightExpression(new LongValue(userContext.getDeptId()));
         return null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
     }
 
@@ -170,16 +177,16 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
      * </p>
      *
      * @param dataPermission 数据权限
-     * @param currentUser    当前用户
+     * @param userContext    用户上下文
      * @param expression     处理前的表达式
      * @return 处理完后的表达式
      */
     private Expression buildSelfExpression(DataPermission dataPermission,
-                                           DataPermissionCurrentUser currentUser,
+                                           UserContext userContext,
                                            Expression expression) {
         EqualsTo equalsTo = new EqualsTo();
         equalsTo.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.userId()));
-        equalsTo.setRightExpression(new LongValue(currentUser.getUserId()));
+        equalsTo.setRightExpression(new LongValue(userContext.getUserId()));
         return null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
     }
 
@@ -192,12 +199,12 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
      * </p>
      *
      * @param dataPermission 数据权限
-     * @param role           当前用户角色
+     * @param roleContext           角色上下文
      * @param expression     处理前的表达式
      * @return 处理完后的表达式
      */
     private Expression buildCustomExpression(DataPermission dataPermission,
-                                             DataPermissionCurrentUser.CurrentUserRole role,
+                                             RoleContext roleContext,
                                              Expression expression) {
         ParenthesedSelect subSelect = new ParenthesedSelect();
         PlainSelect select = new PlainSelect();
@@ -205,7 +212,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
         select.setFromItem(new Table(dataPermission.roleDeptTableAlias()));
         EqualsTo equalsTo = new EqualsTo();
         equalsTo.setLeftExpression(new Column(dataPermission.roleId()));
-        equalsTo.setRightExpression(new LongValue(role.getRoleId()));
+        equalsTo.setRightExpression(new LongValue(roleContext.getRoleId()));
         select.setWhere(equalsTo);
         subSelect.setSelect(select);
         // 构建父查询

continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+top.continew.starter.extension.datapermission.autoconfigure.DataPermissionAutoConfiguration

continew-starter-extension/continew-starter-extension-datapermission/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.continew</groupId>
+        <artifactId>continew-starter-extension</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>continew-starter-extension-datapermission</artifactId>
+    <packaging>pom</packaging>
+    <description>ContiNew Starter 扩展模块 - 数据权限</description>
+
+    <modules>
+        <module>continew-starter-extension-datapermission-core</module>
+        <module>continew-starter-extension-datapermission-mp</module>
+    </modules>
+</project>

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.continew</groupId>
+        <artifactId>continew-starter-extension-tenant</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>continew-starter-extension-tenant-core</artifactId>
+    <description>ContiNew Starter 扩展模块 - 多租户 - 核心模块</description>
+
+    <dependencies>
+        <!-- TTL（线程间传递 ThreadLocal，异步执行时上下文传递的解决方案） -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+</project>

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/annotation/TenantDataSourceIgnore.java

@@ -14,22 +14,18 @@
  * limitations under the License.
  */
 
-package top.continew.starter.data.mp.autoconfigure;
+package top.continew.starter.extension.tenant.annotation;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import top.continew.starter.core.constant.PropertiesConstants;
 
 import java.lang.annotation.*;
 
 /**
- * 是否启用数据权限注解
+ * 多租户数据源级隔离忽略注解
  *
  * @author Charles7c
- * @since 1.1.0
+ * @since 2.7.0
  */
-@Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
 @Documented
-@ConditionalOnProperty(prefix = "mybatis-plus.extension.data-permission", name = PropertiesConstants.ENABLED, havingValue = "true")
+public @interface TenantDataSourceIgnore {
-public @interface ConditionalOnEnabledDataPermission {
+}
-}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantInterceptor.java

@@ -0,0 +1,33 @@
+package top.continew.starter.extension.tenant.autoconfigure;
+
+import cn.hutool.core.convert.Convert;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.util.StringUtils;
+import org.springframework.web.servlet.HandlerInterceptor;
+import top.continew.starter.extension.tenant.context.TenantContext;
+import top.continew.starter.extension.tenant.context.TenantContextHolder;
+
+/**
+ * 租户拦截器
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public class TenantInterceptor implements HandlerInterceptor {
+
+    private final TenantProperties tenantProperties;
+
+    public TenantInterceptor(TenantProperties tenantProperties) {
+        this.tenantProperties = tenantProperties;
+    }
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        String tenantId = request.getHeader(tenantProperties.getTenantIdHeader());
+        TenantContext tenantContext = new TenantContext();
+        tenantContext.setTenantId(Convert.toLong(tenantId));
+        TenantContextHolder.setContext(tenantContext);
+        return true;
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantProperties.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.starter.extension.tenant.autoconfigure;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import top.continew.starter.core.constant.PropertiesConstants;
+import top.continew.starter.extension.tenant.enums.TenantIsolationLevel;
+
+import java.util.List;
+
+/**
+ * 租户配置属性
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+@ConfigurationProperties(PropertiesConstants.TENANT)
+public class TenantProperties {
+
+    /**
+     * 是否启用多租户
+     */
+    private boolean enabled = true;
+
+    /**
+     * 租户隔离级别
+     */
+    private TenantIsolationLevel isolationLevel = TenantIsolationLevel.LINE;
+
+    /**
+     * 租户 ID 列名
+     */
+    private String tenantIdColumn = "tenant_id";
+
+    /**
+     * 请求头中租户 ID 键名
+     */
+    private String tenantIdHeader = "X-Tenant-Id";
+
+    /**
+     * 超级租户 ID
+     */
+    private Long superTenantId = 1L;
+
+    /**
+     * 忽略表（忽略拼接多租户条件）
+     */
+    private List<String> ignoreTables;
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public TenantIsolationLevel getIsolationLevel() {
+        return isolationLevel;
+    }
+
+    public void setIsolationLevel(TenantIsolationLevel isolationLevel) {
+        this.isolationLevel = isolationLevel;
+    }
+
+    public String getTenantIdColumn() {
+        return tenantIdColumn;
+    }
+
+    public void setTenantIdColumn(String tenantIdColumn) {
+        this.tenantIdColumn = tenantIdColumn;
+    }
+
+    public String getTenantIdHeader() {
+        return tenantIdHeader;
+    }
+
+    public void setTenantIdHeader(String tenantIdHeader) {
+        this.tenantIdHeader = tenantIdHeader;
+    }
+
+    public Long getSuperTenantId() {
+        return superTenantId;
+    }
+
+    public void setSuperTenantId(Long superTenantId) {
+        this.superTenantId = superTenantId;
+    }
+
+    public List<String> getIgnoreTables() {
+        return ignoreTables;
+    }
+
+    public void setIgnoreTables(List<String> ignoreTables) {
+        this.ignoreTables = ignoreTables;
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantWebMvcAutoConfiguration.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.starter.extension.tenant.autoconfigure;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import top.continew.starter.core.constant.PropertiesConstants;
+
+/**
+ * 多租户 Web MVC 自动配置
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+@AutoConfiguration
+@ConditionalOnWebApplication
+@ConditionalOnProperty(prefix = PropertiesConstants.TENANT, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
+public class TenantWebMvcAutoConfiguration implements WebMvcConfigurer {
+
+    private final TenantProperties tenantProperties;
+
+    public TenantWebMvcAutoConfiguration(TenantProperties tenantProperties) {
+        this.tenantProperties = tenantProperties;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new TenantInterceptor(tenantProperties));
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/config/TenantDataSource.java

@@ -0,0 +1,75 @@
+package top.continew.starter.extension.tenant.config;
+
+/**
+ * 租户数据源配置
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public class TenantDataSource {
+
+    /**
+     * 连接池名称
+     */
+    private String poolName;
+
+    /**
+     * 驱动类名
+     */
+    private String driverClassName;
+
+    /**
+     * 数据库连接地址
+     */
+    private String url;
+
+    /**
+     * 数据库用户名
+     */
+    private String username;
+
+    /**
+     * 数据库密码
+     */
+    private String password;
+
+    public String getPoolName() {
+        return poolName;
+    }
+
+    public void setPoolName(String poolName) {
+        this.poolName = poolName;
+    }
+
+    public String getDriverClassName() {
+        return driverClassName;
+    }
+
+    public void setDriverClassName(String driverClassName) {
+        this.driverClassName = driverClassName;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/config/TenantDataSourceProvider.java

@@ -0,0 +1,18 @@
+package top.continew.starter.extension.tenant.config;
+
+/**
+ * 租户数据源提供者
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public interface TenantDataSourceProvider {
+
+    /**
+     * 根据租户 ID 获取数据源配置
+     *
+     * @param tenantId 租户 ID
+     * @return 数据源配置
+     */
+    TenantDataSource getByTenantId(String tenantId);
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/context/TenantContext.java

@@ -0,0 +1,23 @@
+package top.continew.starter.extension.tenant.context;
+
+/**
+ * 租户上下文
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public class TenantContext {
+
+    /**
+     * 租户 ID
+     */
+    private Long tenantId;
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/context/TenantContextHolder.java

@@ -0,0 +1,53 @@
+package top.continew.starter.extension.tenant.context;
+
+import com.alibaba.ttl.TransmittableThreadLocal;
+
+import java.util.Optional;
+
+/**
+ * 租户上下文 Holder
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public class TenantContextHolder {
+
+    private static final TransmittableThreadLocal<TenantContext> CONTEXT_HOLDER = new TransmittableThreadLocal<>();
+
+    private TenantContextHolder() {
+    }
+
+    /**
+     * 设置上下文
+     *
+     * @param context 上下文
+     */
+    public static void setContext(TenantContext context) {
+        CONTEXT_HOLDER.set(context);
+    }
+
+    /**
+     * 获取上下文
+     *
+     * @return 上下文
+     */
+    public static TenantContext getContext() {
+        return CONTEXT_HOLDER.get();
+    }
+
+    /**
+     * 清除上下文
+     */
+    public static void clearContext() {
+        CONTEXT_HOLDER.remove();
+    }
+
+    /**
+     * 获取租户 ID
+     *
+     * @return 租户 ID
+     */
+    public static Long getTenantId() {
+        return Optional.ofNullable(getContext()).map(TenantContext::getTenantId).orElse(null);
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/enums/TenantIsolationLevel.java

@@ -0,0 +1,20 @@
+package top.continew.starter.extension.tenant.enums;
+
+/**
+ * 租户隔离级别
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public enum TenantIsolationLevel {
+
+    /**
+     * 行级
+     */
+    LINE,
+
+    /**
+     * 数据源级
+     */
+    DATASOURCE
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/handler/TenantDataSourceHandler.java

@@ -0,0 +1,44 @@
+package top.continew.starter.extension.tenant.handler;
+
+import top.continew.starter.extension.tenant.config.TenantDataSource;
+
+import javax.sql.DataSource;
+
+/**
+ * 租户数据源级隔离处理器
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public interface TenantDataSourceHandler {
+
+    /**
+     * 切换数据源
+     *
+     * @param dataSourceName 数据源名称
+     */
+    void changeDataSource(String dataSourceName);
+
+    /**
+     * 是否存在指定数据源
+     *
+     * @param dataSourceName 数据源名称
+     * @return 是否存在指定数据源
+     */
+    boolean containsDataSource(String dataSourceName);
+
+    /**
+     * 创建数据源
+     *
+     * @param tenantDataSource 数据源配置
+     * @return 数据源
+     */
+    DataSource createDataSource(TenantDataSource tenantDataSource);
+
+    /**
+     * 移除数据源
+     *
+     * @param dataSourceName 数据源名称
+     */
+    void removeDataSource(String dataSourceName);
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+top.continew.starter.extension.tenant.autoconfigure.TenantWebMvcAutoConfiguration

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.continew</groupId>
+        <artifactId>continew-starter-extension-tenant</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>continew-starter-extension-tenant-mp</artifactId>
+    <description>ContiNew Starter 扩展模块 - 多租户 - MyBatis Plus ORM 模块</description>
+
+    <dependencies>
+        <!-- MyBatis Plus（MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率） -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
+
+        <!-- Dynamic Datasource（基于 Spring Boot 的快速集成多数据源的启动器） -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- 核心模块 -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-extension-tenant-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantAutoConfiguration.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.starter.extension.tenant.autoconfigure;
+
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator;
+import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.ResolvableType;
+import top.continew.starter.core.constant.PropertiesConstants;
+import top.continew.starter.extension.tenant.config.TenantDataSourceProvider;
+import top.continew.starter.extension.tenant.handler.*;
+
+/**
+ * 多租户自动配置
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+@AutoConfiguration
+@EnableConfigurationProperties(TenantProperties.class)
+@ConditionalOnProperty(prefix = PropertiesConstants.TENANT, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
+public class TenantAutoConfiguration {
+
+    private static final Logger log = LoggerFactory.getLogger(TenantAutoConfiguration.class);
+
+    private TenantAutoConfiguration() {
+    }
+
+    /**
+     * 租户隔离级别：行级
+     */
+    @AutoConfiguration
+    @ConditionalOnProperty(name = PropertiesConstants.TENANT + ".isolation-level", havingValue = "line", matchIfMissing = true)
+    public static class Line {
+        static {
+            log.debug("[ContiNew Starter] - Auto Configuration 'Tenant-Line' completed initialization.");
+        }
+
+        /**
+         * 租户行级隔离拦截器
+         */
+        @Bean
+        @ConditionalOnMissingBean
+        public TenantLineInnerInterceptor tenantLineInnerInterceptor(TenantLineHandler tenantLineHandler) {
+            return new TenantLineInnerInterceptor(tenantLineHandler);
+        }
+
+        /**
+         * 租户行级隔离处理器（默认）
+         */
+        @Bean
+        @ConditionalOnMissingBean
+        public TenantLineHandler tenantLineHandler(TenantProperties properties) {
+            return new DefaultTenantLineHandler(properties);
+        }
+    }
+
+    /**
+     * 租户隔离级别：数据源级
+     */
+    @AutoConfiguration
+    @ConditionalOnProperty(name = PropertiesConstants.TENANT + ".isolation-level", havingValue = "datasource")
+    public static class DataSource {
+        static {
+            log.debug("[ContiNew Starter] - Auto Configuration 'Tenant-DataSource' completed initialization.");
+        }
+
+        /**
+         * 租户数据源级隔离通知
+         */
+        @Bean
+        @ConditionalOnMissingBean
+        public TenantDataSourceAdvisor tenantDataSourceAdvisor(TenantDataSourceInterceptor tenantDataSourceInterceptor) {
+            return new TenantDataSourceAdvisor(tenantDataSourceInterceptor);
+        }
+
+        /**
+         * 租户数据源级隔离拦截器
+         */
+        @Bean
+        @ConditionalOnMissingBean
+        public TenantDataSourceInterceptor tenantDataSourceInterceptor(TenantDataSourceHandler tenantDataSourceHandler) {
+            return new TenantDataSourceInterceptor(tenantDataSourceHandler);
+        }
+
+        /**
+         * 租户数据源级隔离处理器（默认）
+         */
+        @Bean
+        @ConditionalOnMissingBean
+        public TenantDataSourceHandler tenantDataSourceHandler(TenantDataSourceProvider tenantDataSourceProvider, DynamicRoutingDataSource dynamicRoutingDataSource, DefaultDataSourceCreator dataSourceCreator) {
+            return new DefaultTenantDataSourceHandler(tenantDataSourceProvider, dynamicRoutingDataSource, dataSourceCreator);
+        }
+
+        /**
+         * 多租户数据源提供者
+         */
+        @Bean
+        @ConditionalOnMissingBean
+        public TenantDataSourceProvider tenantDataSourceProvider() {
+            if (log.isErrorEnabled()) {
+                log.error("Consider defining a bean of type '{}' in your configuration.", ResolvableType
+                    .forClass(TenantDataSourceProvider.class));
+            }
+            throw new NoSuchBeanDefinitionException(TenantDataSourceProvider.class);
+        }
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/DefaultTenantDataSourceHandler.java

@@ -0,0 +1,70 @@
+package top.continew.starter.extension.tenant.handler;
+
+import cn.hutool.core.text.CharSequenceUtil;
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
+import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import top.continew.starter.extension.tenant.config.TenantDataSource;
+import top.continew.starter.extension.tenant.config.TenantDataSourceProvider;
+
+import javax.sql.DataSource;
+
+/**
+ * 默认租户数据源级隔离处理器
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public class DefaultTenantDataSourceHandler implements TenantDataSourceHandler {
+
+    private static final Logger log = LoggerFactory.getLogger(DefaultTenantDataSourceHandler.class);
+    private final DynamicRoutingDataSource dynamicRoutingDataSource;
+    private final DefaultDataSourceCreator dataSourceCreator;
+    private final TenantDataSourceProvider tenantDataSourceProvider;
+
+    public DefaultTenantDataSourceHandler(TenantDataSourceProvider tenantDataSourceProvider, DynamicRoutingDataSource dynamicRoutingDataSource, DefaultDataSourceCreator dataSourceCreator) {
+        this.tenantDataSourceProvider = tenantDataSourceProvider;
+        this.dynamicRoutingDataSource = dynamicRoutingDataSource;
+        this.dataSourceCreator = dataSourceCreator;
+    }
+
+    @Override
+    public void changeDataSource(String dataSourceName) {
+        if (!this.containsDataSource(dataSourceName)) {
+            TenantDataSource tenantDataSource = tenantDataSourceProvider.getByTenantId(dataSourceName);
+            if (null == tenantDataSource) {
+                throw new IllegalArgumentException("Data source [%s] configuration not found".formatted(dataSourceName));
+            }
+            DataSource datasource = this.createDataSource(tenantDataSource);
+            dynamicRoutingDataSource.addDataSource(dataSourceName, datasource);
+            log.info("Load data source: {}", dataSourceName);
+        }
+        DynamicDataSourceContextHolder.push(dataSourceName);
+        log.info("Change data source: {}", dataSourceName);
+    }
+
+    @Override
+    public boolean containsDataSource(String dataSourceName) {
+        return CharSequenceUtil.isNotBlank(dataSourceName) && dynamicRoutingDataSource.getDataSources()
+            .containsKey(dataSourceName);
+    }
+
+    @Override
+    public DataSource createDataSource(TenantDataSource tenantDataSource) {
+        DataSourceProperty dataSourceProperty = new DataSourceProperty();
+        dataSourceProperty.setPoolName(tenantDataSource.getPoolName());
+        dataSourceProperty.setDriverClassName(tenantDataSource.getDriverClassName());
+        dataSourceProperty.setUrl(tenantDataSource.getUrl());
+        dataSourceProperty.setUsername(tenantDataSource.getUsername());
+        dataSourceProperty.setPassword(tenantDataSource.getPassword());
+        return dataSourceCreator.createDataSource(dataSourceProperty);
+    }
+
+    @Override
+    public void removeDataSource(String dataSourceName) {
+        dynamicRoutingDataSource.removeDataSource(dataSourceName);
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/DefaultTenantLineHandler.java

@@ -0,0 +1,46 @@
+package top.continew.starter.extension.tenant.handler;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
+import top.continew.starter.extension.tenant.autoconfigure.TenantProperties;
+import top.continew.starter.extension.tenant.context.TenantContextHolder;
+
+/**
+ * 默认租户行级隔离处理器
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public class DefaultTenantLineHandler implements TenantLineHandler {
+
+    private final TenantProperties tenantProperties;
+
+    public DefaultTenantLineHandler(TenantProperties tenantProperties) {
+        this.tenantProperties = tenantProperties;
+    }
+
+    @Override
+    public Expression getTenantId() {
+        Long tenantId = TenantContextHolder.getTenantId();
+        if (null != tenantId) {
+            return new LongValue(tenantId);
+        }
+        return null;
+    }
+
+    @Override
+    public String getTenantIdColumn() {
+        return tenantProperties.getTenantIdColumn();
+    }
+
+    @Override
+    public boolean ignoreTable(String tableName) {
+        Long tenantId = TenantContextHolder.getTenantId();
+        if (null != tenantId && tenantId.equals(tenantProperties.getSuperTenantId())) {
+            return true;
+        }
+        return CollUtil.contains(tenantProperties.getIgnoreTables(), tableName);
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/TenantDataSourceAdvisor.java

@@ -0,0 +1,55 @@
+package top.continew.starter.extension.tenant.handler;
+
+import org.aopalliance.aop.Advice;
+import org.springframework.aop.Pointcut;
+import org.springframework.aop.aspectj.AspectJExpressionPointcut;
+import org.springframework.aop.support.AbstractPointcutAdvisor;
+import org.springframework.aop.support.ComposablePointcut;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+
+/**
+ * 租户数据源级隔离通知
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public class TenantDataSourceAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware {
+
+    private final Advice advice;
+    private final Pointcut pointcut;
+
+    public TenantDataSourceAdvisor(TenantDataSourceInterceptor interceptor) {
+        this.advice = interceptor;
+        this.pointcut = buildPointcut();
+    }
+
+    @Override
+    public Pointcut getPointcut() {
+        return this.pointcut;
+    }
+
+    @Override
+    public Advice getAdvice() {
+        return this.advice;
+    }
+
+    @Override
+    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+        if (this.advice instanceof BeanFactoryAware beanFactoryAware) {
+            beanFactoryAware.setBeanFactory(beanFactory);
+        }
+    }
+
+    /**
+     * 构建切点
+     *
+     * @return 切点
+     */
+    private Pointcut buildPointcut() {
+        AspectJExpressionPointcut cut = new AspectJExpressionPointcut();
+        cut.setExpression("!@annotation(top.continew.starter.extension.tenant.annotation.TenantDataSourceIgnore)");
+        return new ComposablePointcut((Pointcut) cut);
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/TenantDataSourceInterceptor.java

@@ -0,0 +1,41 @@
+package top.continew.starter.extension.tenant.handler;
+
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import top.continew.starter.extension.tenant.context.TenantContextHolder;
+
+/**
+ * 租户数据源级隔离拦截器
+ *
+ * @author Charles7c
+ * @since 2.7.0
+ */
+public class TenantDataSourceInterceptor implements MethodInterceptor {
+
+    private final TenantDataSourceHandler tenantDataSourceHandler;
+
+    public TenantDataSourceInterceptor(TenantDataSourceHandler tenantDataSourceHandler) {
+        this.tenantDataSourceHandler = tenantDataSourceHandler;
+    }
+
+    @Override
+    public Object invoke(MethodInvocation invocation) throws Throwable {
+        Long tenantId = TenantContextHolder.getTenantId();
+        if (null == tenantId) {
+            return invocation.proceed();
+        }
+        // 切换数据源
+        boolean isPush = false;
+        try {
+            String dataSourceName = tenantId.toString();
+            tenantDataSourceHandler.changeDataSource(dataSourceName);
+            isPush = true;
+            return invocation.proceed();
+        } finally {
+            if (isPush) {
+                DynamicDataSourceContextHolder.poll();
+            }
+        }
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+top.continew.starter.extension.tenant.autoconfigure.TenantAutoConfiguration

continew-starter-extension/continew-starter-extension-tenant/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.continew</groupId>
+        <artifactId>continew-starter-extension</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>continew-starter-extension-tenant</artifactId>
+    <packaging>pom</packaging>
+    <description>ContiNew Starter 扩展模块 - 多租户</description>
+
+    <modules>
+        <module>continew-starter-extension-tenant-core</module>
+        <module>continew-starter-extension-tenant-mp</module>
+    </modules>
+</project>

continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelBaseEnumConverter.java

@@ -30,8 +30,8 @@ import top.continew.starter.core.enums.BaseEnum;
 /**
  * Easy Excel 枚举接口转换器
  *
- * @see BaseEnum
  * @author Charles7c
+ * @see BaseEnum
  * @since 1.2.0
  */
 public class ExcelBaseEnumConverter implements Converter<BaseEnum<Integer>> {

continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/util/ExcelUtils.java

@@ -27,8 +27,10 @@ import org.slf4j.LoggerFactory;
 import top.continew.starter.core.exception.BaseException;
 import top.continew.starter.file.excel.converter.ExcelBigNumberConverter;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Excel 工具类
@@ -52,21 +54,23 @@ public class ExcelUtils {
      * @param response 响应对象
      */
     public static <T> void export(List<T> list, String fileName, Class<T> clazz, HttpServletResponse response) {
-        export(list, fileName, "Sheet1", clazz, response);
+        export(list, fileName, "Sheet1", Collections.emptySet(), clazz, response);
     }
 
     /**
      * 导出
      *
-     * @param list      导出数据集合
+     * @param list                    导出数据集合
-     * @param fileName  文件名
+     * @param fileName                文件名
-     * @param sheetName 工作表名称
+     * @param sheetName               工作表名称
-     * @param clazz     导出数据类型
+     * @param excludeColumnFieldNames 排除字段
-     * @param response  响应对象
+     * @param clazz                   导出数据类型
+     * @param response                响应对象
      */
     public static <T> void export(List<T> list,
                                   String fileName,
                                   String sheetName,
+                                  Set<String> excludeColumnFieldNames,
                                   Class<T> clazz,
                                   HttpServletResponse response) {
         try {
@@ -81,6 +85,7 @@ public class ExcelUtils {
                 // 自动转换大数值
                 .registerConverter(new ExcelBigNumberConverter())
                 .sheet(sheetName)
+                .excludeColumnFieldNames(excludeColumnFieldNames)
                 .doWrite(list);
         } catch (Exception e) {
             log.error("Export excel occurred an error: {}. fileName: {}.", e.getMessage(), fileName, e);

continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogResponse.java

@@ -18,7 +18,8 @@ package top.continew.starter.log.core.model;
 
 import top.continew.starter.log.core.enums.Include;
 
-import java.util.*;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 响应信息

continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/ConditionalOnEnabledLog.java

@@ -30,6 +30,6 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Documented
-@ConditionalOnProperty(prefix = PropertiesConstants.LOG, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.LOG, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public @interface ConditionalOnEnabledLog {
 }

continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/LogProperties.java

@@ -96,6 +96,6 @@ public class LogProperties {
      * @return 是否匹配
      */
     public boolean isMatch(String uri) {
-        return this.getExcludePatterns().stream().anyMatch(pattern -> SpringWebUtils.isMatch(pattern, uri));
+        return this.getExcludePatterns().stream().anyMatch(pattern -> SpringWebUtils.isMatch(uri, pattern));
     }
 }

continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/LogFilter.java

@@ -28,14 +28,12 @@ import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.ContentCachingRequestWrapper;
 import org.springframework.web.util.ContentCachingResponseWrapper;
 import org.springframework.web.util.WebUtils;
-import top.continew.starter.log.core.enums.Include;
 import top.continew.starter.log.interceptor.autoconfigure.LogProperties;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * 日志过滤器
@@ -123,9 +121,7 @@ public class LogFilter extends OncePerRequestFilter implements Ordered {
      * @return true：是；false：否
      */
     private boolean isRequestWrapper(HttpServletRequest request) {
-        Set<Include> includeSet = logProperties.getIncludes();
+        return !(request instanceof ContentCachingRequestWrapper);
-        return !(request instanceof ContentCachingRequestWrapper) && (includeSet
-            .contains(Include.REQUEST_BODY) || includeSet.contains(Include.REQUEST_PARAM));
     }
 
     /**
@@ -135,9 +131,7 @@ public class LogFilter extends OncePerRequestFilter implements Ordered {
      * @return true：是；false：否
      */
     private boolean isResponseWrapper(HttpServletResponse response) {
-        Set<Include> includeSet = logProperties.getIncludes();
+        return !(response instanceof ContentCachingResponseWrapper);
-        return !(response instanceof ContentCachingResponseWrapper) && (includeSet
-            .contains(Include.RESPONSE_BODY) || includeSet.contains(Include.RESPONSE_PARAM));
     }
 
     /**

continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/RecordableServletHttpRequest.java

@@ -30,7 +30,8 @@ import top.continew.starter.log.core.model.RecordableHttpRequest;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
 
 /**
  * 可记录的 HTTP 请求信息适配器

continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/RecordableServletHttpResponse.java

@@ -25,7 +25,7 @@ import org.springframework.web.util.WebUtils;
 import top.continew.starter.log.core.model.RecordableHttpResponse;
 import top.continew.starter.web.util.ServletUtils;
 
-import java.util.*;
+import java.util.Map;
 
 /**
  * 可记录的 HTTP 响应信息适配器

continew-starter-messaging/continew-starter-messaging-websocket/src/main/java/top/continew/starter/messaging/websocket/autoconfigure/WebSocketAutoConfiguration.java

@@ -16,7 +16,6 @@
 
 package top.continew.starter.messaging.websocket.autoconfigure;
 
-import cn.hutool.extra.spring.SpringUtil;
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,7 +45,7 @@ import top.continew.starter.messaging.websocket.dao.WebSocketSessionDaoDefaultIm
 @AutoConfiguration
 @EnableWebSocket
 @EnableConfigurationProperties(WebSocketProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.MESSAGING_WEBSOCKET, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.MESSAGING_WEBSOCKET, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public class WebSocketAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(WebSocketAutoConfiguration.class);
@@ -65,15 +64,14 @@ public class WebSocketAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
-    public WebSocketHandler webSocketHandler() {
+    public WebSocketHandler webSocketHandler(WebSocketSessionDao webSocketSessionDao) {
-        return new top.continew.starter.messaging.websocket.core.WebSocketHandler(properties, SpringUtil
+        return new top.continew.starter.messaging.websocket.core.WebSocketHandler(properties, webSocketSessionDao);
-            .getBean(WebSocketSessionDao.class));
     }
 
     @Bean
     @ConditionalOnMissingBean
-    public HandshakeInterceptor handshakeInterceptor() {
+    public HandshakeInterceptor handshakeInterceptor(WebSocketClientService webSocketClientService) {
-        return new WebSocketInterceptor(properties, SpringUtil.getBean(WebSocketClientService.class));
+        return new WebSocketInterceptor(properties, webSocketClientService);
     }
 
     /**

continew-starter-messaging/continew-starter-messaging-websocket/src/main/java/top/continew/starter/messaging/websocket/autoconfigure/WebSocketProperties.java

@@ -20,7 +20,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import top.continew.starter.core.constant.PropertiesConstants;
 import top.continew.starter.core.constant.StringConstants;
 
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

continew-starter-messaging/continew-starter-messaging-websocket/src/main/java/top/continew/starter/messaging/websocket/core/WebSocketHandler.java

@@ -78,7 +78,7 @@ public class WebSocketHandler extends TextWebSocketHandler {
 
     /**
      * 获取客户端 ID
-     * 
+     *
      * @param session 会话
      * @return 客户端 ID
      */

continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java

@@ -36,7 +36,7 @@ import top.continew.starter.security.crypto.core.MyBatisEncryptInterceptor;
  */
 @AutoConfiguration
 @EnableConfigurationProperties(CryptoProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.SECURITY_CRYPTO, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.SECURITY_CRYPTO, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public class CryptoAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(CryptoAutoConfiguration.class);

continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/MyBatisDecryptInterceptor.java

@@ -19,7 +19,10 @@ package top.continew.starter.security.crypto.core;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
 import org.apache.ibatis.executor.resultset.ResultSetHandler;
-import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Signature;
 import org.apache.ibatis.type.SimpleTypeRegistry;
 import top.continew.starter.security.crypto.annotation.FieldEncrypt;
 import top.continew.starter.security.crypto.autoconfigure.CryptoProperties;

continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/MyBatisEncryptInterceptor.java

@@ -35,7 +35,10 @@ import top.continew.starter.security.crypto.autoconfigure.CryptoProperties;
 import top.continew.starter.security.crypto.encryptor.IEncryptor;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -134,10 +137,10 @@ public class MyBatisEncryptInterceptor extends AbstractMyBatisInterceptor implem
      *
      * @param parameter       Wrapper 参数
      * @param mappedStatement 映射语句
-     * @since 2.1.1
      * @author cary
      * @author wangshaopeng@talkweb.com.cn（<a
      *         href="https://blog.csdn.net/tianmaxingkonger/article/details/130986784">基于Mybatis-Plus拦截器实现MySQL数据加解密</a>）
+     * @since 2.1.1
      */
     private void encryptUpdateWrapper(Object parameter, MappedStatement mappedStatement) {
         if (parameter instanceof AbstractWrapper updateWrapper) {

continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/annotation/RateLimiter.java

@@ -23,7 +23,7 @@ import java.lang.annotation.*;
 
 /**
  * 限流注解
- * 
+ *
  * @author KAI
  * @since 2.2.0
  */

continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/annotation/RateLimiters.java

@@ -20,7 +20,7 @@ import java.lang.annotation.*;
 
 /**
  * 限流组注解
- * 
+ *
  * @author KAI
  * @since 2.2.0
  */

continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/autoconfigure/RateLimiterAutoConfiguration.java

@@ -31,7 +31,7 @@ import top.continew.starter.security.limiter.core.RateLimiterNameGenerator;
 
 /**
  * 限流器自动配置
- * 
+ *
  * @author KAI
  * @author Charles7c
  * @since 2.2.0
@@ -39,7 +39,7 @@ import top.continew.starter.security.limiter.core.RateLimiterNameGenerator;
 @AutoConfiguration
 @EnableConfigurationProperties(RateLimiterProperties.class)
 @ComponentScan({"top.continew.starter.security.limiter.core"})
-@ConditionalOnProperty(prefix = PropertiesConstants.SECURITY_LIMITER, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.SECURITY_LIMITER, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public class RateLimiterAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(RateLimiterAutoConfiguration.class);

continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/autoconfigure/RateLimiterProperties.java

@@ -21,7 +21,7 @@ import top.continew.starter.core.constant.PropertiesConstants;
 
 /**
  * 限流器配置属性
- * 
+ *
  * @author KAI
  * @since 2.2.0
  */

continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/enums/LimitType.java

@@ -18,7 +18,7 @@ package top.continew.starter.security.limiter.enums;
 
 /**
  * 限流类型
- * 
+ *
  * @author KAI
  * @since 2.2.0
  */

continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/exception/RateLimiterException.java

@@ -20,7 +20,7 @@ import top.continew.starter.core.exception.BaseException;
 
 /**
  * 限流异常
- * 
+ *
  * @author KAI
  * @since 2.2.0
  */

continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java

@@ -28,7 +28,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.*;
+import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
 import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
 import top.continew.starter.core.constant.PropertiesConstants;
 import top.continew.starter.core.util.validate.CheckUtils;
@@ -53,7 +55,7 @@ import java.util.Map;
  */
 @AutoConfiguration
 @EnableConfigurationProperties(PasswordEncoderProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.SECURITY_PASSWORD, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.SECURITY_PASSWORD, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public class PasswordEncoderAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(PasswordEncoderAutoConfiguration.class);

continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java

@@ -40,7 +40,7 @@ import java.util.Map;
 @EnableWebMvc
 @AutoConfiguration
 @EnableConfigurationProperties(LocalStorageProperties.class)
-@ConditionalOnProperty(prefix = PropertiesConstants.STORAGE_LOCAL, name = PropertiesConstants.ENABLED, matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.STORAGE_LOCAL, name = PropertiesConstants.ENABLED, havingValue = "true", matchIfMissing = true)
 public class LocalStorageAutoConfiguration implements WebMvcConfigurer {
 
     private static final Logger log = LoggerFactory.getLogger(LocalStorageAutoConfiguration.class);

continew-starter-web/pom.xml

@@ -54,6 +54,7 @@
         <dependency>
             <groupId>top.continew</groupId>
             <artifactId>continew-starter-api-doc</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- JSON 模块 - Jackson -->

continew-starter-web/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java

@@ -32,5 +32,4 @@ import java.lang.annotation.*;
 @Documented
 @Inherited
 @Import({GlobalResponseAutoConfiguration.class})
-public @interface EnableGlobalResponse {
+public @interface EnableGlobalResponse {}
-}

continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java

@@ -28,6 +28,8 @@ import com.feiniaojin.gracefulresponse.defaults.DefaultResponseStatusFactoryImpl
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springdoc.core.parsers.ReturnTypeParser;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -219,6 +221,7 @@ public class GlobalResponseAutoConfiguration {
      * @return {@link ApiDocGlobalResponseHandler }
      */
     @Bean
+    @ConditionalOnClass(ReturnTypeParser.class)
     @ConditionalOnMissingBean
     public ApiDocGlobalResponseHandler apiDocGlobalResponseHandler() {
         return new ApiDocGlobalResponseHandler(globalResponseProperties);

continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java

@@ -27,5 +27,4 @@ import top.continew.starter.core.constant.PropertiesConstants;
  * @since 2.5.0
  */
 @ConfigurationProperties(PropertiesConstants.WEB_RESPONSE)
-public class GlobalResponseProperties extends GracefulResponseProperties {
+public class GlobalResponseProperties extends GracefulResponseProperties {}
-}

continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogProperties.java

@@ -23,9 +23,9 @@ package top.continew.starter.web.autoconfigure.trace;
  * 重写 TLog 配置以适配 Spring Boot 3.x
  * </p>
  *
- * @see com.yomahub.tlog.springboot.property.TLogProperty
  * @author Bryan.Zhang
  * @author Jasmine
+ * @see com.yomahub.tlog.springboot.property.TLogProperty
  * @since 1.3.0
  */
 public class TLogProperties {

continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogServletFilter.java

@@ -31,9 +31,9 @@ import java.io.IOException;
  * 重写 TLog 配置以适配 Spring Boot 3.x
  * </p>
  *
- * @see com.yomahub.tlog.web.filter.TLogServletFilter
  * @author Bryan.Zhang
  * @author Jasmine
+ * @see com.yomahub.tlog.web.filter.TLogServletFilter
  * @since 1.3.0
  */
 public class TLogServletFilter implements Filter {

continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogWebCommon.java

@@ -28,9 +28,9 @@ import jakarta.servlet.http.HttpServletRequest;
  * 重写 TLog 配置以适配 Spring Boot 3.x
  * </p>
  *
- * @see com.yomahub.tlog.web.common.TLogWebCommon
  * @author Bryan.Zhang
  * @author Jasmine
+ * @see com.yomahub.tlog.web.common.TLogWebCommon
  * @since 1.3.0
  */
 public class TLogWebCommon extends TLogRPCHandler {

continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssServletRequestWrapper.java

@@ -19,7 +19,9 @@ package top.continew.starter.web.autoconfigure.xss;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.*;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.EscapeUtil;
+import cn.hutool.core.util.ReUtil;
 import cn.hutool.http.HtmlUtil;
 import cn.hutool.http.Method;
 import jakarta.servlet.ReadListener;

continew-starter-web/src/main/java/top/continew/starter/web/util/FileUploadUtils.java

@@ -29,7 +29,10 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 

continew-starter-web/src/main/java/top/continew/starter/web/util/ServletUtils.java

@@ -23,7 +23,8 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import top.continew.starter.core.constant.StringConstants;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
 
 /**
  * Servlet 工具类