Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:

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

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();
 //    }
 //}