From a5aad6d85299e1075de24dfc1268b82953ff592f Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 7 Aug 2024 00:05:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sj=5F1.2.0-beta1):=20=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=B7=B2=E7=BB=8F=E4=B8=8D=E5=86=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8A=A8=E6=80=81tablePrefix=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SnailJobTemplateAutoConfiguration.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/config/SnailJobTemplateAutoConfiguration.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/config/SnailJobTemplateAutoConfiguration.java index 199aa97df..6d6ce561a 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/config/SnailJobTemplateAutoConfiguration.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/config/SnailJobTemplateAutoConfiguration.java @@ -89,13 +89,12 @@ public class SnailJobTemplateAutoConfiguration { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor(Environment environment) { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - String tablePrefix = Optional.ofNullable(environment.getProperty("mybatis-plus.global-config.db-config.table-prefix")).orElse(StrUtil.EMPTY); - interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor(tablePrefix)); + interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor()); interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); return interceptor; } - public DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor(String tablePrefix) { + public DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor() { DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor = new DynamicTableNameInnerInterceptor(); dynamicTableNameInnerInterceptor.setTableNameHandler((sql, tableName) -> { if (TABLES_WITH_PARTITION.contains(tableName)) { @@ -104,7 +103,7 @@ public class SnailJobTemplateAutoConfiguration { tableName = tableName + StrUtil.UNDERLINE + partition; } - return tableName.startsWith(tablePrefix) ? tableName : tablePrefix + tableName; + return tableName; }); return dynamicTableNameInnerInterceptor;