GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sj_1.2.0-beta1): PaginationInnerInterceptor不制定 dbType，由 mp 自动管理，解决 Oracle 11g分页兼容问题。

Browse Source
This commit is contained in:
dhb52 2024-08-07 00:04:00 +08:00 committed by opensnail
parent 5289caefca
commit d801703fdf
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/config/SnailJobTemplateAutoConfiguration.java
View File

@ -46,9 +46,9 @@ public class SnailJobTemplateAutoConfiguration {
@Bean("sqlSessionFactory") @Bean("sqlSessionFactory")
public SqlSessionFactory sqlSessionFactory(DataSource dataSource, Environment environment, public SqlSessionFactory sqlSessionFactory(DataSource dataSource, Environment environment,
MybatisPlusInterceptor mybatisPlusInterceptor, MybatisPlusInterceptor mybatisPlusInterceptor,
MybatisPlusProperties mybatisPlusProperties, MybatisPlusProperties mybatisPlusProperties,
SnailJobMybatisConfiguration snailJobMybatisConfiguration) throws Exception { SnailJobMybatisConfiguration snailJobMybatisConfiguration) throws Exception {
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
factoryBean.setDataSource(dataSource); factoryBean.setDataSource(dataSource);
DbTypeEnum dbTypeEnum = DbUtils.getDbType(); DbTypeEnum dbTypeEnum = DbUtils.getDbType();
@ -91,9 +91,7 @@ public class SnailJobTemplateAutoConfiguration {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
String tablePrefix = Optional.ofNullable(environment.getProperty("mybatis-plus.global-config.db-config.table-prefix")).orElse(StrUtil.EMPTY); String tablePrefix = Optional.ofNullable(environment.getProperty("mybatis-plus.global-config.db-config.table-prefix")).orElse(StrUtil.EMPTY);
interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor(tablePrefix)); interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor(tablePrefix));
DbTypeEnum dbTypeEnum = DbUtils.getDbType(); interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(dbTypeEnum.getMpDbType()));
return interceptor; return interceptor;
} }