分页-bug修复
This commit is contained in:
parent
fe162750b1
commit
3da20f9c9d
@ -2,6 +2,7 @@ package com.zhgd.config;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||||
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
|
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
|
||||||
|
import com.wflow.config.MyBatisPlusConfig;
|
||||||
import org.apache.ibatis.logging.stdout.StdOutImpl;
|
import org.apache.ibatis.logging.stdout.StdOutImpl;
|
||||||
import org.apache.ibatis.session.SqlSessionFactory;
|
import org.apache.ibatis.session.SqlSessionFactory;
|
||||||
import org.mybatis.spring.SqlSessionTemplate;
|
import org.mybatis.spring.SqlSessionTemplate;
|
||||||
@ -16,11 +17,14 @@ import org.springframework.context.annotation.Primary;
|
|||||||
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
|
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
|
||||||
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
|
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@MapperScan(basePackages = {"com.zhgd.*.*.*.*.mapper", "com.zhgd.*.*.*.mapper"}, sqlSessionTemplateRef = "db1SqlSessionTemplate")
|
@MapperScan(basePackages = {"com.zhgd.*.*.*.*.mapper", "com.zhgd.*.*.*.mapper"}, sqlSessionTemplateRef = "db1SqlSessionTemplate")
|
||||||
public class DataSourceOneConfig {
|
public class DataSourceOneConfig {
|
||||||
|
@Resource
|
||||||
|
private MybatisPlusConfig mybatisPlusConfig;
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConfigurationProperties(prefix = "spring.datasource.db1")
|
@ConfigurationProperties(prefix = "spring.datasource.db1")
|
||||||
@ -39,6 +43,7 @@ public class DataSourceOneConfig {
|
|||||||
configuration.setLogImpl(StdOutImpl.class);
|
configuration.setLogImpl(StdOutImpl.class);
|
||||||
bean.setConfiguration(configuration);
|
bean.setConfiguration(configuration);
|
||||||
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:com/zhgd/xmgl/**/*.xml"));
|
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:com/zhgd/xmgl/**/*.xml"));
|
||||||
|
bean.setPlugins(mybatisPlusConfig.mybatisPlusInterceptor());
|
||||||
return bean.getObject();
|
return bean.getObject();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -15,11 +15,14 @@ import org.springframework.context.annotation.Primary;
|
|||||||
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
|
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
|
||||||
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
|
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@MapperScan(basePackages = "com.wflow.mapper", sqlSessionTemplateRef = "sqlSessionTemplate2")
|
@MapperScan(basePackages = "com.wflow.mapper", sqlSessionTemplateRef = "sqlSessionTemplate2")
|
||||||
public class DataSourceTwoConfig {
|
public class DataSourceTwoConfig {
|
||||||
|
@Resource
|
||||||
|
private MybatisPlusConfig mybatisPlusConfig;
|
||||||
|
|
||||||
@Primary
|
@Primary
|
||||||
@Bean(name = "dataSource2")
|
@Bean(name = "dataSource2")
|
||||||
@ -39,6 +42,7 @@ public class DataSourceTwoConfig {
|
|||||||
configuration.setLogImpl(StdOutImpl.class);
|
configuration.setLogImpl(StdOutImpl.class);
|
||||||
bean.setConfiguration(configuration);
|
bean.setConfiguration(configuration);
|
||||||
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mapper/*.xml"));
|
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mapper/*.xml"));
|
||||||
|
bean.setPlugins(mybatisPlusConfig.mybatisPlusInterceptor());
|
||||||
return bean.getObject();
|
return bean.getObject();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user