diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index 29c8269..686a373 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -14,6 +14,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.core.io.DefaultResourceLoader; +import com.github.pagehelper.PageInterceptor; +import com.github.pagehelper.autoconfigure.PageHelperStandardProperties; import com.ruoyi.common.interceptor.mybatis.CreateSqlSessionFactory; import com.ruoyi.common.utils.MybatisUtils; import com.ruoyi.common.utils.StringUtils; @@ -30,7 +32,7 @@ public class MyBatisConfig { @Bean @ConditionalOnProperty(prefix = "createSqlSessionFactory", name = "use", havingValue = "mybatis") - public CreateSqlSessionFactory createSqlSessionFactory() { + public CreateSqlSessionFactory createSqlSessionFactory(PageHelperStandardProperties packageHelperStandardProperties) { return new CreateSqlSessionFactory() { public SqlSessionFactory createSqlSessionFactory(Environment env, DataSource dataSource) throws Exception { String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); @@ -38,13 +40,16 @@ public class MyBatisConfig { String configLocation = env.getProperty("mybatis.configLocation"); typeAliasesPackage = MybatisUtils.setTypeAliasesPackage(typeAliasesPackage); VFS.addImplClass(SpringBootVFS.class); - + final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); sessionFactory.setDataSource(dataSource); sessionFactory.setTypeAliasesPackage(typeAliasesPackage); sessionFactory.setMapperLocations( MybatisUtils.resolveMapperLocations(StringUtils.split(mapperLocations, ","))); sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); + PageInterceptor interceptor = new PageInterceptor(); + interceptor.setProperties(packageHelperStandardProperties.getProperties()); + sessionFactory.addPlugins(interceptor); return sessionFactory.getObject(); } }; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java index 5377749..77af5a5 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java @@ -31,7 +31,6 @@ public class SqlSessionFactoryConfig { for (Map.Entry entry : targetDataSources.entrySet()) { SqlSessionFactory sessionFactory = createSqlSessionFactory.createSqlSessionFactory(env, entry.getValue()); sqlSessionFactoryMap.put(entry.getKey(), sessionFactory); - // 应对热重载的特殊处理 Object ret = com.atomikos.icatch.config.Configuration.removeResource(entry.getKey()); if (ret != null) {