更新日志.

baomidou · Feb 23, 2025 · b494e71 · b494e71
1 parent d21b78e
commit b494e71
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 20 deletions.
diff --git a/changelog-temp.md b/changelog-temp.md
@@ -0,0 +1,17 @@
+- fix: 修复链式模型生成错误
+- fix: 修复UUID主键执行批量删除错
+- fix: 修复Kotlin使用select(predicate)方法错误
+- fix: 修复`AbstractCaffeineJsqlParseCache`异步产生的错误
+- fix: 修复动态SQL解析包含SQL注释(--或#)导致的合并错误
+- feat: serialVersionUID支持添加`@Serial`注解
+- feat: 支持Entity注解(字段,类注解)自定义处理
+- feat: 支持Entity导包自定义处理
+- feat: 支持崖山数据库
+- feat: 升级Gradle至8.10
+- opt: 调整DbType#GAUSS数据库名为gauss
+- opt: 调整JsqlParser解析线程池指定
+- opt: 移除过时的`FieldStrategy.IGNORED`
+- opt: 移除过时的`GlobalConfig.DbConfig#selectStrategy`
+- opt: 移除过时的`MybatisSqlSessionFactoryBean#typeEnumsPackage`
+- doc: 修正DdlHelper中注释错误
+-
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-APP_VERSION=3.5.10.1
+APP_VERSION=3.5.11-SNAPSHOT
 APP_GROUP=com.baomidou
 signing.keyId=1FD337F9
 signing.password=243194995

diff --git a/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Entity.java b/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Entity.java
@@ -295,14 +295,14 @@ private Entity() {
     /**
      * 导包处理方法
      *
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     private Function<Set<String>, List<String>> importPackageFunction;
 
     /**
      * 处理类注解方法 (含类与字段)
      *
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     private Function<List<? extends AnnotationAttributes>, List<AnnotationAttributes>> annotationAttributesFunction;
 
@@ -884,7 +884,7 @@ public Builder fieldUseJavaDoc(boolean fieldUseJavaDoc) {
          *
          * @param importPackageFunction 导包处理
          * @return this
-         * @since 3.5.10.2
+         * @since 3.5.11
          */
         public Builder importPackageFunction(Function<Set<String>, List<String>> importPackageFunction) {
             this.entity.importPackageFunction = importPackageFunction;
@@ -896,7 +896,7 @@ public Builder importPackageFunction(Function<Set<String>, List<String>> importP
          *
          * @param annotationAttributesFunction 注解处理
          * @return this
-         * @since 3.5.10.2
+         * @since 3.5.11
          */
         public Builder annotationAttributesFunction(Function<List<? extends AnnotationAttributes>, List<AnnotationAttributes>> annotationAttributesFunction) {
             this.entity.annotationAttributesFunction = annotationAttributesFunction;

diff --git a/...plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableField.java b/...plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableField.java
@@ -143,7 +143,7 @@ public class TableField {
     /**
      * 字段注解处理
      *
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     private Function<List<? extends AnnotationAttributes>, List<AnnotationAttributes>> annotationAttributesFunction;
 
@@ -393,7 +393,7 @@ public void addAnnotationAttributesList(@NotNull List<AnnotationAttributes> anno
 
     /**
      * @param annotationAttributesList 注解属性集合
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public void addAnnotationAttributesList(@NotNull List<AnnotationAttributes> annotationAttributesList, Function<List<? extends AnnotationAttributes>, List<AnnotationAttributes>> annotationAttributesFunction) {
         this.annotationAttributesList.addAll(annotationAttributesList);

diff --git a/...lparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java b/...lparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java
@@ -47,7 +47,7 @@ public class JsqlParserGlobal {
      *
      * @see java.util.concurrent.ThreadPoolExecutor
      * @since 3.5.6
-     * @deprecated 3.5.10.2 后面不再公开此属性,请使用{@link #setExecutorService(ExecutorService)}} 或 {@link #setExecutorService(ExecutorService, boolean)}
+     * @deprecated 3.5.11 后面不再公开此属性,请使用{@link #setExecutorService(ExecutorService)}} 或 {@link #setExecutorService(ExecutorService, boolean)}
      */
     @Deprecated
     public static ExecutorService executorService;
@@ -65,7 +65,7 @@ public class JsqlParserGlobal {
      * 设置解析线程池
      *
      * @param executorService 线程池 (自行控制线程池关闭)
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static void setExecutorService(ExecutorService executorService) {
         JsqlParserGlobal.executorService = executorService;
@@ -76,7 +76,7 @@ public static void setExecutorService(ExecutorService executorService) {
      *
      * @param executorService 线程池 (自行控制线程池关闭)
      * @param addShutdownHook 是否注册退出关闭钩子
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static void setExecutorService(ExecutorService executorService, boolean addShutdownHook) {
         JsqlParserGlobal.executorService = executorService;
@@ -89,7 +89,7 @@ public static void setExecutorService(ExecutorService executorService, boolean a
      * 获取解析线程池(如果未自定义则返回默认的解析线程池)
      *
      * @return 解析线程池
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static ExecutorService getExecutorService() {
         return JsqlParserGlobal.executorService == null ? JsqlParserThreadPool.getDefaultThreadPoolExecutor() : JsqlParserGlobal.executorService;

diff --git a/...lparser-5.0/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java b/...lparser-5.0/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java
@@ -47,7 +47,7 @@ public class JsqlParserGlobal {
      *
      * @see java.util.concurrent.ThreadPoolExecutor
      * @since 3.5.6
-     * @deprecated 3.5.10.2 后面不再公开此属性,请使用{@link #setExecutorService(ExecutorService)}} 或 {@link #setExecutorService(ExecutorService, boolean)}
+     * @deprecated 3.5.11 后面不再公开此属性,请使用{@link #setExecutorService(ExecutorService)}} 或 {@link #setExecutorService(ExecutorService, boolean)}
      */
     @Deprecated
     public static ExecutorService executorService;
@@ -65,7 +65,7 @@ public class JsqlParserGlobal {
      * 设置解析线程池
      *
      * @param executorService 线程池 (自行控制线程池关闭)
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static void setExecutorService(ExecutorService executorService) {
         JsqlParserGlobal.executorService = executorService;
@@ -76,7 +76,7 @@ public static void setExecutorService(ExecutorService executorService) {
      *
      * @param executorService 线程池 (自行控制线程池关闭)
      * @param addShutdownHook 是否注册退出关闭钩子
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static void setExecutorService(ExecutorService executorService, boolean addShutdownHook) {
         JsqlParserGlobal.executorService = executorService;
@@ -89,7 +89,7 @@ public static void setExecutorService(ExecutorService executorService, boolean a
      * 获取解析线程池(如果未自定义则返回默认的解析线程池)
      *
      * @return 解析线程池
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static ExecutorService getExecutorService() {
         return JsqlParserGlobal.executorService == null ? JsqlParserThreadPool.getDefaultThreadPoolExecutor() : JsqlParserGlobal.executorService;

diff --git a/...parser-common/src/main/java/com/baomidou/mybatisplus/jsqlparser/JsqlParserThreadPool.java b/...parser-common/src/main/java/com/baomidou/mybatisplus/jsqlparser/JsqlParserThreadPool.java
@@ -25,7 +25,7 @@
  * <p>当没指定解析线程池时,默认使用一个固定长度的线程作为解析线程池.</p>
  *
  * @author nieqiurong
- * @since 3.5.10.2
+ * @since 3.5.11
  */
 public class JsqlParserThreadPool {
 

diff --git a/...-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java b/...-jsqlparser/src/main/java/com/baomidou/mybatisplus/extension/parser/JsqlParserGlobal.java
@@ -47,7 +47,7 @@ public class JsqlParserGlobal {
      *
      * @see java.util.concurrent.ThreadPoolExecutor
      * @since 3.5.6
-     * @deprecated 3.5.10.2 后面不再公开此属性,请使用{@link #setExecutorService(ExecutorService)}} 或 {@link #setExecutorService(ExecutorService, boolean)}
+     * @deprecated 3.5.11 后面不再公开此属性,请使用{@link #setExecutorService(ExecutorService)}} 或 {@link #setExecutorService(ExecutorService, boolean)}
      */
     @Deprecated
     public static ExecutorService executorService;
@@ -65,7 +65,7 @@ public class JsqlParserGlobal {
      * 设置解析线程池
      *
      * @param executorService 线程池 (自行控制线程池关闭)
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static void setExecutorService(ExecutorService executorService) {
         JsqlParserGlobal.executorService = executorService;
@@ -76,7 +76,7 @@ public static void setExecutorService(ExecutorService executorService) {
      *
      * @param executorService 线程池 (自行控制线程池关闭)
      * @param addShutdownHook 是否注册退出关闭钩子
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static void setExecutorService(ExecutorService executorService, boolean addShutdownHook) {
         JsqlParserGlobal.executorService = executorService;
@@ -89,7 +89,7 @@ public static void setExecutorService(ExecutorService executorService, boolean a
      * 获取解析线程池(如果未自定义则返回默认的解析线程池)
      *
      * @return 解析线程池
-     * @since 3.5.10.2
+     * @since 3.5.11
      */
     public static ExecutorService getExecutorService() {
         return JsqlParserGlobal.executorService == null ? JsqlParserThreadPool.getDefaultThreadPoolExecutor() : JsqlParserGlobal.executorService;