From 19b0d32d11b824e3bcbb1206e35b13d626deae65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Tue, 19 Feb 2019 19:03:00 +0800 Subject: [PATCH] :bug: Fixing a bug.ConditionalOnClass error MybatisPlusConfig to DataSource --- .../pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java index 462716e04..2ba888381 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java @@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; import com.pig4cloud.pigx.common.data.datascope.DataScopeInterceptor; import com.pig4cloud.pigx.common.data.tenant.PigxTenantHandler; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -39,7 +39,7 @@ import java.util.List; * @date 2017/10/29 */ @Configuration -@ConditionalOnClass(MybatisPlusConfig.class) +@ConditionalOnBean(DataSource.class) @MapperScan("com.pig4cloud.pigx.*.mapper") public class MybatisPlusConfig {