From 87c0074fab42b124a246dd02c6599386ffdbed3c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 25 二月 2020 10:48:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
index fc9841f..907f04d 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
+++ b/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();
 //    }
 //}
\ No newline at end of file

--
Gitblit v1.9.3