From bbf2b671b5ad2492033a2b03a4c99b56c02d7701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=81=82=E7=A7=8B=E8=8D=A3?= Date: Wed, 23 Oct 2024 22:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=833.5.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 9 +++++++++ .../build.gradle | 0 .../mybatis-plus-jsqlparser-4.9/build.gradle | 2 +- .../extension/parser/JsqlParserFunction.java | 0 .../mybatisplus/extension/parser/JsqlParserGlobal.java | 0 .../extension/parser/JsqlParserSupport.java | 0 .../parser/cache/AbstractCaffeineJsqlParseCache.java | 0 .../mybatisplus/extension/parser/cache/FstFactory.java | 0 .../parser/cache/FstSerialCaffeineJsqlParseCache.java | 0 .../parser/cache/JdkSerialCaffeineJsqlParseCache.java | 0 .../extension/parser/cache/JsqlParseCache.java | 0 .../plugins/handler/DataPermissionHandler.java | 0 .../plugins/handler/MultiDataPermissionHandler.java | 0 .../extension/plugins/handler/TenantLineHandler.java | 0 .../plugins/inner/BaseMultiTableInnerInterceptor.java | 0 .../plugins/inner/BlockAttackInnerInterceptor.java | 0 .../inner/DataChangeRecorderInnerInterceptor.java | 0 .../plugins/inner/DataPermissionInterceptor.java | 0 .../inner/DynamicTableNameInnerInterceptor.java | 0 .../plugins/inner/IllegalSQLInnerInterceptor.java | 0 .../plugins/inner/PaginationInnerInterceptor.java | 0 .../plugins/inner/TenantLineInnerInterceptor.java | 0 .../com/baomidou/mybatisplus/test/JSqlParserTest.java | 0 .../extension/parser/JsqlParserSimpleSerialTest.java | 0 .../test/extension/parser/cache/FstFactoryTest.java | 0 .../extension/plugins/MybatisPlusInterceptorTest.java | 0 .../plugins/inner/BlockAttackInnerInterceptorTest.java | 0 .../inner/DataChangeRecorderInnerInterceptorTest.java | 0 .../plugins/inner/DataPermissionInterceptorTest.java | 0 .../inner/DynamicTableNameInnerInterceptorTest.java | 0 .../plugins/inner/IllegalSQLInnerInterceptorTest.java | 0 .../inner/MultiDataPermissionInterceptorTest.java | 0 .../plugins/inner/PaginationInnerInterceptorTest.java | 0 .../plugins/inner/TenantLineInnerInterceptorTest.java | 0 .../pagination/SelectBodyToPlainSelectTest.java | 0 .../mybatis-plus-jsqlparser-common/build.gradle | 0 .../mybatis-plus-jsqlparser/build.gradle | 2 +- .../extension/parser/JsqlParserFunction.java | 0 .../mybatisplus/extension/parser/JsqlParserGlobal.java | 0 .../extension/parser/JsqlParserSupport.java | 0 .../parser/cache/AbstractCaffeineJsqlParseCache.java | 0 .../mybatisplus/extension/parser/cache/FstFactory.java | 0 .../parser/cache/FstSerialCaffeineJsqlParseCache.java | 0 .../parser/cache/JdkSerialCaffeineJsqlParseCache.java | 0 .../extension/parser/cache/JsqlParseCache.java | 0 .../plugins/handler/DataPermissionHandler.java | 0 .../plugins/handler/MultiDataPermissionHandler.java | 0 .../extension/plugins/handler/TenantLineHandler.java | 0 .../plugins/inner/BaseMultiTableInnerInterceptor.java | 0 .../plugins/inner/BlockAttackInnerInterceptor.java | 0 .../inner/DataChangeRecorderInnerInterceptor.java | 0 .../plugins/inner/DataPermissionInterceptor.java | 0 .../plugins/inner/IllegalSQLInnerInterceptor.java | 0 .../plugins/inner/PaginationInnerInterceptor.java | 0 .../plugins/inner/TenantLineInnerInterceptor.java | 0 .../com/baomidou/mybatisplus/test/JSqlParserTest.java | 0 .../extension/parser/JsqlParserSimpleSerialTest.java | 0 .../test/extension/parser/cache/FstFactoryTest.java | 0 .../extension/plugins/MybatisPlusInterceptorTest.java | 0 .../plugins/inner/BlockAttackInnerInterceptorTest.java | 0 .../inner/DataChangeRecorderInnerInterceptorTest.java | 0 .../plugins/inner/DataPermissionInterceptorTest.java | 0 .../inner/DynamicTableNameInnerInterceptorTest.java | 0 .../plugins/inner/IllegalSQLInnerInterceptorTest.java | 0 .../inner/MultiDataPermissionInterceptorTest.java | 0 .../plugins/inner/PaginationInnerInterceptorTest.java | 0 .../plugins/inner/TenantLineInnerInterceptorTest.java | 0 .../test/pagination/SelectBodyToPlainSelectTest.java | 0 mybatis-plus-spring/build.gradle | 10 ---------- mybatis-plus/build.gradle | 2 +- settings.gradle | 8 ++++---- 71 files changed, 16 insertions(+), 17 deletions(-) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/build.gradle (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/build.gradle (85%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/SelectBodyToPlainSelectTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser-common/build.gradle (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/build.gradle (86%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java (100%) rename {mybatis-plus-jsqlparser => mybatis-plus-jsqlparser-support}/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/pagination/SelectBodyToPlainSelectTest.java (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e18f27f76..2c4821163a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ # CHANGELOG +## [v3.5.9] 2024.10.23 +- opt: 优化代码生成器支持可视化配置生成能力 +- opt: 解耦扩展包不再强制依赖 spring 开发框架 +- opt: 拆分jsqlparser支持模块,提供mybatis-plus-jsqlparser(支持最新jsqlparser)与mybatis-plus-jsqlparser-4.9模块, 默认不携带,升级后需要自行引入. +- feat: 重构 service 模块抽象为 CrudRepository 不再建议使用 IService 避免业务层数据混乱 +- feat: 新增 solon 启动插件支持 +- feat: 升级SpringBoot3.3.4 +- feat: 升级velocity2.4 + ## [v3.5.8] 2024.09.18 - fix: 解决optimizeJoinOfCountSql反序列化不支持问题 - fix: 解决Db工具类批量操作使用rewriteBatchedStatements=true返回值不准确 diff --git a/mybatis-plus-jsqlparser/build.gradle b/mybatis-plus-jsqlparser-support/build.gradle similarity index 100% rename from mybatis-plus-jsqlparser/build.gradle rename to mybatis-plus-jsqlparser-support/build.gradle diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/build.gradle b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/build.gradle similarity index 85% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/build.gradle rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/build.gradle index a02bd16c06..38452069af 100644 --- a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/build.gradle +++ b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/build.gradle @@ -1,6 +1,6 @@ dependencies { api "com.github.jsqlparser:jsqlparser:4.9" - api project(":mybatis-plus-jsqlparser:mybatis-plus-jsqlparser-common") + api project(":mybatis-plus-jsqlparser-support:mybatis-plus-jsqlparser-common") implementation "${lib."slf4j-api"}" implementation "de.ruedigermoeller:fst:3.0.3" implementation "com.github.ben-manes.caffeine:caffeine:2.9.3" diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/SelectBodyToPlainSelectTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/SelectBodyToPlainSelectTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/SelectBodyToPlainSelectTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-4.9/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/SelectBodyToPlainSelectTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-common/build.gradle b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-common/build.gradle similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-common/build.gradle rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser-common/build.gradle diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/build.gradle b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/build.gradle similarity index 86% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/build.gradle rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/build.gradle index 962a2091d0..b2cc897c54 100644 --- a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/build.gradle +++ b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/build.gradle @@ -4,7 +4,7 @@ compileJava { dependencies { api "com.github.jsqlparser:jsqlparser:5.0" - api project(":mybatis-plus-jsqlparser:mybatis-plus-jsqlparser-common") + api project(":mybatis-plus-jsqlparser-support:mybatis-plus-jsqlparser-common") implementation "${lib."slf4j-api"}" implementation "de.ruedigermoeller:fst:3.0.3" implementation "com.github.ben-manes.caffeine:caffeine:2.9.3" diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserFunction.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSupport.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/AbstractCaffeineJsqlParseCache.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstSerialCaffeineJsqlParseCache.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JdkSerialCaffeineJsqlParseCache.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/JsqlParseCache.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/DataPermissionHandler.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/MultiDataPermissionHandler.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BaseMultiTableInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/JSqlParserTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataChangeRecorderInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/pagination/SelectBodyToPlainSelectTest.java b/mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/pagination/SelectBodyToPlainSelectTest.java similarity index 100% rename from mybatis-plus-jsqlparser/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/pagination/SelectBodyToPlainSelectTest.java rename to mybatis-plus-jsqlparser-support/mybatis-plus-jsqlparser/src/test/java/com/baomidou/mybatisplus/test/pagination/SelectBodyToPlainSelectTest.java diff --git a/mybatis-plus-spring/build.gradle b/mybatis-plus-spring/build.gradle index 6058c759bd..443438f9e4 100644 --- a/mybatis-plus-spring/build.gradle +++ b/mybatis-plus-spring/build.gradle @@ -13,16 +13,6 @@ dependencies { implementation "${lib."spring-context-support"}" implementation "${lib."spring-jdbc"}" implementation "${lib."slf4j-api"}" - implementation "${lib."p6spy"}" - implementation "${lib."jackson"}" - implementation "${lib."fastjson"}" - implementation "${lib."gson"}" - implementation "${lib['mybatis-thymeleaf']}" - implementation "${lib.'mybatis-velocity'}" - implementation "${lib.'mybatis-freemarker'}" - implementation "de.ruedigermoeller:fst:3.0.4-jdk17" - implementation "com.github.ben-manes.caffeine:caffeine:2.9.3" - testImplementation "io.github.classgraph:classgraph:4.8.177" testImplementation "${lib.h2}" testImplementation "${lib.mysql}" testImplementation "${lib.'logback-classic'}" diff --git a/mybatis-plus/build.gradle b/mybatis-plus/build.gradle index 54bb4cdb0c..866a995527 100644 --- a/mybatis-plus/build.gradle +++ b/mybatis-plus/build.gradle @@ -27,6 +27,6 @@ dependencies { testImplementation "${lib.'logback-classic'}" testImplementation "${lib.cglib}" testImplementation "${lib.postgresql}" - testImplementation project(":mybatis-plus-jsqlparser:mybatis-plus-jsqlparser") + testImplementation project(":mybatis-plus-jsqlparser-support:mybatis-plus-jsqlparser") // testCompile ('org.apache.phoenix:phoenix-core:5.0.0-HBase-2.0') } diff --git a/settings.gradle b/settings.gradle index 7a0c5e2a66..52bd606c5c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -29,7 +29,7 @@ include ':spring-boot-starter:mybatis-plus-spring-boot-autoconfigure' include ':spring-boot-starter:mybatis-plus-spring-boot-test-autoconfigure' include ':spring-boot-starter:mybatis-plus-spring-boot3-starter' include ':spring-boot-starter:mybatis-plus-spring-boot3-starter-test' -include 'mybatis-plus-jsqlparser' -include ':mybatis-plus-jsqlparser:mybatis-plus-jsqlparser' -include ':mybatis-plus-jsqlparser:mybatis-plus-jsqlparser-common' -include ':mybatis-plus-jsqlparser:mybatis-plus-jsqlparser-4.9' +include 'mybatis-plus-jsqlparser-support' +include ':mybatis-plus-jsqlparser-support:mybatis-plus-jsqlparser' +include ':mybatis-plus-jsqlparser-support:mybatis-plus-jsqlparser-common' +include ':mybatis-plus-jsqlparser-support:mybatis-plus-jsqlparser-4.9'