Skip to content

Commit 7521093

Browse files
committed
调整自动化配置条件限制
1 parent 71b977a commit 7521093

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/enhance/ApiBootMyBatisEnhanceAutoConfiguration.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959

6060
/**
6161
* ApiBoot Mybatis Enhance Auto Configuration
62+
*
6263
* @author:恒宇少年 - 于起宇
6364
* <p>
6465
* DateTime:2019-04-25 15:16
@@ -68,7 +69,7 @@
6869
* GitHub:https://github.com/hengboy
6970
*/
7071
@org.springframework.context.annotation.Configuration
71-
@ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
72+
@ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class, MapperFactoryBean.class})
7273
@ConditionalOnBean(DataSource.class)
7374
@EnableConfigurationProperties(ApiBootMyBatisEnhanceProperties.class)
7475
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
@@ -87,10 +88,10 @@ public class ApiBootMyBatisEnhanceAutoConfiguration {
8788
private final List<ConfigurationCustomizer> configurationCustomizers;
8889

8990
public ApiBootMyBatisEnhanceAutoConfiguration(ApiBootMyBatisEnhanceProperties properties,
90-
ObjectProvider<Interceptor[]> interceptorsProvider,
91-
ResourceLoader resourceLoader,
92-
ObjectProvider<DatabaseIdProvider> databaseIdProvider,
93-
ObjectProvider<List<ConfigurationCustomizer>> configurationCustomizersProvider) {
91+
ObjectProvider<Interceptor[]> interceptorsProvider,
92+
ResourceLoader resourceLoader,
93+
ObjectProvider<DatabaseIdProvider> databaseIdProvider,
94+
ObjectProvider<List<ConfigurationCustomizer>> configurationCustomizersProvider) {
9495
this.properties = properties;
9596
this.interceptors = interceptorsProvider.getIfAvailable();
9697
this.resourceLoader = resourceLoader;

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/pageable/ApiBootMybatisPageableAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
@Configuration
4747
@ConditionalOnBean(SqlSessionFactory.class)
4848
@EnableConfigurationProperties(ApiBootMyBatisPageableProperties.class)
49-
@ConditionalOnClass(DataSourceAutoConfiguration.class)
49+
@ConditionalOnClass(MyBatisExecutePageableInterceptor.class)
5050
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
5151
public class ApiBootMybatisPageableAutoConfiguration {
5252
/**

0 commit comments

Comments
 (0)