release: v2.5.2

refactor(curd): 重构排序字段处理，预防 SQL 注入问题
2025-11-15 08:57:09 +08:00 · 2024-08-13 13:34:28 +08:00 · 2024-08-13 13:33:56 +08:00
161 changed files with 1384 additions and 3195 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,96 +1,8 @@
-## [v2.7.2](https://github.com/continew-org/continew-starter/compare/v2.7.1...v2.7.2) (2024-11-12)
-
-### ✨ 新特性
-
- 【extension/crud】支持树结构全局配置 ([5891c4a](https://github.com/continew-org/continew-starter/commit/5891c4aa61b14ba11a387a478fb3616dfc52217c))
- 【extension/crud】查询字典列表新增支持 extraKeys 额外信息字段 ([9b7ea33](https://github.com/continew-org/continew-starter/commit/9b7ea33c0b6714e2ea631aa26f0650e78857079a)) ([a8c6ea3](https://github.com/continew-org/continew-starter/commit/a8c6ea30797811d885f294f28eb95afb935ad7b4))
- 【cache/redisson】RedisUtils 新增上锁、释放锁方法 ([04498ff](https://github.com/continew-org/continew-starter/commit/04498ffe56b062bce1200292b23d2c31341771e6))
-
-### 💎 功能优化
-
- 【extension/crud】移除 TreeUtils ([f4b2310](https://github.com/continew-org/continew-starter/commit/f4b23102a9a31b2120f40a8288bc0aedc36e11b4))
- 【data/mp】移除冗余的数据库类型判空处理 ([bd60411](https://github.com/continew-org/continew-starter/commit/bd60411f3e4fa87c26e492df96fbfb088ea3ce85))
- 【core】重构 IP 工具类获取归属地的返回格式（更方便数据处理） ([e9b9d8b](https://github.com/continew-org/continew-starter/commit/e9b9d8b82e7e28be82c9ed518582d88f507cfac2))
- 【data】Query 范围查询支持数组数据 ([673e586](https://github.com/continew-org/continew-starter/commit/673e586aafc8578f0c7ab063ca9df9b1265f88d5))
- 【data】重构 MetaUtils 获取表信息方法 ([1ce5eb3](https://github.com/continew-org/continew-starter/commit/1ce5eb3b734b13ccd47e3848117daf3c2d7d0afa))
-
-## [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))
+## [v2.5.2](https://github.com/continew-org/continew-starter/compare/v2.5.1...v2.5.2) (2024-08-13)

 ### 🐛 问题修复

- 【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)
-
-### ✨ 新特性
-
- 【web】新增 isMatch 路径是否匹配方法 ([e55eb17](https://github.com/continew-org/continew-starter/commit/e55eb17d64d7b42c6e64b18a645cda9558f08d58))
- 【log】不记录日志也支持开启打印访问日志 ([16b6e9b](https://github.com/continew-org/continew-starter/commit/16b6e9b466578d935ab9a8a85a5eac4d09025dee))
-
-### 💎 功能优化
-
- 【data】移除 DataPermission 注解的 value 属性 ([d3fa00d](https://github.com/continew-org/continew-starter/commit/d3fa00d14ce95ab1bedaebbce8304e29df5da8fd))
- 【data】mybatis-plus => mp，mybatis-flex => mf ([5e0eea2](https://github.com/continew-org/continew-starter/commit/5e0eea2ed801b526da9f65b8cb2942b3b7b050ef))
- 【web】提升接口文档响应类型优化扩展性 ([784a56f](https://github.com/continew-org/continew-starter/commit/784a56fd4f85ae170b8a56dd0a64a33a7bff98bc))
- 【web】链路追踪配置属性响应头名称 => 链路 ID 名称 ([260f484](https://github.com/continew-org/continew-starter/commit/260f484af98d112927edec4316c0375e628dd3ba))
- 【log】优化接口耗时相关时间类型使用 ([4caf0a0](https://github.com/continew-org/continew-starter/commit/4caf0a0db69779a5ea409ec7e01c4044817afc94))
-
-### 🐛 问题修复
-
- 【log】修复日志全局 includes 配置会被局部修改的问题 ([eac5c1f](https://github.com/continew-org/continew-starter/commit/eac5c1fa79f7f91217b0525a07e0f1314f8efe24))
- 【data】还原 SQL 函数接口 ([9e5f33b](https://github.com/continew-org/continew-starter/commit/9e5f33b2c9b804741f9b77eab5b67ab3c4a8b220))
- 【crypto】修复由于升级 mybatis plus 引发的更新场景加密失效问题  ([e9b81f9](https://github.com/continew-org/continew-starter/commit/e9b81f946603e2f9e44b50471102b2551b9d50ac)) ([9fdbfdf](https://github.com/continew-org/continew-starter/commit/9fdbfdf8bb6719d3d044c71a2a8ceab85ccef8f1))
-
-### 📦 依赖升级
-
- Graceful Response 4.0.1-boot3 => 5.0.0-boot3 ([2208dbd](https://github.com/continew-org/continew-starter/commit/2208dbd0282964aab76b02e811d6689ba69d75fd))
- Snail Job 1.1.0 => 1.1.2
- Sa Token 1.38.0 => 1.39.0
- MyBatis Flex 1.9.3 => 1.9.7
- Redisson 3.32.0 => 3.35.0
- Cos ID 2.9.1 => 2.9.6
- Hutool 5.8.29 => 5.8.32
- aws-java-sdk-s3 1.12.761 => 1.12.771
- snakeyaml 2.2 => 2.3
-
-## [v2.5.2](https://github.com/continew-org/continew-starter/compare/v2.5.1...v2.5.2) (2024-08-14)
-
-### 💎 功能优化
-
- 【api-doc】重构接口文档枚举展示处理 ([bf51837](https://github.com/continew-org/continew-starter/commit/bf51837991746c5576d7baffcc2296fe8ca91586)) ([4c4f98a](https://github.com/continew-org/continew-starter/commit/4c4f98a86e6d10b2b52814406bd0dc3d248c8486))
- 【web】针对最新响应风格增加全局响应格式 ([bf51837](https://github.com/continew-org/continew-starter/commit/bf51837991746c5576d7baffcc2296fe8ca91586)) ([4c4f98a](https://github.com/continew-org/continew-starter/commit/4c4f98a86e6d10b2b52814406bd0dc3d248c8486))
-
-### 🐛 问题修复
-
- 【extension/crud】重构排序字段处理，预防 SQL 注入问题 ([c31fa75](https://github.com/continew-org/continew-starter/commit/c31fa753b6d9753d72a2e28bf3184981ed848ac2)) ([22ebdfe](https://github.com/continew-org/continew-starter/commit/22ebdfeb9f30a8832825424a05343acfaf31643b))
- 【security/crypto】修复 updateById 修改未正确加密的问题 ([b0a2a8c](https://github.com/continew-org/continew-starter/commit/b0a2a8c927171795e3ed89a820caf829f76c80ee))
+- 【extension/crud】重构排序字段处理，预防 SQL 注入问题 ([c31fa75](https://github.com/continew-org/continew-starter/commit/c31fa753b6d9753d72a2e28bf3184981ed848ac2))

 ## [v2.5.1](https://github.com/continew-org/continew-starter/compare/v2.5.0...v2.5.1) (2024-08-12)

--- a/README.md
+++ b/README.md
@@ -72,11 +72,6 @@ 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>
@@ -142,54 +137,100 @@ continew-starter.web:

 ## 模块结构

-```
-continew-starter
-├─ continew-starter-core（核心模块：包含线程池等自动配置）
-├─ continew-starter-json（JSON 模块）
-│  └─ continew-starter-json-jackson
-├─ continew-starter-api-doc（接口文档模块：Spring Doc + Knife4j）
-├─ continew-starter-web（Web 开发模块：包含跨域、全局异常+响应、链路追踪等自动配置）
-├─ continew-starter-auth（认证模块）
-│  ├─ continew-starter-auth-satoken（国产轻量认证鉴权）
-│  └─ continew-starter-auth-justauth（第三方登录）
-├─ 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-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-captcha（验证码模块）
-│  ├─ continew-starter-captcha-graphic（静态验证码）
-│  └─ continew-starter-captcha-behavior（动态验证码）
-├─ continew-starter-messaging（消息模块）
-│  ├─ continew-starter-messaging-mail（邮件）
-│  └─ continew-starter-messaging-websocket（WebSocket）
-├─ continew-starter-log（日志模块）
-│  ├─ continew-starter-log-core（通用模块）
-│  └─ 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-extension-datapermission（数据权限模块）
-   │  ├─ 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-extension-crud-core（通用模块）
-      ├─ continew-starter-extension-crud-mp（MyBatis Plus）
-      └─ continew-starter-extension-crud-mf（MyBatis Flex）
-```
+### 核心模块
+
+| 模块名称              | 模块说明                             | 依赖版本                                                                                                                                                                                      |
+| --------------------- | ------------------------------------ |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 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 |
+
+### JSON模块
+
+| 模块名称                      | 模块说明             |
+| ----------------------------- | -------------------- |
+| continew-starter-json-jackson | Jackson 序列化等配置 |
+
+### 接口文档
+
+| 模块名称                 | 模块说明         |
+| ------------------------ | ---------------- |
+| continew-starter-api-doc | Knife4j 自动配置 |
+
+### 安全模块
+
+| 模块名称                           | 模块说明          |
+| ---------------------------------- | ----------------- |
+| continew-starter-security-password | 密码编码器        |
+| continew-starter-security-mask     | JSON 脱敏         |
+| continew-starter-security-crypto   | 数据库字段加/解密 |
+| continew-starter-security-limiter  | 限流器            |
+
+### Web模块
+
+| 模块名称             | 模块说明                           |
+| -------------------- | ---------------------------------- |
+| continew-starter-web | 跨域、全局异常、错误处理等自动配置 |
+
+### 日志模块
+
+| 模块名称                             | 模块说明                                  |
+|----------------------------------| ----------------------------------------- |
+| continew-starter-log-core        | 日志核心模块                              |
+| continew-starter-log-interceptor | 拦截器版（Spring Boot Actuator HttpTrace 增强版） |
+
+### 存储模块
+
+| 模块名称                       | 模块说明 |
+| ------------------------------ | -------- |
+| continew-starter-storage-local | 本地存储 |
+
+### 文件处理模块
+
+| 模块名称                    | 模块说明       |
+| --------------------------- | -------------- |
+| 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-mybatis-plus | MyBatis Plus 自动配置 |
+| continew-starter-data-mybatis-flex | 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 封装 |

 ## 贡献代码

--- a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java
+++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java
@@ -17,20 +17,23 @@
 package top.continew.starter.apidoc.autoconfigure;

 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ClassUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.databind.type.CollectionType;
+import com.fasterxml.jackson.databind.type.SimpleType;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.configuration.SpringDocConfiguration;
-import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
-import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
-import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
+import org.springdoc.core.customizers.*;
 import org.springdoc.core.properties.SpringDocConfigProperties;
 import org.springdoc.core.providers.JavadocProvider;
 import org.springdoc.core.service.OpenAPIService;
@@ -45,15 +48,15 @@ import org.springframework.http.CacheControl;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import top.continew.starter.apidoc.handler.BaseEnumParameterHandler;
 import top.continew.starter.apidoc.handler.OpenApiHandler;
+import top.continew.starter.apidoc.util.EnumTypeUtils;
 import top.continew.starter.core.autoconfigure.project.ProjectProperties;
+import top.continew.starter.core.enums.BaseEnum;
 import top.continew.starter.core.util.GeneralPropertySourceFactory;

-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;

 /**
 * API 文档自动配置
@@ -153,14 +156,95 @@ public class SpringDocAutoConfiguration implements WebMvcConfigurer {
    }

    /**
-     * 自定义 BaseEnum 枚举参数配置（针对实现了 BaseEnum 的枚举，优化其枚举值和描述展示）
+     * 自定义参数配置（针对 BaseEnum 展示枚举值和描述）
     *
-     * @return {@link BaseEnumParameterHandler }
     * @since 2.4.0
     */
    @Bean
-    public BaseEnumParameterHandler customParameterCustomizer() {
-        return new BaseEnumParameterHandler();
+    public ParameterCustomizer customParameterCustomizer() {
+        return (parameterModel, methodParameter) -> {
+            Class<?> parameterType = methodParameter.getParameterType();
+            // 判断是否为 BaseEnum 的子类型
+            if (!ClassUtil.isAssignable(BaseEnum.class, parameterType)) {
+                return parameterModel;
+            }
+            String description = parameterModel.getDescription();
+            if (StrUtil.contains(description, "color:red")) {
+                return parameterModel;
+            }
+            // 封装参数配置
+            this.configureSchema(parameterModel.getSchema(), parameterType);
+            // 自定义枚举描述
+            parameterModel.setDescription(description + "<span style='color:red'>" + this
+                .getDescMap(parameterType) + "</span>");
+            return parameterModel;
+        };
+    }
+
+    /**
+     * 自定义参数配置（针对 BaseEnum 展示枚举值和描述）
+     *
+     * @since 2.4.0
+     */
+    @Bean
+    public PropertyCustomizer customPropertyCustomizer() {
+        return (schema, type) -> {
+            Class<?> rawClass;
+            // 获取原始类的类型
+            if (type.getType() instanceof SimpleType) {
+                rawClass = ((SimpleType)type.getType()).getRawClass();
+            } else if (type.getType() instanceof CollectionType) {
+                rawClass = ((CollectionType)type.getType()).getContentType().getRawClass();
+            } else {
+                rawClass = Object.class;
+            }
+            // 判断是否为 BaseEnum 的子类型
+            if (!ClassUtil.isAssignable(BaseEnum.class, rawClass)) {
+                return schema;
+            }
+            // 封装参数配置
+            this.configureSchema(schema, rawClass);
+            // 自定义参数描述
+            schema.setDescription(schema.getDescription() + "<span style='color:red'>" + this
+                .getDescMap(rawClass) + "</span>");
+            return schema;
+        };
+    }
+
+    /**
+     * 封装 Schema 配置
+     *
+     * @param schema    Schema
+     * @param enumClass 枚举类型
+     * @since 2.4.0
+     */
+    private void configureSchema(Schema schema, Class<?> enumClass) {
+        BaseEnum[] enums = (BaseEnum[])enumClass.getEnumConstants();
+        // 设置枚举可用值
+        List<String> valueList = Arrays.stream(enums).map(e -> e.getValue().toString()).toList();
+        schema.setEnum(valueList);
+        // 设置枚举值类型和格式
+        String enumValueType = EnumTypeUtils.getEnumValueTypeAsString(enumClass);
+        schema.setType(enumValueType);
+        switch (enumValueType) {
+            case "integer" -> schema.setFormat("int32");
+            case "long" -> schema.setFormat("int64");
+            case "number" -> schema.setFormat("double");
+            default -> schema.setFormat(enumValueType);
+        }
+    }
+
+    /**
+     * 获取枚举描述 Map
+     *
+     * @param enumClass 枚举类型
+     * @return 枚举描述 Map
+     * @since 2.4.0
+     */
+    private Map<Object, String> getDescMap(Class<?> enumClass) {
+        BaseEnum[] enums = (BaseEnum[])enumClass.getEnumConstants();
+        return Arrays.stream(enums)
+            .collect(Collectors.toMap(BaseEnum::getValue, BaseEnum::getDescription, (a, b) -> a, LinkedHashMap::new));
    }

    @PostConstruct
--- a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/handler/BaseEnumParameterHandler.java
+++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/handler/BaseEnumParameterHandler.java
@@ -1,118 +0,0 @@
-/*
- * 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.apidoc.handler;
-
-import cn.hutool.core.util.ClassUtil;
-import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.databind.type.CollectionType;
-import com.fasterxml.jackson.databind.type.SimpleType;
-import io.swagger.v3.core.converter.AnnotatedType;
-import io.swagger.v3.oas.models.media.Schema;
-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;
-
-/**
- * 自定义 BaseEnum 枚举参数处理器
- * <p>
- * 针对实现了 BaseEnum 的枚举，优化其枚举值和描述展示
- * </p>
- *
- * @author echo
- * @since 2.5.2
- */
-public class BaseEnumParameterHandler implements ParameterCustomizer, PropertyCustomizer {
-
-    @Override
-    public Parameter customize(Parameter parameterModel, MethodParameter methodParameter) {
-        Class<?> parameterType = methodParameter.getParameterType();
-        // 判断是否为 BaseEnum 的子类型
-        if (!ClassUtil.isAssignable(BaseEnum.class, parameterType)) {
-            return parameterModel;
-        }
-        String description = parameterModel.getDescription();
-        if (StrUtil.contains(description, "color:red")) {
-            return parameterModel;
-        }
-        // 自定义枚举描述并封装参数配置
-        configureSchema(parameterModel.getSchema(), parameterType);
-        parameterModel.setDescription(appendEnumDescription(description, parameterType));
-        return parameterModel;
-    }
-
-    @Override
-    public Schema customize(Schema schema, AnnotatedType type) {
-        Class<?> rawClass = resolveRawClass(type.getType());
-        // 判断是否为 BaseEnum 的子类型
-        if (!ClassUtil.isAssignable(BaseEnum.class, rawClass)) {
-            return schema;
-        }
-        // 自定义参数描述并封装参数配置
-        configureSchema(schema, rawClass);
-        schema.setDescription(appendEnumDescription(schema.getDescription(), rawClass));
-        return schema;
-    }
-
-    /**
-     * 封装 Schema 配置
-     *
-     * @param schema    Schema
-     * @param enumClass 枚举类型
-     */
-    private void configureSchema(Schema schema, Class<?> enumClass) {
-        BaseEnum[] enums = (BaseEnum[])enumClass.getEnumConstants();
-        List<String> valueList = Arrays.stream(enums).map(e -> e.getValue().toString()).toList();
-        schema.setEnum(valueList);
-        String enumValueType = DocUtils.getEnumValueTypeAsString(enumClass);
-        schema.setType(enumValueType);
-        schema.setFormat(DocUtils.resolveFormat(enumValueType));
-    }
-
-    /**
-     * 追加枚举描述
-     *
-     * @param originalDescription 原始描述
-     * @param enumClass           枚举类型
-     * @return 追加后的描述字符串
-     */
-    private String appendEnumDescription(String originalDescription, Class<?> enumClass) {
-        return originalDescription + "<span style='color:red'>" + DocUtils.getDescMap(enumClass) + "</span>";
-    }
-
-    /**
-     * 解析原始类
-     *
-     * @param type 类型
-     * @return 原始类的 Class 对象
-     */
-    private Class<?> resolveRawClass(Type type) {
-        if (type instanceof SimpleType simpleType) {
-            return simpleType.getRawClass();
-        } else if (type instanceof CollectionType collectionType) {
-            return collectionType.getContentType().getRawClass();
-        } else {
-            return Object.class;
-        }
-    }
-}
--- a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/handler/OpenApiHandler.java
+++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/handler/OpenApiHandler.java
@@ -146,26 +146,22 @@ 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;
        this.springDocConfigProperties = springDocConfigProperties;
        this.openApiBuilderCustomisers = openApiBuilderCustomizers;
        this.serverBaseUrlCustomizers = serverBaseUrlCustomizers;
        this.javadocProvider = javadocProvider;
-        if (springDocConfigProperties.isUseFqn()) {
+        if (springDocConfigProperties.isUseFqn())
            TypeNameResolver.std.setUseFqn(true);
    }
-    }

    @Override
    public Operation buildTags(HandlerMethod handlerMethod, Operation operation, OpenAPI openAPI, Locale locale) {
@@ -176,11 +172,10 @@ 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);
@@ -191,9 +186,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();
@@ -228,9 +223,8 @@ 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));
        }

@@ -238,12 +232,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;
    }
@@ -270,9 +263,8 @@ 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);
-                }
            });
        });
    }
--- a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/util/DocUtils.java
+++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/util/DocUtils.java
@@ -1,119 +0,0 @@
-/*
- * 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.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;
-
-/**
- * 接口文档工具类
- *
- * @author echo
- * @since 2.5.2
- */
-public class DocUtils {
-
-    private DocUtils() {
-    }
-
-    /**
-     * 获取枚举值类型
-     *
-     * @param enumClass 枚举类型
-     * @return 枚举值类型
-     */
-    public static String getEnumValueTypeAsString(Class<?> enumClass) {
-        // 获取枚举类实现的所有接口
-        Type[] interfaces = enumClass.getGenericInterfaces();
-        // 定义枚举值类型的映射
-        Map<Class<?>, String> typeMap = Map
-            .of(Integer.class, "integer", Long.class, "long", Double.class, "number", String.class, "string");
-        // 遍历所有接口
-        for (Type type : interfaces) {
-            // 检查接口是否为参数化类型并且原始类型为 BaseEnum
-            if (type instanceof ParameterizedType parameterizedType && parameterizedType
-                .getRawType() == BaseEnum.class) {
-                Type actualType = parameterizedType.getActualTypeArguments()[0];
-                // 检查实际类型参数是否为类类型，并返回对应的字符串类型
-                if (actualType instanceof Class<?> actualClass) {
-                    return typeMap.getOrDefault(actualClass, "string");
-                }
-            }
-        }
-        // 默认返回 "string" 类型
-        return "string";
-    }
-
-    /**
-     * 解析枚举值的格式
-     *
-     * @param enumValueType 枚举值类型
-     * @return String 格式化类型
-     */
-    public static String resolveFormat(String enumValueType) {
-        return switch (enumValueType) {
-            case "integer" -> "int32";
-            case "long" -> "int64";
-            case "number" -> "double";
-            default -> enumValueType;
-        };
-    }
-
-    /**
-     * 具有 RestController 注释，既检查是否继承了BaseController
-     *
-     * @param clazz clazz
-     * @return boolean
-     */
-    public static boolean hasRestControllerAnnotation(Class<?> clazz) {
-        // 如果注释包含 RestController 注解，则返回 true
-        if (clazz.isAnnotationPresent(RestController.class)) {
-            return true;
-        }
-        // 递归检查父类
-        Class<?> superClass = clazz.getSuperclass();
-        // 循环检查父类
-        while (superClass != null && !superClass.equals(Object.class)) {
-            // 如果父类包含 RestController 注解，则返回 true
-            if (hasRestControllerAnnotation(superClass)) {
-                return true;
-            }
-            // 递归检查接口
-            superClass = superClass.getSuperclass();
-        }
-        return false;
-    }
-
-    /**
-     * 获取枚举描述 Map
-     *
-     * @param enumClass 枚举类型
-     * @return 枚举描述 Map
-     */
-    public static Map<Object, String> getDescMap(Class<?> enumClass) {
-        BaseEnum[] enums = (BaseEnum[])enumClass.getEnumConstants();
-        return Arrays.stream(enums)
-            .collect(Collectors.toMap(BaseEnum::getValue, BaseEnum::getDescription, (a, b) -> a, LinkedHashMap::new));
-    }
-}
--- a/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/util/EnumTypeUtils.java
+++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/util/EnumTypeUtils.java
@@ -0,0 +1,73 @@
+/*
+ * 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.apidoc.util;
+
+import top.continew.starter.core.enums.BaseEnum;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+/**
+ * 枚举类型工具
+ *
+ * @author echo
+ * @since 2.4.0
+ */
+public class EnumTypeUtils {
+
+    private EnumTypeUtils() {
+    }
+
+    /**
+     * 获取枚举值类型
+     *
+     * @param enumClass 枚举类型
+     * @return 枚举值类型
+     */
+    public static String getEnumValueTypeAsString(Class<?> enumClass) {
+        try {
+            // 获取枚举类实现的所有接口
+            Type[] interfaces = enumClass.getGenericInterfaces();
+            // 遍历所有接口
+            for (Type type : interfaces) {
+                // 检查接口是否为参数化类型
+                if (type instanceof ParameterizedType parameterizedType) {
+                    // 检查接口的原始类型是否为 BaseEnum
+                    if (parameterizedType.getRawType() != BaseEnum.class) {
+                        continue;
+                    }
+                    Type actualType = parameterizedType.getActualTypeArguments()[0];
+                    // 检查实际类型参数是否为类类型
+                    if (actualType instanceof Class<?> actualClass) {
+                        if (actualClass == Integer.class) {
+                            return "integer";
+                        } else if (actualClass == Long.class) {
+                            return "long";
+                        } else if (actualClass == Double.class) {
+                            return "number";
+                        } else if (actualClass == String.class) {
+                            return "string";
+                        }
+                    }
+                }
+            }
+        } catch (Exception ignored) {
+            // ignored
+        }
+        return "string";
+    }
+}
--- a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java
+++ b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
-import top.continew.starter.auth.justauth.core.AuthStateCacheRedisDefaultImpl;
+import top.continew.starter.auth.justauth.core.JustAuthStateCacheRedisImpl;
 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, havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "justauth", name = PropertiesConstants.ENABLED, matchIfMissing = true)
 public class JustAuthAutoConfiguration {

    private static final Logger log = LoggerFactory.getLogger(JustAuthAutoConfiguration.class);

    /**
-     * State 缓存 Redis 实现（默认）
+     * 自定义 State 缓存实现
     */
    @Bean
    @ConditionalOnClass(RedisClient.class)
    @ConditionalOnProperty(prefix = "justauth.cache", name = "type", havingValue = "redis")
    public AuthStateCache authStateCache() {
-        AuthStateCacheRedisDefaultImpl impl = new AuthStateCacheRedisDefaultImpl();
+        JustAuthStateCacheRedisImpl impl = new JustAuthStateCacheRedisImpl();
        log.debug("[ContiNew Starter] - Auto Configuration 'JustAuth-AuthStateCache-Redis' completed initialization.");
        return impl;
    }
--- a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/AuthStateCacheRedisDefaultImpl.java
+++ b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/AuthStateCacheRedisDefaultImpl.java
@@ -22,12 +22,12 @@ import top.continew.starter.cache.redisson.util.RedisUtils;
 import java.time.Duration;

 /**
- * 默认 State 缓存 Redis 实现
+ * JustAuth State 缓存 Redis 实现
 *
 * @author Charles7c
 * @since 1.0.0
 */
-public class AuthStateCacheRedisDefaultImpl implements AuthStateCache {
+public class JustAuthStateCacheRedisImpl implements AuthStateCache {

    private static final String KEY_PREFIX = "SOCIAL_AUTH_STATE";

--- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java
+++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java
@@ -29,10 +29,7 @@ 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.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.*;
 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;
@@ -81,7 +78,8 @@ 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（简单模式）
--- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java
+++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java
@@ -60,7 +60,7 @@ public class SaTokenDaoConfiguration {
    }

    /**
-     * 自定义持久层实现-Redis（默认）
+     * 自定义持久层实现-Redis
     */
    @ConditionalOnMissingBean(SaTokenDao.class)
    @ConditionalOnClass(RedisClient.class)
@@ -73,7 +73,7 @@ public class SaTokenDaoConfiguration {

        @Bean
        public SaTokenDao saTokenDao() {
-            return new SaTokenDaoRedisDefaultImpl();
+            return new SaTokenDaoRedisImpl();
        }
    }

--- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisDefaultImpl.java
+++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisDefaultImpl.java
@@ -26,12 +26,12 @@ import java.util.Collection;
 import java.util.List;

 /**
- * 默认 Sa-Token 持久层 Redis 实现（参考：Sa-Token/sa-token-plugin/sa-token-dao-redisx/SaTokenDaoOfRedis.java）
+ * Sa-Token 持久层 Redis 实现（参考：Sa-Token/sa-token-plugin/sa-token-dao-redisx/SaTokenDaoOfRedis.java）
 *
 * @author Charles7c
 * @since 1.0.0
 */
-public class SaTokenDaoRedisDefaultImpl implements SaTokenDao {
+public class SaTokenDaoRedisImpl implements SaTokenDao {

    @Override
    public String get(String key) {
--- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java
+++ b/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, havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.data.redisson", name = PropertiesConstants.ENABLED, matchIfMissing = true)
@EnableConfigurationProperties(RedissonProperties.class)
 public class RedissonAutoConfiguration {

--- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java
+++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java
@@ -24,8 +24,6 @@ import top.continew.starter.core.constant.StringConstants;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;

 /**
 * Redis 工具类
@@ -209,80 +207,6 @@ public class RedisUtils {
        return rateLimiter.tryAcquire(1);
    }

-    /**
-     * 尝试获取锁
-     *
-     * @param key        键
-     * @param expireTime 锁过期时间（单位：毫秒）
-     * @param timeout    获取锁超时时间（单位：毫秒）
-     * @return true：成功；false：失败
-     * @since 2.7.2
-     */
-    public static boolean tryLock(String key, long expireTime, long timeout) {
-        return tryLock(key, expireTime, timeout, TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * 释放锁
-     *
-     * @param key 键
-     * @return true：释放成功；false：释放失败
-     * @since 2.7.2
-     */
-    public static boolean unlock(String key) {
-        RLock lock = getLock(key);
-        return unlock(lock);
-    }
-
-    /**
-     * 尝试获取锁
-     *
-     * @param key        键
-     * @param expireTime 锁过期时间
-     * @param timeout    获取锁超时时间
-     * @param unit       时间单位
-     * @return true：成功；false：失败
-     * @since 2.7.2
-     */
-    public static boolean tryLock(String key, long expireTime, long timeout, TimeUnit unit) {
-        RLock lock = getLock(key);
-        try {
-            return lock.tryLock(timeout, expireTime, unit);
-        } catch (InterruptedException e) {
-            return false;
-        }
-    }
-
-    /**
-     * 释放锁
-     *
-     * @param lock 锁实例
-     * @return true：释放成功；false：释放失败
-     * @since 2.7.2
-     */
-    public static boolean unlock(RLock lock) {
-        if (lock.isHeldByCurrentThread()) {
-            try {
-                lock.unlockAsync().get();
-                return true;
-            } catch (ExecutionException | InterruptedException e) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 获取锁实例
-     *
-     * @param key 键
-     * @return 锁实例
-     * @since 2.7.2
-     */
-    public static RLock getLock(String key) {
-        return CLIENT.getLock(key);
-    }
-
    /**
     * 格式化键，将各子键用 : 拼接起来
     *
--- a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaAutoConfiguration.java
+++ b/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, havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.CAPTCHA_BEHAVIOR, name = PropertiesConstants.ENABLED, matchIfMissing = true)
 public class BehaviorCaptchaAutoConfiguration {

    private static final Logger log = LoggerFactory.getLogger(BehaviorCaptchaAutoConfiguration.class);
--- a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaAutoConfiguration.java
+++ b/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, havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = PropertiesConstants.CAPTCHA_GRAPHIC, name = PropertiesConstants.ENABLED, matchIfMissing = true)
 public class GraphicCaptchaAutoConfiguration {

    private static final Logger log = LoggerFactory.getLogger(GraphicCaptchaAutoConfiguration.class);
--- a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/core/GraphicCaptchaService.java
+++ b/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.text.CharSequenceUtil;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import com.wf.captcha.base.Captcha;
 import top.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaProperties;

--- a/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java
+++ b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java
@@ -31,4 +31,5 @@ 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 {
+}
--- a/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java
+++ b/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, havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.task.execution.extension", name = PropertiesConstants.ENABLED, matchIfMissing = true)
 public class AsyncAutoConfiguration implements AsyncConfigurer {

    private static final Logger log = LoggerFactory.getLogger(AsyncAutoConfiguration.class);
--- a/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java
+++ b/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, havingValue = "true", matchIfMissing = true)
+    @ConditionalOnProperty(prefix = "spring.task.execution.extension", name = PropertiesConstants.ENABLED, 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, havingValue = "true", matchIfMissing = true)
+    @ConditionalOnProperty(prefix = "spring.task.scheduling.extension", name = PropertiesConstants.ENABLED, matchIfMissing = true)
    public static class TaskSchedulerConfiguration {
        @Bean
        public ThreadPoolTaskSchedulerCustomizer threadPoolTaskSchedulerCustomizer(ThreadPoolExtensionProperties properties) {
--- a/continew-starter-core/src/main/java/top/continew/starter/core/constant/PropertiesConstants.java
+++ b/continew-starter-core/src/main/java/top/continew/starter/core/constant/PropertiesConstants.java
@@ -119,21 +119,6 @@ public class PropertiesConstants {
     */
    public static final String MESSAGING_WEBSOCKET = MESSAGING + StringConstants.DOT + "websocket";

-    /**
-     * CRUD 配置
-     */
-    public static final String CRUD = CONTINEW_STARTER + StringConstants.DOT + "crud";
-
-    /**
-     * 数据权限配置
-     */
-    public static final String DATA_PERMISSION = CONTINEW_STARTER + StringConstants.DOT + "data-permission";
-
-    /**
-     * 多租户配置
-     */
-    public static final String TENANT = CONTINEW_STARTER + StringConstants.DOT + "tenant";
-
    private PropertiesConstants() {
    }
 }
--- a/continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java
+++ b/continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java
@@ -120,7 +120,8 @@ public class StringConstants {
    public static final String DOT = StrPool.DOT;

    /**
-     * 字符串常量：双点 {@code ".."} <br> 用途：作为指向上级文件夹的路径，如：{@code "../path"}
+     * 字符串常量：双点 {@code ".."} <br>
+     * 用途：作为指向上级文件夹的路径，如：{@code "../path"}
     */
    public static final String DOUBLE_DOT = StrPool.DOUBLE_DOT;

@@ -135,7 +136,8 @@ public class StringConstants {
    public static final String BACKSLASH = StrPool.BACKSLASH;

    /**
-     * 字符串常量：回车符 {@code "\r"} <br> 解释：该字符常用于表示 Linux 系统和 MacOS 系统下的文本换行
+     * 字符串常量：回车符 {@code "\r"} <br>
+     * 解释：该字符常用于表示 Linux 系统和 MacOS 系统下的文本换行
     */
    public static final String CR = StrPool.CR;

@@ -145,7 +147,8 @@ public class StringConstants {
    public static final String LF = StrPool.LF;

    /**
-     * 字符串常量：Windows 换行 {@code "\r\n"} <br> 解释：该字符串常用于表示 Windows 系统下的文本换行
+     * 字符串常量：Windows 换行 {@code "\r\n"} <br>
+     * 解释：该字符串常用于表示 Windows 系统下的文本换行
     */
    public static final String CRLF = StrPool.CRLF;

@@ -254,11 +257,6 @@ public class StringConstants {
     */
    public static final String QUESTION_MARK = "?";

-    /**
-     * 管道符
-     */
-    public static final String PIPE = "|";
-
    /**
     * 中文逗号
     */
@@ -274,11 +272,6 @@ public class StringConstants {
     */
    public static final String ROUND_BRACKET_END = ")";

-    /**
-     * 等号（=）
-     */
-    public static final String EQUALS = "=";
-
    /**
     * 路径模式
     */
--- a/continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java
+++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java
@@ -18,13 +18,13 @@ package top.continew.starter.core.util;

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.net.NetUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.http.HtmlUtil;
 import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
 import net.dreamlu.mica.ip2region.core.IpInfo;
 import top.continew.starter.core.constant.StringConstants;

-import java.util.Objects;
 import java.util.Set;

 /**
@@ -50,13 +50,12 @@ public class IpUtils {
        }
        Ip2regionSearcher ip2regionSearcher = SpringUtil.getBean(Ip2regionSearcher.class);
        IpInfo ipInfo = ip2regionSearcher.memorySearch(ip);
-        if (null == ipInfo) {
-            return null;
+        if (null != ipInfo) {
+            Set<String> regionSet = CollUtil.newLinkedHashSet(ipInfo.getAddress(), ipInfo.getIsp());
+            regionSet.removeIf(CharSequenceUtil::isBlank);
+            return String.join(StringConstants.SPACE, regionSet);
        }
-        Set<String> regionSet = CollUtil.newLinkedHashSet(ipInfo.getCountry(), ipInfo.getRegion(), ipInfo
-            .getProvince(), ipInfo.getCity(), ipInfo.getIsp());
-        regionSet.removeIf(Objects::isNull);
-        return String.join(StringConstants.PIPE, regionSet);
+        return null;
    }

    /**
--- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java
+++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java
@@ -27,4 +27,12 @@ import java.lang.annotation.*;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
-public @interface QueryIgnore {}
+public @interface QueryIgnore {
+
+    /**
+     * 获取是否忽略查询解析
+     *
+     * @return 是否忽略查询解析
+     */
+    boolean value() default true;
+}
--- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java
+++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java
@@ -18,8 +18,6 @@ package top.continew.starter.data.core.enums;

 import top.continew.starter.data.core.function.ISqlFunction;

-import java.io.Serializable;
-
 /**
 * 数据库类型枚举
 *
@@ -33,8 +31,8 @@ public enum DatabaseType implements ISqlFunction {
     */
    MYSQL("MySQL") {
        @Override
-        public String findInSet(Serializable value, String set) {
-            return "find_in_set('%s', %s) <> 0".formatted(value, set);
+        public String findInSet() {
+            return "find_in_set({0}, {1}) <> 0";
        }
    },

@@ -43,8 +41,8 @@ public enum DatabaseType implements ISqlFunction {
     */
    POSTGRE_SQL("PostgreSQL") {
        @Override
-        public String findInSet(Serializable value, String set) {
-            return "(select position(',%s,' in ','||%s||',')) <> 0".formatted(value, set);
+        public String findInSet() {
+            return "(select position(',{0},' in ','||{1}||',')) <> 0";
        }
    },;

--- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java
+++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java
@@ -16,8 +16,6 @@

 package top.continew.starter.data.core.function;

-import java.io.Serializable;
-
 /**
 * SQL 函数接口
 *
@@ -29,9 +27,7 @@ public interface ISqlFunction {
    /**
     * find_in_set 函数
     *
-     * @param value 值
-     * @param set   集合
     * @return 函数实现
     */
-    String findInSet(Serializable value, String set);
+    String findInSet();
 }
--- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/MetaUtils.java
+++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/MetaUtils.java
@@ -16,21 +16,18 @@

 package top.continew.starter.data.core.util;

-import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.DbUtil;
+import cn.hutool.db.Db;
+import cn.hutool.db.Entity;
 import cn.hutool.db.meta.Column;
 import cn.hutool.db.meta.MetaUtil;
-import cn.hutool.db.meta.Table;
-import cn.hutool.db.meta.TableType;
 import top.continew.starter.core.exception.BusinessException;
 import top.continew.starter.data.core.enums.DatabaseType;

 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -83,7 +80,7 @@ public class MetaUtils {
     * @param dataSource 数据源
     * @return 表信息列表
     */
-    public static List<Table> getTables(DataSource dataSource) {
+    public static List<Table> getTables(DataSource dataSource) throws SQLException {
        return getTables(dataSource, null);
    }

@@ -93,39 +90,27 @@ public class MetaUtils {
     * @param dataSource 数据源
     * @param tableName  表名称
     * @return 表信息列表
-     * @author looly
-     * @since 2.7.2
     */
-    public static List<Table> getTables(DataSource dataSource, String tableName) {
-        List<Table> tables = new ArrayList<>();
-        Connection conn = null;
-        try {
-            conn = dataSource.getConnection();
-            String catalog = MetaUtil.getCatalog(conn);
-            String schema = MetaUtil.getSchema(conn);
-            final DatabaseMetaData metaData = conn.getMetaData();
-            try (final ResultSet rs = metaData.getTables(catalog, schema, tableName, Convert
-                .toStrArray(TableType.TABLE))) {
-                if (null != rs) {
-                    String name;
-                    while (rs.next()) {
-                        name = rs.getString("TABLE_NAME");
-                        if (CharSequenceUtil.isNotBlank(name)) {
-                            final Table table = Table.create(name);
-                            table.setCatalog(catalog);
-                            table.setSchema(schema);
-                            table.setComment(MetaUtil.getRemarks(metaData, catalog, schema, name));
-                            tables.add(table);
+    public static List<Table> getTables(DataSource dataSource, String tableName) throws SQLException {
+        String querySql = "SHOW TABLE STATUS";
+        List<Entity> tableEntityList;
+        Db db = Db.use(dataSource);
+        if (CharSequenceUtil.isNotBlank(tableName)) {
+            tableEntityList = db.query("%s WHERE NAME = ?".formatted(querySql), tableName);
+        } else {
+            tableEntityList = db.query(querySql);
        }
+        List<Table> tableList = new ArrayList<>(tableEntityList.size());
+        for (Entity tableEntity : tableEntityList) {
+            Table table = new Table(tableEntity.getStr("NAME"));
+            table.setComment(tableEntity.getStr("COMMENT"));
+            table.setEngine(tableEntity.getStr("ENGINE"));
+            table.setCharset(tableEntity.getStr("COLLATION"));
+            table.setCreateTime(DateUtil.toLocalDateTime(tableEntity.getDate("CREATE_TIME")));
+            table.setUpdateTime(DateUtil.toLocalDateTime(tableEntity.getDate("UPDATE_TIME")));
+            tableList.add(table);
        }
-                }
-            }
-            return tables;
-        } catch (Exception e) {
-            throw new DbRuntimeException("Get tables error!", e);
-        } finally {
-            DbUtil.close(conn);
-        }
+        return tableList;
    }

    /**
@@ -136,7 +121,7 @@ public class MetaUtils {
     * @return 列信息列表
     */
    public static Collection<Column> getColumns(DataSource dataSource, String tableName) {
-        Table table = MetaUtil.getTableMeta(dataSource, tableName);
+        cn.hutool.db.meta.Table table = MetaUtil.getTableMeta(dataSource, tableName);
        return table.getColumns();
    }
 }
--- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java
+++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/SqlInjectionUtils.java
@@ -16,24 +16,17 @@

 package top.continew.starter.data.core.util;

-import cn.hutool.core.text.CharSequenceUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Objects;
 import java.util.regex.Pattern;

 /**
 * SQL 注入验证工具类
 *
- * @author hubin（<a href="https://github.com/baomidou/mybatis-plus">MyBatis Plus</a>）
- * @author zhoujf（<a href="https://github.com/jeecgboot/JeecgBoot">JeecgBoot</a>）
- * @author Charles7c
+ * @author hubin
 * @since 2.5.2
 */
 public class SqlInjectionUtils {

-    private static final Logger log = LoggerFactory.getLogger(SqlInjectionUtils.class);
-
    /**
     * SQL语法检查正则：符合两个关键字（有先后顺序）才算匹配
     */
@@ -46,23 +39,6 @@ public class SqlInjectionUtils {
    private static final Pattern SQL_COMMENT_PATTERN = Pattern
        .compile("'.*(or|union|--|#|/\\*|;)", Pattern.CASE_INSENSITIVE);

-    /**
-     * SQL 语法关键字
-     */
-    private static final String SQL_SYNTAX_KEYWORD = "and |exec |peformance_schema|information_schema|extractvalue|updatexml|geohash|gtid_subset|gtid_subtract|insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |;|or |+|--";
-
-    /**
-     * SQL 函数检查正则
-     */
-    private static final String[] SQL_FUNCTION_PATTERN = new String[] {"chr\\s*\\(", "mid\\s*\\(", " char\\s*\\(",
-        "sleep\\s*\\(", "user\\s*\\(", "show\\s+tables", "user[\\s]*\\([\\s]*\\)", "show\\s+databases",
-        "sleep\\(\\d*\\)", "sleep\\(.*\\)",};
-
-    private static final String MESSAGE_TEMPLATE = "SQL 注入检查: 检查值=>{}<=存在 SQL 注入关键字, 关键字=>{}<=";
-
-    private SqlInjectionUtils() {
-    }
-
    /**
     * 检查参数是否存在 SQL 注入
     *
@@ -70,59 +46,8 @@ public class SqlInjectionUtils {
     * @return true：非法；false：合法
     */
    public static boolean check(String value) {
-        return check(value, null);
-    }
-
-    /**
-     * 检查参数是否存在 SQL 注入
-     *
-     * @param value         检查参数
-     * @param customKeyword 自定义关键字
-     * @return true：非法；false：合法
-     */
-    public static boolean check(String value, String customKeyword) {
-        if (CharSequenceUtil.isBlank(value)) {
-            return false;
-        }
+        Objects.requireNonNull(value);
        // 处理是否包含 SQL 注释字符 || 检查是否包含 SQ L注入敏感字符
-        if (SQL_COMMENT_PATTERN.matcher(value).find() || SQL_SYNTAX_PATTERN.matcher(value).find()) {
-            log.warn("SQL 注入检查: 检查值=>{}<=存在 SQL 注释字符或 SQL 注入敏感字符", value);
-            return true;
-        }
-        // 转换成小写再进行比较
-        value = value.toLowerCase().trim();
-        // 检查是否包含 SQL 语法关键字
-        if (checkKeyword(value, SQL_SYNTAX_KEYWORD.split("\\|"))) {
-            return true;
-        }
-        // 检查是否包含自定义关键字
-        if (CharSequenceUtil.isNotBlank(customKeyword) && checkKeyword(value, customKeyword.split("\\|"))) {
-            return true;
-        }
-        // 检查是否包含 SQL 注入敏感字符
-        for (String pattern : SQL_FUNCTION_PATTERN) {
-            if (Pattern.matches(".*" + pattern + ".*", value)) {
-                log.warn(MESSAGE_TEMPLATE, value, pattern);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 检查参数是否存在关键字
-     *
-     * @param value    检查参数
-     * @param keywords 关键字列表
-     * @return true：非法；false：合法
-     */
-    private static boolean checkKeyword(String value, String[] keywords) {
-        for (String keyword : keywords) {
-            if (value.contains(keyword)) {
-                log.warn(MESSAGE_TEMPLATE, value, keyword);
-                return true;
-            }
-        }
-        return false;
+        return SQL_COMMENT_PATTERN.matcher(value).find() || SQL_SYNTAX_PATTERN.matcher(value).find();
    }
 }
--- a/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/Table.java
+++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/Table.java
@@ -0,0 +1,115 @@
+/*
+ * 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.data.core.util;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 数据库表信息
+ *
+ * @author Charles7c
+ * @since 1.0.0
+ */
+public class Table implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 表名称
+     */
+    private String tableName;
+
+    /**
+     * 注释
+     */
+    private String comment;
+
+    /**
+     * 存储引擎
+     */
+    private String engine;
+
+    /**
+     * 字符集
+     */
+    private String charset;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    public Table(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public String getEngine() {
+        return engine;
+    }
+
+    public void setEngine(String engine) {
+        this.engine = engine;
+    }
+
+    public String getCharset() {
+        return charset;
+    }
+
+    public void setCharset(String charset) {
+        this.charset = charset;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+}
--- a/continew-starter-data/continew-starter-data-mf/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/continew-starter-data/continew-starter-data-mf/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +0,0 @@
-top.continew.starter.data.mf.autoconfigure.MybatisFlexAutoConfiguration
--- a/continew-starter-data/continew-starter-data-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/continew-starter-data/continew-starter-data-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +0,0 @@
-top.continew.starter.data.mp.autoconfigure.MybatisPlusAutoConfiguration
--- a/continew-starter-data/continew-starter-data-mybatis-flex/pom.xml
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/pom.xml
@@ -9,7 +9,7 @@
        <version>${revision}</version>
    </parent>

-    <artifactId>continew-starter-data-mf</artifactId>
+    <artifactId>continew-starter-data-mybatis-flex</artifactId>
    <description>ContiNew Starter 数据访问模块 - MyBatis Flex</description>

    <dependencies>
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/ConditionalOnEnabledDataPermission.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/ConditionalOnEnabledDataPermission.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.autoconfigure;
+package top.continew.starter.data.mybatis.flex.autoconfigure;

 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import top.continew.starter.core.constant.PropertiesConstants;
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MyBatisFlexExtensionProperties.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MyBatisFlexExtensionProperties.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.autoconfigure;
+package top.continew.starter.data.mybatis.flex.autoconfigure;

 import com.mybatisflex.core.dialect.DbType;
 import org.springframework.boot.context.properties.ConfigurationProperties;
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MybatisFlexAutoConfiguration.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/autoconfigure/MybatisFlexAutoConfiguration.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.autoconfigure;
+package top.continew.starter.data.mybatis.flex.autoconfigure;

 import com.mybatisflex.core.dialect.DbType;
 import com.mybatisflex.core.dialect.DialectFactory;
@@ -30,8 +30,8 @@ import org.springframework.context.annotation.PropertySource;
 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.mf.datapermission.DataPermissionDialect;
-import top.continew.starter.data.mf.datapermission.DataPermissionFilter;
+import top.continew.starter.data.mybatis.flex.datapermission.DataPermissionDialect;
+import top.continew.starter.data.mybatis.flex.datapermission.DataPermissionFilter;

 /**
 * MyBatis Flex 自动配置
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/BaseMapper.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/BaseMapper.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.base;
+package top.continew.starter.data.mybatis.flex.base;

 import cn.hutool.core.util.ClassUtil;
 import com.mybatisflex.core.query.QueryWrapper;
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/IBaseEnum.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/base/IBaseEnum.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.base;
+package top.continew.starter.data.mybatis.flex.base;

 import java.io.Serializable;

--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermission.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermission.java
@@ -14,7 +14,9 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.datapermission;
+package top.continew.starter.data.mybatis.flex.datapermission;
+
+import org.springframework.core.annotation.AliasFor;

 import java.lang.annotation.*;

@@ -29,9 +31,16 @@ import java.lang.annotation.*;
@Documented
 public @interface DataPermission {

+    /**
+     * Alias for the {@link #tableAlias()} attribute.
+     */
+    @AliasFor("tableAlias")
+    String value() default "";
+
    /**
     * 表别名
     */
+    @AliasFor("value")
    String tableAlias() default "";

    /**
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionAspect.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionAspect.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.datapermission;
+package top.continew.starter.data.mybatis.flex.datapermission;

 import org.aspectj.lang.annotation.*;

--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionCurrentUser.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionCurrentUser.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.datapermission;
+package top.continew.starter.data.mybatis.flex.datapermission;

 import java.util.Set;

--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionDialect.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionDialect.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.datapermission;
+package top.continew.starter.data.mybatis.flex.datapermission;

 import cn.hutool.core.util.StrUtil;
 import com.mybatisflex.core.dialect.impl.CommonsDialectImpl;
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionFilter.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataPermissionFilter.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.datapermission;
+package top.continew.starter.data.mybatis.flex.datapermission;

 /**
 * 数据权限过滤器接口
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataScope.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/datapermission/DataScope.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.datapermission;
+package top.continew.starter.data.mybatis.flex.datapermission;

 /**
 * 数据权限枚举
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/IService.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/IService.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.service;
+package top.continew.starter.data.mybatis.flex.service;

 /**
 * 通用业务接口
@@ -23,4 +23,5 @@ 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> {
+}
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/impl/ServiceImpl.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/service/impl/ServiceImpl.java
@@ -14,11 +14,11 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.service.impl;
+package top.continew.starter.data.mybatis.flex.service.impl;

 import top.continew.starter.core.util.ClassUtils;
-import top.continew.starter.data.mf.base.BaseMapper;
-import top.continew.starter.data.mf.service.IService;
+import top.continew.starter.data.mybatis.flex.base.BaseMapper;
+import top.continew.starter.data.mybatis.flex.service.IService;

 /**
 * 通用业务实现类
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/util/QueryWrapperHelper.java
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/java/top/continew/starter/data/mybatis/flex/util/QueryWrapperHelper.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mf.util;
+package top.continew.starter.data.mybatis.flex.util;

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
@@ -143,7 +143,7 @@ public class QueryWrapperHelper {
            }
            // 设置了 @QueryIgnore 注解，直接忽略
            QueryIgnore queryIgnoreAnnotation = field.getAnnotation(QueryIgnore.class);
-            if (null != queryIgnoreAnnotation) {
+            if (null != queryIgnoreAnnotation && queryIgnoreAnnotation.value()) {
                return Collections.emptyList();
            }
            // 建议：数据库表列建议采用下划线连接法命名，程序变量建议采用驼峰法命名
@@ -199,9 +199,7 @@ public class QueryWrapperHelper {
            case LT -> consumers.add(q -> q.lt(columnName, fieldValue));
            case LE -> consumers.add(q -> q.le(columnName, fieldValue));
            case BETWEEN -> {
-                List<Object> between = new ArrayList<>(ArrayUtil.isArray(fieldValue)
-                    ? CollUtil.toList(fieldValue)
-                    : (List<Object>)fieldValue);
+                List<Object> between = new ArrayList<>((List<Object>)fieldValue);
                ValidationUtils.throwIf(between.size() != 2, "[{}] 必须是一个范围", columnName);
                consumers.add(q -> q.between(columnName, between.get(0), between.get(1)));
            }
@@ -210,15 +208,11 @@ public class QueryWrapperHelper {
            case LIKE_RIGHT -> consumers.add(q -> q.likeRight(columnName, fieldValue));
            case IN -> {
                ValidationUtils.throwIfEmpty(fieldValue, "[{}] 不能为空", columnName);
-                consumers.add(q -> q.in(columnName, ArrayUtil.isArray(fieldValue)
-                    ? CollUtil.toList(fieldValue)
-                    : (Collection<Object>)fieldValue));
+                consumers.add(q -> q.in(columnName, (Collection<Object>)fieldValue));
            }
            case NOT_IN -> {
                ValidationUtils.throwIfEmpty(fieldValue, "[{}] 不能为空", columnName);
-                consumers.add(q -> q.notIn(columnName, ArrayUtil.isArray(fieldValue)
-                    ? CollUtil.toList(fieldValue)
-                    : (Collection<Object>)fieldValue));
+                consumers.add(q -> q.notIn(columnName, (Collection<Object>)fieldValue));
            }
            case IS_NULL -> consumers.add(q -> q.isNull(columnName));
            case IS_NOT_NULL -> consumers.add(q -> q.isNotNull(columnName));
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+top.continew.starter.data.mybatis.flex.autoconfigure.MybatisFlexAutoConfiguration
--- a/continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/default-data-mybatis-flex.yml
+++ b/continew-starter-data/continew-starter-data-mybatis-flex/src/main/resources/default-data-mybatis-flex.yml
--- a/continew-starter-data/continew-starter-data-mybatis-plus/pom.xml
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/pom.xml
@@ -9,7 +9,7 @@
        <version>${revision}</version>
    </parent>

-    <artifactId>continew-starter-data-mp</artifactId>
+    <artifactId>continew-starter-data-mybatis-plus</artifactId>
    <description>ContiNew Starter 数据访问模块 - MyBatis Plus</description>

    <dependencies>
@@ -19,6 +19,12 @@
            <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>
--- a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/annotation/TenantDataSourceIgnore.java
+++ b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/annotation/TenantDataSourceIgnore.java
@@ -14,18 +14,22 @@
 * limitations under the License.
 */

-package top.continew.starter.extension.tenant.annotation;
+package top.continew.starter.data.mybatis.plus.autoconfigure;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import top.continew.starter.core.constant.PropertiesConstants;

 import java.lang.annotation.*;

 /**
- * 多租户数据源级隔离忽略注解
+ * 是否启用数据权限注解
 *
 * @author Charles7c
- * @since 2.7.0
+ * @since 1.1.0
 */
-@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
@Documented
-public @interface TenantDataSourceIgnore {
+@ConditionalOnProperty(prefix = "mybatis-plus.extension.data-permission", name = PropertiesConstants.ENABLED, havingValue = "true")
+public @interface ConditionalOnEnabledDataPermission {
 }
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java
@@ -14,12 +14,12 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.autoconfigure;
+package top.continew.starter.data.mybatis.plus.autoconfigure;

 import com.baomidou.mybatisplus.annotation.DbType;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import top.continew.starter.data.mp.autoconfigure.idgenerator.MyBatisPlusIdGeneratorProperties;
+import top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator.MyBatisPlusIdGeneratorProperties;

 /**
 * MyBatis Plus 扩展配置属性
@@ -49,21 +49,40 @@ 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;
+        }
+    }
+
    /**
     * 分页插件配置属性
     */
@@ -146,6 +165,14 @@ public class MyBatisPlusExtensionProperties {
        this.idGenerator = idGenerator;
    }

+    public DataPermissionProperties getDataPermission() {
+        return dataPermission;
+    }
+
+    public void setDataPermission(DataPermissionProperties dataPermission) {
+        this.dataPermission = dataPermission;
+    }
+
    public PaginationProperties getPagination() {
        return pagination;
    }
@@ -154,14 +181,6 @@ public class MyBatisPlusExtensionProperties {
        this.pagination = pagination;
    }

-    public boolean isOptimisticLockerEnabled() {
-        return optimisticLockerEnabled;
-    }
-
-    public void setOptimisticLockerEnabled(boolean optimisticLockerEnabled) {
-        this.optimisticLockerEnabled = optimisticLockerEnabled;
-    }
-
    public boolean isBlockAttackPluginEnabled() {
        return blockAttackPluginEnabled;
    }
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java
@@ -14,12 +14,15 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.autoconfigure;
+package top.continew.starter.data.mybatis.plus.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.inner.*;
+import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import jakarta.annotation.PostConstruct;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
@@ -35,10 +38,10 @@ import org.springframework.context.annotation.PropertySource;
 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.handler.MybatisBaseEnumTypeHandler;
-
-import java.util.Map;
+import top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator.MyBatisPlusIdGeneratorConfiguration;
+import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter;
+import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionHandlerImpl;
+import top.continew.starter.data.mybatis.plus.handler.MybatisBaseEnumTypeHandler;

 /**
 * MyBatis Plus 自动配置
@@ -73,20 +76,18 @@ public class MybatisPlusAutoConfiguration {
    @ConditionalOnMissingBean
    public MybatisPlusInterceptor mybatisPlusInterceptor(MyBatisPlusExtensionProperties properties) {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        // 其他拦截器
-        Map<String, InnerInterceptor> innerInterceptors = SpringUtil.getBeansOfType(InnerInterceptor.class);
-        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());
@@ -102,13 +103,24 @@ 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>）
     */
    private PaginationInnerInterceptor paginationInnerInterceptor(MyBatisPlusExtensionProperties.PaginationProperties paginationProperties) {
        // 对于单一数据库类型来说，都建议配置该值，避免每次分页都去抓取数据库类型
-        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(paginationProperties
-            .getDbType());
+        PaginationInnerInterceptor paginationInnerInterceptor = null != paginationProperties.getDbType()
+            ? new PaginationInnerInterceptor(paginationProperties.getDbType())
+            : new PaginationInnerInterceptor();
        paginationInnerInterceptor.setOverflow(paginationProperties.isOverflow());
        paginationInnerInterceptor.setMaxLimit(paginationProperties.getMaxLimit());
        return paginationInnerInterceptor;
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.autoconfigure.idgenerator;
+package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator;

 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import me.ahoo.cosid.snowflake.SnowflakeId;
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.autoconfigure.idgenerator;
+package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator;

 import cn.hutool.core.net.NetUtil;
 import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java
@@ -14,9 +14,9 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.autoconfigure.idgenerator;
+package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator;

-import top.continew.starter.data.mp.enums.MyBatisPlusIdGeneratorType;
+import top.continew.starter.data.mybatis.plus.enums.MyBatisPlusIdGeneratorType;

 /**
 * MyBatis ID 生成器配置属性
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/BaseMapper.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/BaseMapper.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.base;
+package top.continew.starter.data.mybatis.plus.base;

 import cn.hutool.core.util.ClassUtil;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/annotation/DataPermission.java
+++ b/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,9 @@
 * limitations under the License.
 */

-package top.continew.starter.extension.datapermission.annotation;
+package top.continew.starter.data.mybatis.plus.datapermission;
+
+import org.springframework.core.annotation.AliasFor;

 import java.lang.annotation.*;

@@ -29,9 +31,16 @@ import java.lang.annotation.*;
@Documented
 public @interface DataPermission {

+    /**
+     * Alias for the {@link #tableAlias()} attribute.
+     */
+    @AliasFor("tableAlias")
+    String value() default "";
+
    /**
     * 表别名
     */
+    @AliasFor("value")
    String tableAlias() default "";

    /**
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/model/UserContext.java
+++ b/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.extension.datapermission.model;
+package top.continew.starter.data.mybatis.plus.datapermission;

 import java.util.Set;

 /**
- * 用户上下文
+ * 当前用户信息
 *
 * @author Charles7c
 * @since 1.1.0
 */
-public class UserContext {
+public class DataPermissionCurrentUser {

    /**
     * 用户 ID
@@ -34,13 +34,53 @@ public class UserContext {
    /**
     * 角色列表
     */
-    private Set<RoleContext> roles;
+    private Set<CurrentUserRole> 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;
    }
@@ -49,11 +89,11 @@ public class UserContext {
        this.userId = userId;
    }

-    public Set<RoleContext> getRoles() {
+    public Set<CurrentUserRole> getRoles() {
        return roles;
    }

-    public void setRoles(Set<RoleContext> roles) {
+    public void setRoles(Set<CurrentUserRole> roles) {
        this.roles = roles;
    }

--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/filter/DataPermissionUserContextProvider.java
+++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/filter/DataPermissionUserContextProvider.java
@@ -14,17 +14,15 @@
 * limitations under the License.
 */

-package top.continew.starter.extension.datapermission.filter;
-
-import top.continew.starter.extension.datapermission.model.UserContext;
+package top.continew.starter.data.mybatis.plus.datapermission;

 /**
- * 数据权限用户上下文提供者
+ * 数据权限过滤器接口
 *
 * @author Charles7c
 * @since 1.1.0
 */
-public interface DataPermissionUserContextProvider {
+public interface DataPermissionFilter {

    /**
     * 是否过滤
@@ -34,9 +32,9 @@ public interface DataPermissionUserContextProvider {
    boolean isFilter();

    /**
-     * 获取用户上下文
+     * 获取当前用户信息
     *
-     * @return 用户上下文
+     * @return 当前用户信息
     */
-    UserContext getUserContext();
+    DataPermissionCurrentUser getCurrentUser();
 }
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java
+++ b/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.extension.datapermission.handler;
+package top.continew.starter.data.mybatis.plus.datapermission;

 import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -22,44 +22,37 @@ import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.expression.LongValue;
+import net.sf.jsqlparser.expression.Parenthesis;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
-import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.select.ParenthesedSelect;
-import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.SelectItem;
+import net.sf.jsqlparser.statement.select.*;
 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 DefaultDataPermissionHandler implements DataPermissionHandler {
+public class DataPermissionHandlerImpl implements DataPermissionHandler {

-    private static final Logger log = LoggerFactory.getLogger(DefaultDataPermissionHandler.class);
-    private final DataPermissionUserContextProvider dataPermissionUserContextProvider;
+    private static final Logger log = LoggerFactory.getLogger(DataPermissionHandlerImpl.class);
+    private final DataPermissionFilter dataPermissionFilter;

-    public DefaultDataPermissionHandler(DataPermissionUserContextProvider dataPermissionUserContextProvider) {
-        this.dataPermissionUserContextProvider = dataPermissionUserContextProvider;
+    public DataPermissionHandlerImpl(DataPermissionFilter dataPermissionFilter) {
+        this.dataPermissionFilter = dataPermissionFilter;
    }

    @Override
@@ -75,7 +68,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
                if (null == dataPermission || !CharSequenceUtil.equalsAny(methodName, name, name + "_COUNT")) {
                    continue;
                }
-                if (dataPermissionUserContextProvider.isFilter()) {
+                if (dataPermissionFilter.isFilter()) {
                    return buildDataScopeFilter(dataPermission, where);
                }
            }
@@ -94,23 +87,23 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
     */
    private Expression buildDataScopeFilter(DataPermission dataPermission, Expression where) {
        Expression expression = null;
-        UserContext userContext = dataPermissionUserContextProvider.getUserContext();
-        Set<RoleContext> roles = userContext.getRoles();
-        for (RoleContext roleContext : roles) {
-            DataScope dataScope = roleContext.getDataScope();
+        DataPermissionCurrentUser currentUser = dataPermissionFilter.getCurrentUser();
+        Set<DataPermissionCurrentUser.CurrentUserRole> roles = currentUser.getRoles();
+        for (DataPermissionCurrentUser.CurrentUserRole role : roles) {
+            DataScope dataScope = role.getDataScope();
            if (DataScope.ALL.equals(dataScope)) {
                return where;
            }
            switch (dataScope) {
                case DEPT_AND_CHILD -> expression = this
-                    .buildDeptAndChildExpression(dataPermission, userContext, expression);
-                case DEPT -> expression = this.buildDeptExpression(dataPermission, userContext, expression);
-                case SELF -> expression = this.buildSelfExpression(dataPermission, userContext, expression);
-                case CUSTOM -> expression = this.buildCustomExpression(dataPermission, roleContext, expression);
+                    .buildDeptAndChildExpression(dataPermission, currentUser, expression);
+                case DEPT -> expression = this.buildDeptExpression(dataPermission, currentUser, expression);
+                case SELF -> expression = this.buildSelfExpression(dataPermission, currentUser, expression);
+                case CUSTOM -> expression = this.buildCustomExpression(dataPermission, role, expression);
                default -> throw new IllegalArgumentException("暂不支持 [%s] 数据权限".formatted(dataScope));
            }
        }
-        return null != where ? new AndExpression(where, new ParenthesedExpressionList<>(expression)) : expression;
+        return null != where ? new AndExpression(where, new Parenthesis(expression)) : expression;
    }

    /**
@@ -122,12 +115,12 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
     * </p>
     *
     * @param dataPermission 数据权限
-     * @param userContext    用户上下文
+     * @param currentUser    当前用户
     * @param expression     处理前的表达式
     * @return 处理完后的表达式
     */
    private Expression buildDeptAndChildExpression(DataPermission dataPermission,
-                                                   UserContext userContext,
+                                                   DataPermissionCurrentUser currentUser,
                                                   Expression expression) {
        ParenthesedSelect subSelect = new ParenthesedSelect();
        PlainSelect select = new PlainSelect();
@@ -135,10 +128,10 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
        select.setFromItem(new Table(dataPermission.deptTableAlias()));
        EqualsTo equalsTo = new EqualsTo();
        equalsTo.setLeftExpression(new Column(dataPermission.id()));
-        equalsTo.setRightExpression(new LongValue(userContext.getDeptId()));
+        equalsTo.setRightExpression(new LongValue(currentUser.getDeptId()));
        Function function = new Function();
        function.setName("find_in_set");
-        function.setParameters(new ExpressionList<>(new LongValue(userContext.getDeptId()), new Column("ancestors")));
+        function.setParameters(new ExpressionList(new LongValue(currentUser.getDeptId()), new Column("ancestors")));
        select.setWhere(new OrExpression(equalsTo, function));
        subSelect.setSelect(select);
        // 构建父查询
@@ -156,16 +149,16 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
     * </p>
     *
     * @param dataPermission 数据权限
-     * @param userContext    用户上下文
+     * @param currentUser    当前用户
     * @param expression     处理前的表达式
     * @return 处理完后的表达式
     */
    private Expression buildDeptExpression(DataPermission dataPermission,
-                                           UserContext userContext,
+                                           DataPermissionCurrentUser currentUser,
                                           Expression expression) {
        EqualsTo equalsTo = new EqualsTo();
        equalsTo.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.deptId()));
-        equalsTo.setRightExpression(new LongValue(userContext.getDeptId()));
+        equalsTo.setRightExpression(new LongValue(currentUser.getDeptId()));
        return null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
    }

@@ -177,16 +170,16 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
     * </p>
     *
     * @param dataPermission 数据权限
-     * @param userContext    用户上下文
+     * @param currentUser    当前用户
     * @param expression     处理前的表达式
     * @return 处理完后的表达式
     */
    private Expression buildSelfExpression(DataPermission dataPermission,
-                                           UserContext userContext,
+                                           DataPermissionCurrentUser currentUser,
                                           Expression expression) {
        EqualsTo equalsTo = new EqualsTo();
        equalsTo.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.userId()));
-        equalsTo.setRightExpression(new LongValue(userContext.getUserId()));
+        equalsTo.setRightExpression(new LongValue(currentUser.getUserId()));
        return null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
    }

@@ -199,12 +192,12 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
     * </p>
     *
     * @param dataPermission 数据权限
-     * @param roleContext    角色上下文
+     * @param role           当前用户角色
     * @param expression     处理前的表达式
     * @return 处理完后的表达式
     */
    private Expression buildCustomExpression(DataPermission dataPermission,
-                                             RoleContext roleContext,
+                                             DataPermissionCurrentUser.CurrentUserRole role,
                                             Expression expression) {
        ParenthesedSelect subSelect = new ParenthesedSelect();
        PlainSelect select = new PlainSelect();
@@ -212,7 +205,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
        select.setFromItem(new Table(dataPermission.roleDeptTableAlias()));
        EqualsTo equalsTo = new EqualsTo();
        equalsTo.setLeftExpression(new Column(dataPermission.roleId()));
-        equalsTo.setRightExpression(new LongValue(roleContext.getRoleId()));
+        equalsTo.setRightExpression(new LongValue(role.getRoleId()));
        select.setWhere(equalsTo);
        subSelect.setSelect(select);
        // 构建父查询
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/enums/DataScope.java
+++ b/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.extension.datapermission.enums;
+package top.continew.starter.data.mybatis.plus.datapermission;

 /**
 * 数据权限枚举
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.enums;
+package top.continew.starter.data.mybatis.plus.enums;

 /**
 * MyBatis ID 生成器类型枚举
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/handler/MybatisBaseEnumTypeHandler.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/handler/MybatisBaseEnumTypeHandler.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.handler;
+package top.continew.starter.data.mybatis.plus.handler;

 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.baomidou.mybatisplus.annotation.IEnum;
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/IService.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/IService.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.service;
+package top.continew.starter.data.mybatis.plus.service;

 /**
 * 通用业务接口
@@ -23,4 +23,5 @@ 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> {
+}
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java
@@ -14,13 +14,13 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.service.impl;
+package top.continew.starter.data.mybatis.plus.service.impl;

 import cn.hutool.core.util.ClassUtil;
 import top.continew.starter.core.util.ReflectUtils;
 import top.continew.starter.core.util.validate.CheckUtils;
-import top.continew.starter.data.mp.base.BaseMapper;
-import top.continew.starter.data.mp.service.IService;
+import top.continew.starter.data.mybatis.plus.base.BaseMapper;
+import top.continew.starter.data.mybatis.plus.service.IService;

 import java.io.Serializable;
 import java.lang.reflect.Field;
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/util/QueryWrapperHelper.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/util/QueryWrapperHelper.java
@@ -14,15 +14,15 @@
 * limitations under the License.
 */

-package top.continew.starter.data.mp.util;
+package top.continew.starter.data.mybatis.plus.util;

-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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import cn.hutool.core.collection.CollUtil;
+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.springframework.data.domain.Sort;
 import top.continew.starter.core.exception.BadRequestException;
 import top.continew.starter.core.util.ReflectUtils;
@@ -33,10 +33,7 @@ import top.continew.starter.data.core.enums.QueryType;
 import top.continew.starter.data.core.util.SqlInjectionUtils;

 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.function.Consumer;

 /**
@@ -137,7 +134,7 @@ public class QueryWrapperHelper {
            }
            // 设置了 @QueryIgnore 注解，直接忽略
            QueryIgnore queryIgnoreAnnotation = field.getAnnotation(QueryIgnore.class);
-            if (null != queryIgnoreAnnotation) {
+            if (null != queryIgnoreAnnotation && queryIgnoreAnnotation.value()) {
                return Collections.emptyList();
            }
            // 建议：数据库表列建议采用下划线连接法命名，程序变量建议采用驼峰法命名
@@ -193,9 +190,7 @@ public class QueryWrapperHelper {
            case LT -> consumers.add(q -> q.lt(columnName, fieldValue));
            case LE -> consumers.add(q -> q.le(columnName, fieldValue));
            case BETWEEN -> {
-                List<Object> between = new ArrayList<>(ArrayUtil.isArray(fieldValue)
-                    ? CollUtil.toList(fieldValue)
-                    : (List<Object>)fieldValue);
+                List<Object> between = new ArrayList<>((List<Object>)fieldValue);
                ValidationUtils.throwIf(between.size() != 2, "[{}] 必须是一个范围", columnName);
                consumers.add(q -> q.between(columnName, between.get(0), between.get(1)));
            }
@@ -204,15 +199,11 @@ public class QueryWrapperHelper {
            case LIKE_RIGHT -> consumers.add(q -> q.likeRight(columnName, fieldValue));
            case IN -> {
                ValidationUtils.throwIfEmpty(fieldValue, "[{}] 不能为空", columnName);
-                consumers.add(q -> q.in(columnName, ArrayUtil.isArray(fieldValue)
-                    ? CollUtil.toList(fieldValue)
-                    : (Collection<Object>)fieldValue));
+                consumers.add(q -> q.in(columnName, (Collection<Object>)fieldValue));
            }
            case NOT_IN -> {
                ValidationUtils.throwIfEmpty(fieldValue, "[{}] 不能为空", columnName);
-                consumers.add(q -> q.notIn(columnName, ArrayUtil.isArray(fieldValue)
-                    ? CollUtil.toList(fieldValue)
-                    : (Collection<Object>)fieldValue));
+                consumers.add(q -> q.notIn(columnName, (Collection<Object>)fieldValue));
            }
            case IS_NULL -> consumers.add(q -> q.isNull(columnName));
            case IS_NOT_NULL -> consumers.add(q -> q.isNotNull(columnName));
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+top.continew.starter.data.mybatis.plus.autoconfigure.MybatisPlusAutoConfiguration
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/default-data-mybatis-plus.yml
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/default-data-mybatis-plus.yml
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/spy.properties
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/spy.properties
--- a/continew-starter-data/pom.xml
+++ b/continew-starter-data/pom.xml
@@ -15,8 +15,8 @@

    <modules>
        <module>continew-starter-data-core</module>
-        <module>continew-starter-data-mp</module>
-        <module>continew-starter-data-mf</module>
+        <module>continew-starter-data-mybatis-plus</module>
+        <module>continew-starter-data-mybatis-flex</module>
    </modules>

    <dependencies>
--- a/continew-starter-dependencies/pom.xml
+++ b/continew-starter-dependencies/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.2.10</version>
+        <version>3.2.7</version>
        <relativePath/>
    </parent>

@@ -43,33 +43,33 @@

    <properties>
        <!-- 项目版本号 -->
-        <revision>2.7.2</revision>
-        <snail-job.version>1.1.2</snail-job.version>
-        <sa-token.version>1.39.0</sa-token.version>
+        <revision>2.5.2</revision>
+        <snail-job.version>1.1.0</snail-job.version>
+        <sa-token.version>1.38.0</sa-token.version>
        <just-auth.version>1.16.6</just-auth.version>
-        <mybatis-plus.version>3.5.8</mybatis-plus.version>
-        <mybatis-flex.version>1.9.7</mybatis-flex.version>
+        <mybatis-plus.version>3.5.7</mybatis-plus.version>
+        <mybatis-flex.version>1.9.3</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.36.0</redisson.version>
-        <cosid.version>2.9.8</cosid.version>
-        <sms4j.version>3.3.3</sms4j.version>
+        <redisson.version>3.32.0</redisson.version>
+        <cosid.version>2.9.1</cosid.version>
+        <sms4j.version>3.2.1</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.1</x-file-storage.version>
-        <aws-s3.version>1.12.771</aws-s3.version>
-        <graceful-response.version>5.0.0-boot3</graceful-response.version>
+        <x-file-storage.version>2.2.0</x-file-storage.version>
+        <aws-s3.version>1.12.761</aws-s3.version>
+        <graceful-response.version>4.0.1-boot3</graceful-response.version>
        <crane4j.version>2.9.0</crane4j.version>
        <knife4j.version>4.5.0</knife4j.version>
        <tlog.version>1.5.2</tlog.version>
-        <snakeyaml.version>2.3</snakeyaml.version>
+        <snakeyaml.version>2.2</snakeyaml.version>
        <okhttp.version>4.12.0</okhttp.version>
        <ttl.version>2.14.5</ttl.version>
        <ip2region.version>3.2.6</ip2region.version>
-        <hutool.version>5.8.32</hutool.version>
+        <hutool.version>5.8.29</hutool.version>
        <!-- Maven Plugin Versions -->
        <flatten.version>1.6.0</flatten.version>
        <spotless.version>2.43.0</spotless.version>
@@ -137,11 +137,6 @@
                <artifactId>mybatis-plus-core</artifactId>
                <version>${mybatis-plus.version}</version>
            </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-extension</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>

            <!-- MyBatis Flex（MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率） -->
            <dependency>
@@ -346,12 +341,14 @@
                <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>
@@ -359,32 +356,6 @@
                <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>
@@ -402,14 +373,14 @@
            <!-- 数据访问模块 - MyBatis Plus -->
            <dependency>
                <groupId>top.continew</groupId>
-                <artifactId>continew-starter-data-mp</artifactId>
+                <artifactId>continew-starter-data-mybatis-plus</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- 数据访问模块 - MyBatis Flex -->
            <dependency>
                <groupId>top.continew</groupId>
-                <artifactId>continew-starter-data-mf</artifactId>
+                <artifactId>continew-starter-data-mybatis-flex</artifactId>
                <version>${revision}</version>
            </dependency>

--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml
@@ -53,11 +53,5 @@
            <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>
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/DictField.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/DictField.java
@@ -42,11 +42,4 @@ public @interface DictField {
     * @return 值字段名
     */
    String valueKey() default "id";
-
-    /**
-     * 额外信息字段名
-     *
-     * @return 额外信息字段名
-     */
-    String[] extraKeys() default {};
 }
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/EnableCrudRestController.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/EnableCrudRestController.java
@@ -31,4 +31,5 @@ import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Import({CrudRestControllerAutoConfiguration.class})
-public @interface EnableCrudRestController {}
+public @interface EnableCrudRestController {
+}
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/TreeField.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/TreeField.java
@@ -71,11 +71,4 @@ public @interface TreeField {
     * @return 递归深度
     */
    int deep() default -1;
-
-    /**
-     * 根节点 ID
-     *
-     * @return 根节点 ID
-     */
-    long rootId() default 0L;
 }
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudProperties.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudProperties.java
@@ -1,45 +0,0 @@
-/*
- * 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.crud.autoconfigure;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import top.continew.starter.core.constant.PropertiesConstants;
-
-/**
- * CRUD 配置属性
- *
- * @author Charles7c
- * @since 2.7.2
- */
-@ConfigurationProperties(PropertiesConstants.CRUD)
-public class CrudProperties {
-
-    /**
-     * 树配置
-     */
-    @NestedConfigurationProperty
-    private CrudTreeProperties tree = new CrudTreeProperties();
-
-    public CrudTreeProperties getTree() {
-        return tree;
-    }
-
-    public void setTree(CrudTreeProperties tree) {
-        this.tree = tree;
-    }
-}
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java
@@ -20,7 +20,6 @@ import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -37,7 +36,6 @@ import org.springframework.web.servlet.resource.ResourceUrlProvider;
 * @since 1.0.0
 */
@Configuration
-@EnableConfigurationProperties(CrudProperties.class)
 public class CrudRestControllerAutoConfiguration extends DelegatingWebMvcConfiguration {

    private static final Logger log = LoggerFactory.getLogger(CrudRestControllerAutoConfiguration.class);
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudTreeProperties.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudTreeProperties.java
@@ -1,155 +0,0 @@
-/*
- * 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.crud.autoconfigure;
-
-import cn.hutool.core.lang.tree.TreeNodeConfig;
-import top.continew.starter.core.util.validate.CheckUtils;
-import top.continew.starter.extension.crud.annotation.TreeField;
-
-/**
- * CRUD 树列表配置属性
- *
- * @author Charles7c
- * @since 2.7.2
- */
-public class CrudTreeProperties {
-
-    /**
-     * ID 字段名
-     */
-    private String idKey = "id";
-
-    /**
-     * 父 ID 字段名
-     *
-     */
-    private String parentIdKey = "parentId";
-
-    /**
-     * 名称字段名
-     *
-     */
-    private String nameKey = "name";
-
-    /**
-     * 排序字段名
-     *
-     */
-    private String weightKey = "weight";
-
-    /**
-     * 子列表字段名
-     *
-     */
-    private String childrenKey = "children";
-
-    /**
-     * 递归深度（< 0 不限制）
-     */
-    private Integer deep = -1;
-
-    /**
-     * 根节点 ID
-     */
-    private Long rootId = 0L;
-
-    public String getIdKey() {
-        return idKey;
-    }
-
-    public void setIdKey(String idKey) {
-        this.idKey = idKey;
-    }
-
-    public String getParentIdKey() {
-        return parentIdKey;
-    }
-
-    public void setParentIdKey(String parentIdKey) {
-        this.parentIdKey = parentIdKey;
-    }
-
-    public String getNameKey() {
-        return nameKey;
-    }
-
-    public void setNameKey(String nameKey) {
-        this.nameKey = nameKey;
-    }
-
-    public String getWeightKey() {
-        return weightKey;
-    }
-
-    public void setWeightKey(String weightKey) {
-        this.weightKey = weightKey;
-    }
-
-    public String getChildrenKey() {
-        return childrenKey;
-    }
-
-    public void setChildrenKey(String childrenKey) {
-        this.childrenKey = childrenKey;
-    }
-
-    public Integer getDeep() {
-        return deep;
-    }
-
-    public void setDeep(Integer deep) {
-        this.deep = deep;
-    }
-
-    public Long getRootId() {
-        return rootId;
-    }
-
-    public void setRootId(Long rootId) {
-        this.rootId = rootId;
-    }
-
-    /**
-     * 生成 {@link TreeNodeConfig} 对象
-     *
-     * @return {@link TreeNodeConfig} 对象
-     */
-    public TreeNodeConfig genTreeNodeConfig() {
-        return TreeNodeConfig.DEFAULT_CONFIG.setIdKey(idKey)
-            .setParentIdKey(parentIdKey)
-            .setNameKey(nameKey)
-            .setWeightKey(weightKey)
-            .setChildrenKey(childrenKey)
-            .setDeep(deep < 0 ? null : deep);
-    }
-
-    /**
-     * 根据 @TreeField 配置生成树结构配置
-     *
-     * @param treeField 树结构字段注解
-     * @return 树结构配置
-     */
-    public TreeNodeConfig genTreeNodeConfig(TreeField treeField) {
-        CheckUtils.throwIfNull(treeField, "请添加并配置 @TreeField 树结构信息");
-        return new TreeNodeConfig().setIdKey(treeField.value())
-            .setParentIdKey(treeField.parentIdKey())
-            .setNameKey(treeField.nameKey())
-            .setWeightKey(treeField.weightKey())
-            .setChildrenKey(treeField.childrenKey())
-            .setDeep(treeField.deep() < 0 ? null : treeField.deep());
-    }
-}
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/enums/Api.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/enums/Api.java
@@ -28,42 +28,34 @@ public enum Api {
     * 所有 API
     */
    ALL,
-
    /**
     * 分页
     */
    PAGE,
-
-    /**
-     * 列表
-     */
-    LIST,
-
    /**
     * 树列表
     */
    TREE,
-
+    /**
+     * 列表
+     */
+    LIST,
    /**
     * 详情
     */
    GET,
-
    /**
     * 新增
     */
    ADD,
-
    /**
     * 修改
     */
    UPDATE,
-
    /**
     * 删除
     */
    DELETE,
-
    /**
     * 导出
     */
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java
@@ -16,6 +16,7 @@

 package top.continew.starter.extension.crud.model.query;

+import cn.hutool.core.net.URLDecoder;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ArrayUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -26,6 +27,7 @@ import top.continew.starter.data.core.util.SqlInjectionUtils;

 import java.io.Serial;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;

@@ -58,7 +60,7 @@ public class SortQuery implements Serializable {
        }
        ValidationUtils.throwIf(sort.length < 2, "排序条件非法");
        List<Sort.Order> orders = new ArrayList<>(sort.length);
-        if (CharSequenceUtil.contains(sort[0], StringConstants.COMMA)) {
+        if (CharSequenceUtil.contains(sort[0], URLDecoder.decode(StringConstants.COMMA, StandardCharsets.UTF_8))) {
            // e.g "sort=createTime,desc&sort=name,asc"
            for (String s : sort) {
                List<String> sortList = CharSequenceUtil.splitTrim(s, StringConstants.COMMA);
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/resp/LabelValueResp.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/resp/LabelValueResp.java
@@ -54,11 +54,11 @@ public class LabelValueResp<T> implements Serializable {
    private Boolean disabled;

    /**
-     * 额外数据
+     * 扩展
     */
-    @Schema(description = "额外数据")
+    @Schema(description = "扩展")
    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private Object extra;
+    private Object extend;

    public LabelValueResp() {
    }
@@ -68,10 +68,10 @@ public class LabelValueResp<T> implements Serializable {
        this.value = value;
    }

-    public LabelValueResp(String label, T value, Object extra) {
+    public LabelValueResp(String label, T value, Object extend) {
        this.label = label;
        this.value = value;
-        this.extra = extra;
+        this.extend = extend;
    }

    public LabelValueResp(String label, T value, Boolean disabled) {
@@ -104,11 +104,11 @@ public class LabelValueResp<T> implements Serializable {
        this.disabled = disabled;
    }

-    public Object getExtra() {
-        return extra;
+    public Object getExtend() {
+        return extend;
    }

-    public void setExtra(Object extra) {
-        this.extra = extra;
+    public void setExtend(Object extend) {
+        this.extend = extend;
    }
 }
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/TreeUtils.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/TreeUtils.java
@@ -0,0 +1,95 @@
+/*
+ * 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.crud.util;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNodeConfig;
+import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.lang.tree.parser.NodeParser;
+import cn.hutool.core.util.ReflectUtil;
+import top.continew.starter.core.util.validate.CheckUtils;
+import top.continew.starter.extension.crud.annotation.TreeField;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 树工具类
+ *
+ * @author Charles7c
+ * @since 1.0.0
+ */
+public class TreeUtils {
+
+    /**
+     * 默认字段配置对象（根据前端树结构灵活调整名称）
+     */
+    public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("title")
+        .setIdKey("key")
+        .setWeightKey("sort");
+
+    private TreeUtils() {
+    }
+
+    /**
+     * 树构建
+     *
+     * @param <T>        转换的实体 为数据源里的对象类型
+     * @param <E>        ID类型
+     * @param list       源数据集合
+     * @param nodeParser 转换器
+     * @return List 树列表
+     */
+    public static <T, E> List<Tree<E>> build(List<T> list, NodeParser<T, E> nodeParser) {
+        return build(list, DEFAULT_CONFIG, nodeParser);
+    }
+
+    /**
+     * 树构建
+     *
+     * @param <T>            转换的实体 为数据源里的对象类型
+     * @param <E>            ID类型
+     * @param list           源数据集合
+     * @param treeNodeConfig 配置
+     * @param nodeParser     转换器
+     * @return List 树列表
+     */
+    public static <T, E> List<Tree<E>> build(List<T> list, TreeNodeConfig treeNodeConfig, NodeParser<T, E> nodeParser) {
+        if (CollUtil.isEmpty(list)) {
+            return new ArrayList<>(0);
+        }
+        E parentId = (E)ReflectUtil.getFieldValue(list.get(0), treeNodeConfig.getParentIdKey());
+        return TreeUtil.build(list, parentId, treeNodeConfig, nodeParser);
+    }
+
+    /**
+     * 根据 @TreeField 配置生成树结构配置
+     *
+     * @param treeField 树结构字段注解
+     * @return 树结构配置
+     */
+    public static TreeNodeConfig genTreeNodeConfig(TreeField treeField) {
+        CheckUtils.throwIfNull(treeField, "请添加并配置 @TreeField 树结构信息");
+        return new TreeNodeConfig().setIdKey(treeField.value())
+            .setParentIdKey(treeField.parentIdKey())
+            .setNameKey(treeField.nameKey())
+            .setWeightKey(treeField.weightKey())
+            .setChildrenKey(treeField.childrenKey())
+            .setDeep(treeField.deep() < 0 ? null : treeField.deep());
+    }
+}
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java
@@ -33,11 +33,13 @@ public interface ValidateGroup extends Default {
        /**
         * 分组校验-创建
         */
-        interface Add extends Crud {}
+        interface Add extends Crud {
+        }

        /**
         * 分组校验-修改
         */
-        interface Update extends Crud {}
+        interface Update extends Crud {
+        }
    }
 }
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/pom.xml
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/pom.xml
@@ -22,7 +22,7 @@
        <!-- 数据访问模块 - MyBatis Flex -->
        <dependency>
            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-data-mf</artifactId>
+            <artifactId>continew-starter-data-mybatis-flex</artifactId>
        </dependency>
    </dependencies>
 </project>
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java
@@ -71,21 +71,6 @@ public abstract class BaseController<S extends BaseService<L, D, Q, C>, L, D, Q,
        return baseService.page(query, pageQuery);
    }

-    /**
-     * 查询列表
-     *
-     * @param query     查询条件
-     * @param sortQuery 排序查询条件
-     * @return 列表信息
-     */
-    @Operation(summary = "查询列表", description = "查询列表")
-    @ResponseBody
-    @GetMapping("/list")
-    public List<L> list(Q query, SortQuery sortQuery) {
-        this.checkPermission(Api.LIST);
-        return baseService.list(query, sortQuery);
-    }
-
    /**
     * 查询树列表
     *
@@ -101,6 +86,21 @@ public abstract class BaseController<S extends BaseService<L, D, Q, C>, L, D, Q,
        return baseService.tree(query, sortQuery, false);
    }

+    /**
+     * 查询列表
+     *
+     * @param query     查询条件
+     * @param sortQuery 排序查询条件
+     * @return 列表信息
+     */
+    @Operation(summary = "查询列表", description = "查询列表")
+    @ResponseBody
+    @GetMapping("/list")
+    public List<L> list(Q query, SortQuery sortQuery) {
+        this.checkPermission(Api.LIST);
+        return baseService.list(query, sortQuery);
+    }
+
    /**
     * 查询详情
     *
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseService.java
+++ b/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.PageQuery;
 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.resp.LabelValueResp;
 import top.continew.starter.extension.crud.model.resp.PageResp;

@@ -46,6 +46,16 @@ public interface BaseService<L, D, Q, C> {
     */
    PageResp<L> page(Q query, PageQuery pageQuery);

+    /**
+     * 查询树列表
+     *
+     * @param query     查询条件
+     * @param sortQuery 排序查询条件
+     * @param isSimple  是否为简单树结构（不包含基本树结构之外的扩展字段）
+     * @return 树列表信息
+     */
+    List<Tree<Long>> tree(Q query, SortQuery sortQuery, boolean isSimple);
+
    /**
     * 查询列表
     *
@@ -55,20 +65,6 @@ public interface BaseService<L, D, Q, C> {
     */
    List<L> list(Q query, SortQuery sortQuery);

-    /**
-     * 查询树列表
-     * <p>
-     * 虽然提供了查询条件，但不建议使用，容易因缺失根节点导致树节点丢失。
-     * 建议在前端进行查询过滤，如需使用建议重写方法。
-     * </p>
-     *
-     * @param query     查询条件
-     * @param sortQuery 排序查询条件
-     * @param isSimple  是否为简单树结构（不包含基本树结构之外的扩展字段，简单树（下拉列表）使用全局配置结构，复杂树（表格）使用 @DictField 局部配置）
-     * @return 树列表信息
-     */
-    List<Tree<Long>> tree(Q query, SortQuery sortQuery, boolean isSimple);
-
    /**
     * 查看详情
     *
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java
@@ -20,32 +20,30 @@ import cn.crane4j.core.support.OperateTemplate;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Opt;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
-import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.servlet.http.HttpServletResponse;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.data.domain.Sort;
 import org.springframework.transaction.annotation.Transactional;
 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.service.impl.ServiceImpl;
-import top.continew.starter.data.mf.util.QueryWrapperHelper;
+import top.continew.starter.data.mybatis.flex.base.BaseMapper;
+import top.continew.starter.data.mybatis.flex.util.QueryWrapperHelper;
+import top.continew.starter.data.mybatis.flex.service.impl.ServiceImpl;
 import top.continew.starter.extension.crud.annotation.TreeField;
-import top.continew.starter.extension.crud.autoconfigure.CrudProperties;
-import top.continew.starter.extension.crud.autoconfigure.CrudTreeProperties;
-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;
@@ -82,39 +80,26 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseIdD
        return pageResp;
    }

-    @Override
-    public List<L> list(Q query, SortQuery sortQuery) {
-        List<L> list = this.list(query, sortQuery, listClass);
-        list.forEach(this::fill);
-        return list;
-    }
-
    @Override
    public List<Tree<Long>> tree(Q query, SortQuery sortQuery, boolean isSimple) {
        List<L> list = this.list(query, sortQuery);
        if (CollUtil.isEmpty(list)) {
            return new ArrayList<>(0);
        }
-        CrudProperties crudProperties = SpringUtil.getBean(CrudProperties.class);
-        CrudTreeProperties treeProperties = crudProperties.getTree();
+        // 如果构建简单树结构，则不包含基本树结构之外的扩展字段
+        TreeNodeConfig treeNodeConfig = TreeUtils.DEFAULT_CONFIG;
        TreeField treeField = listClass.getDeclaredAnnotation(TreeField.class);
-        TreeNodeConfig treeNodeConfig;
-        Long rootId;
-        // 简单树（下拉列表）使用全局配置结构，复杂树（表格）使用局部配置
-        if (isSimple) {
-            treeNodeConfig = treeProperties.genTreeNodeConfig();
-            rootId = treeProperties.getRootId();
-        } else {
-            treeNodeConfig = treeProperties.genTreeNodeConfig(treeField);
-            rootId = treeField.rootId();
+        if (!isSimple) {
+            // 根据 @TreeField 配置生成树结构配置
+            treeNodeConfig = TreeUtils.genTreeNodeConfig(treeField);
        }
        // 构建树
-        return TreeUtil.build(list, rootId, treeNodeConfig, (node, tree) -> {
+        return TreeUtils.build(list, treeNodeConfig, (node, tree) -> {
+            // 转换器
            tree.setId(ReflectUtil.invoke(node, CharSequenceUtil.genGetter(treeField.value())));
            tree.setParentId(ReflectUtil.invoke(node, CharSequenceUtil.genGetter(treeField.parentIdKey())));
            tree.setName(ReflectUtil.invoke(node, CharSequenceUtil.genGetter(treeField.nameKey())));
            tree.setWeight(ReflectUtil.invoke(node, CharSequenceUtil.genGetter(treeField.weightKey())));
-            // 如果构建简单树结构，则不包含扩展字段
            if (!isSimple) {
                List<Field> fieldList = ReflectUtils.getNonStaticFields(listClass);
                fieldList.removeIf(f -> CharSequenceUtil.equalsAnyIgnoreCase(f.getName(), treeField.value(), treeField
@@ -125,6 +110,13 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseIdD
        });
    }

+    @Override
+    public List<L> list(Q query, SortQuery sortQuery) {
+        List<L> list = this.list(query, sortQuery, listClass);
+        list.forEach(this::fill);
+        return list;
+    }
+
    @Override
    public D get(Long id) {
        T entity = super.getById(id);
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/pom.xml
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/pom.xml
@@ -22,7 +22,7 @@
        <!-- 数据访问模块 - MyBatis Plus -->
        <dependency>
            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-data-mp</artifactId>
+            <artifactId>continew-starter-data-mybatis-plus</artifactId>
        </dependency>
    </dependencies>
 </project>
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java
+++ b/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;

@@ -71,21 +71,6 @@ public abstract class BaseController<S extends BaseService<L, D, Q, C>, L, D, Q,
        return baseService.page(query, pageQuery);
    }

-    /**
-     * 查询列表
-     *
-     * @param query     查询条件
-     * @param sortQuery 排序查询条件
-     * @return 列表信息
-     */
-    @Operation(summary = "查询列表", description = "查询列表")
-    @ResponseBody
-    @GetMapping("/list")
-    public List<L> list(Q query, SortQuery sortQuery) {
-        this.checkPermission(Api.LIST);
-        return baseService.list(query, sortQuery);
-    }
-
    /**
     * 查询树列表
     *
@@ -101,6 +86,21 @@ public abstract class BaseController<S extends BaseService<L, D, Q, C>, L, D, Q,
        return baseService.tree(query, sortQuery, false);
    }

+    /**
+     * 查询列表
+     *
+     * @param query     查询条件
+     * @param sortQuery 排序查询条件
+     * @return 列表信息
+     */
+    @Operation(summary = "查询列表", description = "查询列表")
+    @ResponseBody
+    @GetMapping("/list")
+    public List<L> list(Q query, SortQuery sortQuery) {
+        this.checkPermission(Api.LIST);
+        return baseService.list(query, sortQuery);
+    }
+
    /**
     * 查询详情
     *
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseService.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseService.java
@@ -46,6 +46,16 @@ public interface BaseService<L, D, Q, C> {
     */
    PageResp<L> page(Q query, PageQuery pageQuery);

+    /**
+     * 查询树列表
+     *
+     * @param query     查询条件
+     * @param sortQuery 排序查询条件
+     * @param isSimple  是否为简单树结构（不包含基本树结构之外的扩展字段）
+     * @return 树列表信息
+     */
+    List<Tree<Long>> tree(Q query, SortQuery sortQuery, boolean isSimple);
+
    /**
     * 查询列表
     *
@@ -55,20 +65,6 @@ public interface BaseService<L, D, Q, C> {
     */
    List<L> list(Q query, SortQuery sortQuery);

-    /**
-     * 查询树列表
-     * <p>
-     * 虽然提供了查询条件，但不建议使用，容易因缺失根节点导致树节点丢失。
-     * 建议在前端进行查询过滤，如需使用建议重写方法。
-     * </p>
-     *
-     * @param query     查询条件
-     * @param sortQuery 排序查询条件
-     * @param isSimple  是否为简单树结构（不包含基本树结构之外的扩展字段，简单树（下拉列表）使用全局配置结构，复杂树（表格）使用 @DictField 局部配置）
-     * @return 树列表信息
-     */
-    List<Tree<Long>> tree(Q query, SortQuery sortQuery, boolean isSimple);
-
    /**
     * 查询详情
     *
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java
@@ -20,10 +20,8 @@ import cn.crane4j.core.support.OperateTemplate;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
-import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ReflectUtil;
@@ -39,23 +37,25 @@ import top.continew.starter.core.util.ClassUtils;
 import top.continew.starter.core.util.ReflectUtils;
 import top.continew.starter.core.util.validate.CheckUtils;
 import top.continew.starter.core.util.validate.ValidationUtils;
-import top.continew.starter.data.mp.base.BaseMapper;
-import top.continew.starter.data.mp.service.impl.ServiceImpl;
-import top.continew.starter.data.mp.util.QueryWrapperHelper;
+import top.continew.starter.data.mybatis.plus.base.BaseMapper;
+import top.continew.starter.data.mybatis.plus.service.impl.ServiceImpl;
+import top.continew.starter.data.mybatis.plus.util.QueryWrapperHelper;
 import top.continew.starter.extension.crud.annotation.DictField;
 import top.continew.starter.extension.crud.annotation.TreeField;
-import top.continew.starter.extension.crud.autoconfigure.CrudProperties;
-import top.continew.starter.extension.crud.autoconfigure.CrudTreeProperties;
 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.LabelValueResp;
 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.file.excel.util.ExcelUtils;

 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;

 /**
 * 业务实现基类
@@ -86,41 +86,28 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseIdD
        return pageResp;
    }

-    @Override
-    public List<L> list(Q query, SortQuery sortQuery) {
-        List<L> list = this.list(query, sortQuery, this.getListClass());
-        list.forEach(this::fill);
-        return list;
-    }
-
    @Override
    public List<Tree<Long>> tree(Q query, SortQuery sortQuery, boolean isSimple) {
        List<L> list = this.list(query, sortQuery);
        if (CollUtil.isEmpty(list)) {
            return new ArrayList<>(0);
        }
-        CrudProperties crudProperties = SpringUtil.getBean(CrudProperties.class);
-        CrudTreeProperties treeProperties = crudProperties.getTree();
-        TreeField treeField = listClass.getDeclaredAnnotation(TreeField.class);
-        TreeNodeConfig treeNodeConfig;
-        Long rootId;
-        // 简单树（下拉列表）使用全局配置结构，复杂树（表格）使用局部配置
-        if (isSimple) {
-            treeNodeConfig = treeProperties.genTreeNodeConfig();
-            rootId = treeProperties.getRootId();
-        } else {
-            treeNodeConfig = treeProperties.genTreeNodeConfig(treeField);
-            rootId = treeField.rootId();
+        // 如果构建简单树结构，则不包含基本树结构之外的扩展字段
+        TreeNodeConfig treeNodeConfig = TreeUtils.DEFAULT_CONFIG;
+        TreeField treeField = this.getListClass().getDeclaredAnnotation(TreeField.class);
+        if (!isSimple) {
+            // 根据 @TreeField 配置生成树结构配置
+            treeNodeConfig = TreeUtils.genTreeNodeConfig(treeField);
        }
        // 构建树
-        return TreeUtil.build(list, rootId, treeNodeConfig, (node, tree) -> {
+        return TreeUtils.build(list, treeNodeConfig, (node, tree) -> {
+            // 转换器
            tree.setId(ReflectUtil.invoke(node, CharSequenceUtil.genGetter(treeField.value())));
            tree.setParentId(ReflectUtil.invoke(node, CharSequenceUtil.genGetter(treeField.parentIdKey())));
            tree.setName(ReflectUtil.invoke(node, CharSequenceUtil.genGetter(treeField.nameKey())));
            tree.setWeight(ReflectUtil.invoke(node, CharSequenceUtil.genGetter(treeField.weightKey())));
-            // 如果构建简单树结构，则不包含扩展字段
            if (!isSimple) {
-                List<Field> fieldList = ReflectUtils.getNonStaticFields(listClass);
+                List<Field> fieldList = ReflectUtils.getNonStaticFields(this.getListClass());
                fieldList.removeIf(f -> CharSequenceUtil.equalsAnyIgnoreCase(f.getName(), treeField.value(), treeField
                    .parentIdKey(), treeField.nameKey(), treeField.weightKey(), treeField.childrenKey()));
                fieldList.forEach(f -> tree.putExtra(f.getName(), ReflectUtil.invoke(node, CharSequenceUtil.genGetter(f
@@ -129,6 +116,13 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseIdD
        });
    }

+    @Override
+    public List<L> list(Q query, SortQuery sortQuery) {
+        List<L> list = this.list(query, sortQuery, this.getListClass());
+        list.forEach(this::fill);
+        return list;
+    }
+
    @Override
    public D get(Long id) {
        T entity = super.getById(id, false);
@@ -139,40 +133,19 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseIdD

    @Override
    public List<LabelValueResp> listDict(Q query, SortQuery sortQuery) {
+        QueryWrapper<T> queryWrapper = this.buildQueryWrapper(query);
+        this.sort(queryWrapper, sortQuery);
        DictField dictField = super.getEntityClass().getDeclaredAnnotation(DictField.class);
        CheckUtils.throwIfNull(dictField, "请添加并配置 @DictField 字典结构信息");
-        List<L> list = this.list(query, sortQuery);
+        // 指定查询字典字段
+        queryWrapper.select(dictField.labelKey(), dictField.valueKey());
+        List<T> entityList = baseMapper.selectList(queryWrapper);
        // 解析映射
-        List<LabelValueResp> respList = new ArrayList<>(list.size());
-        String labelKey = dictField.labelKey().contains(StringConstants.DOT)
-            ? CharSequenceUtil.subAfter(dictField.labelKey(), StringConstants.DOT, true)
-            : dictField.labelKey();
-        String valueKey = dictField.valueKey().contains(StringConstants.DOT)
-            ? CharSequenceUtil.subAfter(dictField.valueKey(), StringConstants.DOT, true)
-            : dictField.valueKey();
-        List<String> extraFieldNames = Arrays.stream(dictField.extraKeys())
-            .map(extraKey -> extraKey.contains(StringConstants.DOT)
-                ? CharSequenceUtil.subAfter(extraKey, StringConstants.DOT, true)
-                : extraKey)
-            .map(CharSequenceUtil::toCamelCase)
-            .toList();
-        for (L entity : list) {
-            LabelValueResp<Object> labelValueResp = new LabelValueResp<>();
-            labelValueResp.setLabel(Convert.toStr(ReflectUtil.getFieldValue(entity, CharSequenceUtil
-                .toCamelCase(labelKey))));
-            labelValueResp.setValue(ReflectUtil.getFieldValue(entity, CharSequenceUtil.toCamelCase(valueKey)));
-            respList.add(labelValueResp);
-            if (CollUtil.isEmpty(extraFieldNames)) {
-                continue;
-            }
-            // 额外数据
-            Map<String, Object> extraMap = MapUtil.newHashMap(dictField.extraKeys().length);
-            for (String extraFieldName : extraFieldNames) {
-                extraMap.put(extraFieldName, ReflectUtil.getFieldValue(entity, extraFieldName));
-            }
-            labelValueResp.setExtra(extraMap);
-        }
-        return respList;
+        Map<String, String> fieldMapping = MapUtil.newHashMap(2);
+        fieldMapping.put(CharSequenceUtil.toCamelCase(dictField.labelKey()), "label");
+        fieldMapping.put(CharSequenceUtil.toCamelCase(dictField.valueKey()), "value");
+        return BeanUtil.copyToList(entityList, LabelValueResp.class, CopyOptions.create()
+            .setFieldMapping(fieldMapping));
    }

    @Override
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/pom.xml
+++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/pom.xml
@@ -1,14 +0,0 @@
-<?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>
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/autoconfigure/DataPermissionProperties.java
+++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/autoconfigure/DataPermissionProperties.java
@@ -1,43 +0,0 @@
-/*
- * 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;
-    }
-}
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/model/RoleContext.java
+++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-core/src/main/java/top/continew/starter/extension/datapermission/model/RoleContext.java
@@ -1,62 +0,0 @@
-/*
- * 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;
-    }
-}
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/pom.xml
+++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/pom.xml
@@ -1,28 +0,0 @@
-<?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>
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/autoconfigure/DataPermissionAutoConfiguration.java
+++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/autoconfigure/DataPermissionAutoConfiguration.java
@@ -1,84 +0,0 @@
-/*
- * 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.");
-    }
-}
--- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +0,0 @@
-top.continew.starter.extension.datapermission.autoconfigure.DataPermissionAutoConfiguration
--- a/continew-starter-extension/continew-starter-extension-datapermission/pom.xml
+++ b/continew-starter-extension/continew-starter-extension-datapermission/pom.xml
@@ -1,20 +0,0 @@
-<?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>
--- a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/pom.xml
+++ b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/pom.xml
@@ -1,34 +0,0 @@
-<?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>
--- a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantInterceptor.java
+++ b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantInterceptor.java
@@ -1,48 +0,0 @@
-/*
- * 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 cn.hutool.core.convert.Convert;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-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;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Charles7c	79891a1fdb	release: v2.5.2	2024-08-13 13:34:28 +08:00
Charles7c	c31fa753b6	refactor(curd): 重构排序字段处理，预防 SQL 注入问题	2024-08-13 13:33:56 +08:00
				`@@ -1 +0,0 @@`
				`top.continew.starter.data.mf.autoconfigure.MybatisFlexAutoConfiguration`
				`@@ -1 +0,0 @@`
				`top.continew.starter.data.mp.autoconfigure.MybatisPlusAutoConfiguration`
				`@@ -0,0 +1 @@`
				`top.continew.starter.data.mybatis.flex.autoconfigure.MybatisFlexAutoConfiguration`
				`@@ -0,0 +1 @@`
				`top.continew.starter.data.mybatis.plus.autoconfigure.MybatisPlusAutoConfiguration`
				`@@ -1 +0,0 @@`
				`top.continew.starter.extension.datapermission.autoconfigure.DataPermissionAutoConfiguration`