修改数据源类型优先级，先根据方法，再根据类

RuoYi

2020-05-19 41799c10f0c72bfc91e5b79f3e4df6e585cc5715

 ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java

@@ -13,6 +13,7 @@
import org.springframework.context.annotation.Bean;

import org.springframework.context.annotation.Configuration;

import org.springframework.core.env.Environment;

import org.springframework.core.io.DefaultResourceLoader;

import org.springframework.core.io.Resource;

import org.springframework.core.io.support.PathMatchingResourcePatternResolver;

import org.springframework.core.io.support.ResourcePatternResolver;

@@ -93,6 +94,7 @@
    {

        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");

        String mapperLocations = env.getProperty("mybatis.mapperLocations");

        String configLocation = env.getProperty("mybatis.configLocation");

        typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);

        VFS.addImplClass(SpringBootVFS.class);



@@ -100,6 +102,7 @@
        sessionFactory.setDataSource(dataSource);

        sessionFactory.setTypeAliasesPackage(typeAliasesPackage);

        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations));

        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));

        return sessionFactory.getObject();

    }

}