发布3.5.9

baomidou · Oct 23, 2024 · bbf2b67 · bbf2b67
1 parent fa716bf
commit bbf2b67
Show file tree

Hide file tree

Showing 71 changed files with 16 additions and 17 deletions.
diff --git 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 → mybatis-plus-jsqlparser-support/build.gradle b/mybatis-plus-jsqlparser/build.gradle → mybatis-plus-jsqlparser-support/build.gradle
diff --git a/.../mybatis-plus-jsqlparser-4.9/build.gradle → .../mybatis-plus-jsqlparser-4.9/build.gradle b/.../mybatis-plus-jsqlparser-4.9/build.gradle → .../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/.../extension/parser/JsqlParserFunction.java → .../extension/parser/JsqlParserFunction.java b/.../extension/parser/JsqlParserFunction.java → .../extension/parser/JsqlParserFunction.java
diff --git a/...us/extension/parser/JsqlParserGlobal.java → ...us/extension/parser/JsqlParserGlobal.java b/...us/extension/parser/JsqlParserGlobal.java → ...us/extension/parser/JsqlParserGlobal.java
diff --git a/...s/extension/parser/JsqlParserSupport.java → ...s/extension/parser/JsqlParserSupport.java b/...s/extension/parser/JsqlParserSupport.java → ...s/extension/parser/JsqlParserSupport.java
diff --git a/...cache/AbstractCaffeineJsqlParseCache.java → ...cache/AbstractCaffeineJsqlParseCache.java b/...cache/AbstractCaffeineJsqlParseCache.java → ...cache/AbstractCaffeineJsqlParseCache.java
diff --git a/...us/extension/parser/cache/FstFactory.java → ...us/extension/parser/cache/FstFactory.java b/...us/extension/parser/cache/FstFactory.java → ...us/extension/parser/cache/FstFactory.java
diff --git a/...ache/FstSerialCaffeineJsqlParseCache.java → ...ache/FstSerialCaffeineJsqlParseCache.java b/...ache/FstSerialCaffeineJsqlParseCache.java → ...ache/FstSerialCaffeineJsqlParseCache.java
diff --git a/...ache/JdkSerialCaffeineJsqlParseCache.java → ...ache/JdkSerialCaffeineJsqlParseCache.java b/...ache/JdkSerialCaffeineJsqlParseCache.java → ...ache/JdkSerialCaffeineJsqlParseCache.java
diff --git a/...xtension/parser/cache/JsqlParseCache.java → ...xtension/parser/cache/JsqlParseCache.java b/...xtension/parser/cache/JsqlParseCache.java → ...xtension/parser/cache/JsqlParseCache.java
diff --git a/...lugins/handler/DataPermissionHandler.java → ...lugins/handler/DataPermissionHandler.java b/...lugins/handler/DataPermissionHandler.java → ...lugins/handler/DataPermissionHandler.java
diff --git a/...s/handler/MultiDataPermissionHandler.java → ...s/handler/MultiDataPermissionHandler.java b/...s/handler/MultiDataPermissionHandler.java → ...s/handler/MultiDataPermissionHandler.java
diff --git a/...on/plugins/handler/TenantLineHandler.java → ...on/plugins/handler/TenantLineHandler.java b/...on/plugins/handler/TenantLineHandler.java → ...on/plugins/handler/TenantLineHandler.java
diff --git a/...inner/BaseMultiTableInnerInterceptor.java → ...inner/BaseMultiTableInnerInterceptor.java b/...inner/BaseMultiTableInnerInterceptor.java → ...inner/BaseMultiTableInnerInterceptor.java
diff --git a/...ns/inner/BlockAttackInnerInterceptor.java → ...ns/inner/BlockAttackInnerInterceptor.java b/...ns/inner/BlockAttackInnerInterceptor.java → ...ns/inner/BlockAttackInnerInterceptor.java
diff --git a/...r/DataChangeRecorderInnerInterceptor.java → ...r/DataChangeRecorderInnerInterceptor.java b/...r/DataChangeRecorderInnerInterceptor.java → ...r/DataChangeRecorderInnerInterceptor.java
diff --git a/...gins/inner/DataPermissionInterceptor.java → ...gins/inner/DataPermissionInterceptor.java b/...gins/inner/DataPermissionInterceptor.java → ...gins/inner/DataPermissionInterceptor.java
diff --git a/...ner/DynamicTableNameInnerInterceptor.java → ...ner/DynamicTableNameInnerInterceptor.java b/...ner/DynamicTableNameInnerInterceptor.java → ...ner/DynamicTableNameInnerInterceptor.java
diff --git a/...ins/inner/IllegalSQLInnerInterceptor.java → ...ins/inner/IllegalSQLInnerInterceptor.java b/...ins/inner/IllegalSQLInnerInterceptor.java → ...ins/inner/IllegalSQLInnerInterceptor.java
diff --git a/...ins/inner/PaginationInnerInterceptor.java → ...ins/inner/PaginationInnerInterceptor.java b/...ins/inner/PaginationInnerInterceptor.java → ...ins/inner/PaginationInnerInterceptor.java
diff --git a/...ins/inner/TenantLineInnerInterceptor.java → ...ins/inner/TenantLineInnerInterceptor.java b/...ins/inner/TenantLineInnerInterceptor.java → ...ins/inner/TenantLineInnerInterceptor.java
diff --git a/...idou/mybatisplus/test/JSqlParserTest.java → ...idou/mybatisplus/test/JSqlParserTest.java b/...idou/mybatisplus/test/JSqlParserTest.java → ...idou/mybatisplus/test/JSqlParserTest.java
diff --git a/...on/parser/JsqlParserSimpleSerialTest.java → ...on/parser/JsqlParserSimpleSerialTest.java b/...on/parser/JsqlParserSimpleSerialTest.java → ...on/parser/JsqlParserSimpleSerialTest.java
diff --git a/...xtension/parser/cache/FstFactoryTest.java → ...xtension/parser/cache/FstFactoryTest.java b/...xtension/parser/cache/FstFactoryTest.java → ...xtension/parser/cache/FstFactoryTest.java
diff --git a/...n/plugins/MybatisPlusInterceptorTest.java → ...n/plugins/MybatisPlusInterceptorTest.java b/...n/plugins/MybatisPlusInterceptorTest.java → ...n/plugins/MybatisPlusInterceptorTest.java
diff --git a/...nner/BlockAttackInnerInterceptorTest.java → ...nner/BlockAttackInnerInterceptorTest.java b/...nner/BlockAttackInnerInterceptorTest.java → ...nner/BlockAttackInnerInterceptorTest.java
diff --git a/...taChangeRecorderInnerInterceptorTest.java → ...taChangeRecorderInnerInterceptorTest.java b/...taChangeRecorderInnerInterceptorTest.java → ...taChangeRecorderInnerInterceptorTest.java
diff --git a/.../inner/DataPermissionInterceptorTest.java → .../inner/DataPermissionInterceptorTest.java b/.../inner/DataPermissionInterceptorTest.java → .../inner/DataPermissionInterceptorTest.java
diff --git a/...DynamicTableNameInnerInterceptorTest.java → ...DynamicTableNameInnerInterceptorTest.java b/...DynamicTableNameInnerInterceptorTest.java → ...DynamicTableNameInnerInterceptorTest.java
diff --git a/...inner/IllegalSQLInnerInterceptorTest.java → ...inner/IllegalSQLInnerInterceptorTest.java b/...inner/IllegalSQLInnerInterceptorTest.java → ...inner/IllegalSQLInnerInterceptorTest.java
diff --git a/...r/MultiDataPermissionInterceptorTest.java → ...r/MultiDataPermissionInterceptorTest.java b/...r/MultiDataPermissionInterceptorTest.java → ...r/MultiDataPermissionInterceptorTest.java
diff --git a/...inner/PaginationInnerInterceptorTest.java → ...inner/PaginationInnerInterceptorTest.java b/...inner/PaginationInnerInterceptorTest.java → ...inner/PaginationInnerInterceptorTest.java
diff --git a/...inner/TenantLineInnerInterceptorTest.java → ...inner/TenantLineInnerInterceptorTest.java b/...inner/TenantLineInnerInterceptorTest.java → ...inner/TenantLineInnerInterceptorTest.java
diff --git a/...gination/SelectBodyToPlainSelectTest.java → ...gination/SelectBodyToPlainSelectTest.java b/...gination/SelectBodyToPlainSelectTest.java → ...gination/SelectBodyToPlainSelectTest.java
diff --git a/...batis-plus-jsqlparser-common/build.gradle → ...batis-plus-jsqlparser-common/build.gradle b/...batis-plus-jsqlparser-common/build.gradle → ...batis-plus-jsqlparser-common/build.gradle
diff --git a/...rser/mybatis-plus-jsqlparser/build.gradle → ...port/mybatis-plus-jsqlparser/build.gradle b/...rser/mybatis-plus-jsqlparser/build.gradle → ...port/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/.../extension/parser/JsqlParserFunction.java → .../extension/parser/JsqlParserFunction.java b/.../extension/parser/JsqlParserFunction.java → .../extension/parser/JsqlParserFunction.java
diff --git a/...us/extension/parser/JsqlParserGlobal.java → ...us/extension/parser/JsqlParserGlobal.java b/...us/extension/parser/JsqlParserGlobal.java → ...us/extension/parser/JsqlParserGlobal.java
diff --git a/...s/extension/parser/JsqlParserSupport.java → ...s/extension/parser/JsqlParserSupport.java b/...s/extension/parser/JsqlParserSupport.java → ...s/extension/parser/JsqlParserSupport.java
diff --git a/...cache/AbstractCaffeineJsqlParseCache.java → ...cache/AbstractCaffeineJsqlParseCache.java b/...cache/AbstractCaffeineJsqlParseCache.java → ...cache/AbstractCaffeineJsqlParseCache.java
diff --git a/...us/extension/parser/cache/FstFactory.java → ...us/extension/parser/cache/FstFactory.java b/...us/extension/parser/cache/FstFactory.java → ...us/extension/parser/cache/FstFactory.java
diff --git a/...ache/FstSerialCaffeineJsqlParseCache.java → ...ache/FstSerialCaffeineJsqlParseCache.java b/...ache/FstSerialCaffeineJsqlParseCache.java → ...ache/FstSerialCaffeineJsqlParseCache.java
diff --git a/...ache/JdkSerialCaffeineJsqlParseCache.java → ...ache/JdkSerialCaffeineJsqlParseCache.java b/...ache/JdkSerialCaffeineJsqlParseCache.java → ...ache/JdkSerialCaffeineJsqlParseCache.java
diff --git a/...xtension/parser/cache/JsqlParseCache.java → ...xtension/parser/cache/JsqlParseCache.java b/...xtension/parser/cache/JsqlParseCache.java → ...xtension/parser/cache/JsqlParseCache.java
diff --git a/...lugins/handler/DataPermissionHandler.java → ...lugins/handler/DataPermissionHandler.java b/...lugins/handler/DataPermissionHandler.java → ...lugins/handler/DataPermissionHandler.java
diff --git a/...s/handler/MultiDataPermissionHandler.java → ...s/handler/MultiDataPermissionHandler.java b/...s/handler/MultiDataPermissionHandler.java → ...s/handler/MultiDataPermissionHandler.java
diff --git a/...on/plugins/handler/TenantLineHandler.java → ...on/plugins/handler/TenantLineHandler.java b/...on/plugins/handler/TenantLineHandler.java → ...on/plugins/handler/TenantLineHandler.java
diff --git a/...inner/BaseMultiTableInnerInterceptor.java → ...inner/BaseMultiTableInnerInterceptor.java b/...inner/BaseMultiTableInnerInterceptor.java → ...inner/BaseMultiTableInnerInterceptor.java
diff --git a/...ns/inner/BlockAttackInnerInterceptor.java → ...ns/inner/BlockAttackInnerInterceptor.java b/...ns/inner/BlockAttackInnerInterceptor.java → ...ns/inner/BlockAttackInnerInterceptor.java
diff --git a/...r/DataChangeRecorderInnerInterceptor.java → ...r/DataChangeRecorderInnerInterceptor.java b/...r/DataChangeRecorderInnerInterceptor.java → ...r/DataChangeRecorderInnerInterceptor.java
diff --git a/...gins/inner/DataPermissionInterceptor.java → ...gins/inner/DataPermissionInterceptor.java b/...gins/inner/DataPermissionInterceptor.java → ...gins/inner/DataPermissionInterceptor.java
diff --git a/...ins/inner/IllegalSQLInnerInterceptor.java → ...ins/inner/IllegalSQLInnerInterceptor.java b/...ins/inner/IllegalSQLInnerInterceptor.java → ...ins/inner/IllegalSQLInnerInterceptor.java
diff --git a/...ins/inner/PaginationInnerInterceptor.java → ...ins/inner/PaginationInnerInterceptor.java b/...ins/inner/PaginationInnerInterceptor.java → ...ins/inner/PaginationInnerInterceptor.java
diff --git a/...ins/inner/TenantLineInnerInterceptor.java → ...ins/inner/TenantLineInnerInterceptor.java b/...ins/inner/TenantLineInnerInterceptor.java → ...ins/inner/TenantLineInnerInterceptor.java
diff --git a/...idou/mybatisplus/test/JSqlParserTest.java → ...idou/mybatisplus/test/JSqlParserTest.java b/...idou/mybatisplus/test/JSqlParserTest.java → ...idou/mybatisplus/test/JSqlParserTest.java
diff --git a/...on/parser/JsqlParserSimpleSerialTest.java → ...on/parser/JsqlParserSimpleSerialTest.java b/...on/parser/JsqlParserSimpleSerialTest.java → ...on/parser/JsqlParserSimpleSerialTest.java
diff --git a/...xtension/parser/cache/FstFactoryTest.java → ...xtension/parser/cache/FstFactoryTest.java b/...xtension/parser/cache/FstFactoryTest.java → ...xtension/parser/cache/FstFactoryTest.java
diff --git a/...n/plugins/MybatisPlusInterceptorTest.java → ...n/plugins/MybatisPlusInterceptorTest.java b/...n/plugins/MybatisPlusInterceptorTest.java → ...n/plugins/MybatisPlusInterceptorTest.java
diff --git a/...nner/BlockAttackInnerInterceptorTest.java → ...nner/BlockAttackInnerInterceptorTest.java b/...nner/BlockAttackInnerInterceptorTest.java → ...nner/BlockAttackInnerInterceptorTest.java
diff --git a/...taChangeRecorderInnerInterceptorTest.java → ...taChangeRecorderInnerInterceptorTest.java b/...taChangeRecorderInnerInterceptorTest.java → ...taChangeRecorderInnerInterceptorTest.java
diff --git a/.../inner/DataPermissionInterceptorTest.java → .../inner/DataPermissionInterceptorTest.java b/.../inner/DataPermissionInterceptorTest.java → .../inner/DataPermissionInterceptorTest.java
diff --git a/...DynamicTableNameInnerInterceptorTest.java → ...DynamicTableNameInnerInterceptorTest.java b/...DynamicTableNameInnerInterceptorTest.java → ...DynamicTableNameInnerInterceptorTest.java
diff --git a/...inner/IllegalSQLInnerInterceptorTest.java → ...inner/IllegalSQLInnerInterceptorTest.java b/...inner/IllegalSQLInnerInterceptorTest.java → ...inner/IllegalSQLInnerInterceptorTest.java
diff --git a/...r/MultiDataPermissionInterceptorTest.java → ...r/MultiDataPermissionInterceptorTest.java b/...r/MultiDataPermissionInterceptorTest.java → ...r/MultiDataPermissionInterceptorTest.java
diff --git a/...inner/PaginationInnerInterceptorTest.java → ...inner/PaginationInnerInterceptorTest.java b/...inner/PaginationInnerInterceptorTest.java → ...inner/PaginationInnerInterceptorTest.java
diff --git a/...inner/TenantLineInnerInterceptorTest.java → ...inner/TenantLineInnerInterceptorTest.java b/...inner/TenantLineInnerInterceptorTest.java → ...inner/TenantLineInnerInterceptorTest.java
diff --git a/...gination/SelectBodyToPlainSelectTest.java → ...gination/SelectBodyToPlainSelectTest.java b/...gination/SelectBodyToPlainSelectTest.java → ...gination/SelectBodyToPlainSelectTest.java
diff --git 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
@@ -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
@@ -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'