3.5.2.2-SNAPSHOT fix: InterceptorIgnore 不能过滤 selectKey 的问题

build.gradle

@@ -2,7 +2,7 @@ import java.time.LocalDateTime
 
 allprojects {
     group = 'com.baomidou'
-    version = "3.5.2.1-SNAPSHOT"
+    version = "3.5.2.2-SNAPSHOT"
 }
 
 ext {
@@ -16,7 +16,7 @@ ext {
         mybatisSpringBootStarterVersion = '2.2.2',
         springVersion = '5.3.15',
         springBootVersion = '2.5.3',
-        jsqlparserVersion = '4.5',
+        jsqlparserVersion = '4.4', // 4.5 有bug
         junitVersion = '5.9.0',
     ]
 
@@ -127,7 +127,7 @@ subprojects {
                 attributes 'Built-By': System.getProperty("user.name")
                 attributes 'Build-Jdk': System.getProperty("java.version")
                 attributes 'Build-Timestamp': LocalDateTime.now().format("yyyy-MM-dd HH:mm:ss")
-                attributes 'Automatic-Module-Name': "${project.group}.${project.name.replaceAll("-",".")}"
+                attributes 'Automatic-Module-Name': "${project.group}.${project.name.replaceAll("-", ".")}"
             }
         }
     }

changelog-temp.md

@@ -1 +1,2 @@
 - 多租户插件:多表join表名必需起别名,否则追加的过滤条件不带前缀
+- fix: InterceptorIgnore 不能过滤 selectKey 的问题

mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/InterceptorIgnore.java

@@ -63,11 +63,6 @@ public @interface InterceptorIgnore {
      */
     String dataPermission() default "1";
 
-    /**
-     * 分表 {@link com.baomidou.mybatisplus.extension.plugins.inner.ShardingInnerInterceptor}
-     */
-    String sharding() default "";
-
     /**
      * 其他的
      * <p>

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/plugins/InterceptorIgnoreHelper.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import lombok.Builder;
 import lombok.Data;
+import org.apache.ibatis.executor.keygen.SelectKeyGenerator;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
@@ -99,16 +100,16 @@ public abstract class InterceptorIgnoreHelper {
         return willIgnore(id, InterceptorIgnoreCache::getDataPermission);
     }
 
-    public static boolean willIgnoreSharding(String id) {
-        return willIgnore(id, InterceptorIgnoreCache::getSharding);
-    }
-
     public static boolean willIgnoreOthersByKey(String id, String key) {
         return willIgnore(id, i -> CollectionUtils.isNotEmpty(i.getOthers()) && i.getOthers().getOrDefault(key, false));
     }
 
     public static boolean willIgnore(String id, Function<InterceptorIgnoreCache, Boolean> function) {
         InterceptorIgnoreCache cache = INTERCEPTOR_IGNORE_CACHE.get(id);
+        if (cache == null && id.endsWith(SelectKeyGenerator.SELECT_KEY_SUFFIX)) {
+            // 支持一下 selectKey
+            cache = INTERCEPTOR_IGNORE_CACHE.get(id.substring(0, id.length() - SelectKeyGenerator.SELECT_KEY_SUFFIX.length()));
+        }
         if (cache == null) {
             cache = INTERCEPTOR_IGNORE_CACHE.get(id.substring(0, id.lastIndexOf(StringPool.DOT)));
         }
@@ -126,7 +127,6 @@ public abstract class InterceptorIgnoreHelper {
             .blockAttack(chooseBoolean(mapper.getBlockAttack(), method.getBlockAttack()))
             .illegalSql(chooseBoolean(mapper.getIllegalSql(), method.getIllegalSql()))
             .dataPermission(chooseBoolean(mapper.getDataPermission(), method.getDataPermission()))
-            .sharding(chooseBoolean(mapper.getSharding(), method.getSharding()))
             .others(chooseOthers(mapper.getOthers(), method.getOthers()))
             .build();
     }
@@ -138,7 +138,6 @@ public abstract class InterceptorIgnoreHelper {
             .blockAttack(getBoolean("blockAttack", name, ignore.blockAttack()))
             .illegalSql(getBoolean("illegalSql", name, ignore.illegalSql()))
             .dataPermission(getBoolean("dataPermission", name, ignore.dataPermission()))
-            .sharding(getBoolean("sharding", name, ignore.sharding()))
             .others(getOthers(name, ignore.others()))
             .build();
     }
@@ -214,7 +213,6 @@ public abstract class InterceptorIgnoreHelper {
         private Boolean blockAttack;
         private Boolean illegalSql;
         private Boolean dataPermission;
-        private Boolean sharding;
         private Map<String, Boolean> others;
     }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java

@@ -62,11 +62,9 @@ public class DynamicTableNameInnerInterceptor implements InnerInterceptor {
 
     @Override
     public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
+        if (InterceptorIgnoreHelper.willIgnoreDynamicTableName(ms.getId())) return;
         PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql);
-        if (!InterceptorIgnoreHelper.willIgnoreDynamicTableName(ms.getId())) {
-            // 非忽略执行
-            mpBs.sql(this.changeTable(mpBs.sql()));
-        }
+        mpBs.sql(this.changeTable(mpBs.sql()));
     }
 
     @Override
@@ -75,11 +73,11 @@ public class DynamicTableNameInnerInterceptor implements InnerInterceptor {
         MappedStatement ms = mpSh.mappedStatement();
         SqlCommandType sct = ms.getSqlCommandType();
         if (sct == SqlCommandType.INSERT || sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) {
-            if (!InterceptorIgnoreHelper.willIgnoreDynamicTableName(ms.getId())) {
-                // 非忽略执行
-                PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql();
-                mpBs.sql(this.changeTable(mpBs.sql()));
+            if (InterceptorIgnoreHelper.willIgnoreDynamicTableName(ms.getId())) {
+                return;
             }
+            PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql();
+            mpBs.sql(this.changeTable(mpBs.sql()));
         }
     }
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java

@@ -135,7 +135,7 @@ public class TenantLineInnerInterceptor extends JsqlParserSupport implements Inn
 
         Select select = insert.getSelect();
         if (select != null) {
-            this.processInsertSelect(select.getSelectBody());
+            processInsertSelect(select.getSelectBody());
         } else if (insert.getItemsList() != null) {
             // fixed github pull/295
             ItemsList itemsList = insert.getItemsList();