wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

 Conflicts:
	ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
This commit is contained in:
疯狂的狮子li 2020-02-25 10:48:50 +08:00
parent 0ba48df61e 9d45070429
commit 87c0074fab
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
View File

@ -13,6 +13,7 @@
//import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
//import org.springframework.core.env.Environment; //import org.springframework.core.env.Environment;
//import org.springframework.core.io.DefaultResourceLoader;
//import org.springframework.core.io.Resource; //import org.springframework.core.io.Resource;
//import org.springframework.core.io.support.PathMatchingResourcePatternResolver; //import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
//import org.springframework.core.io.support.ResourcePatternResolver; //import org.springframework.core.io.support.ResourcePatternResolver;
@ -93,6 +94,7 @@
// { // {
// String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); // String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
// String mapperLocations = env.getProperty("mybatis.mapperLocations"); // String mapperLocations = env.getProperty("mybatis.mapperLocations");
// String configLocation = env.getProperty("mybatis.configLocation");
// typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); // typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
// VFS.addImplClass(SpringBootVFS.class); // VFS.addImplClass(SpringBootVFS.class);
// //
@ -100,6 +102,7 @@
// sessionFactory.setDataSource(dataSource); // sessionFactory.setDataSource(dataSource);
// sessionFactory.setTypeAliasesPackage(typeAliasesPackage); // sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
// sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations)); // sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations));
// sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
// return sessionFactory.getObject(); // return sessionFactory.getObject();
// } // }
//} //}