diff --git a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java index c06ea6d..f187e5b 100644 --- a/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java +++ b/src/main/java/com/chinaweal/youfool/prj/config/PrjDataSource.java @@ -3,6 +3,7 @@ package com.chinaweal.youfool.prj.config; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.chinaweal.youfool.framework.springboot.mybatis.plus.CommonMetaObjectHandler; +import org.apache.commons.lang3.ArrayUtils; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -24,7 +25,7 @@ public class PrjDataSource { @Resource private CommonMetaObjectHandler commonMetaObjectHandler; - @Bean(name = "sqlSessionFactory") + @Bean @Primary public MybatisSqlSessionFactoryBean sqlSessionFactory(DataSource dataSource) throws Exception { MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean(); @@ -33,7 +34,10 @@ public class PrjDataSource { globalConfig.setMetaObjectHandler(commonMetaObjectHandler); bean.setGlobalConfig(globalConfig); bean.setConfigLocation(new ClassPathResource("mybatis/mybatis-config.xml")); - bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mybatis/mapper/**/*.xml")); + org.springframework.core.io.Resource[] prjResources = new PathMatchingResourcePatternResolver().getResources("classpath*:mybatis/mapper/**/*.xml"); + org.springframework.core.io.Resource[] cmsResources = new PathMatchingResourcePatternResolver().getResources("classpath*:cms/mybatis/mapper/**/*.xml"); + org.springframework.core.io.Resource[] resources = ArrayUtils.addAll(prjResources, cmsResources); + bean.setMapperLocations(resources); return bean; } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9d21fb4..19dd24f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,7 @@ logging: root: info spring: profiles: - active: @profiles.active@ + active: dev application: name: youfool-prj-springboot-template datasource: