|
|
@@ -6,6 +6,13 @@ import java.util.Arrays;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
import javax.sql.DataSource;
|
|
|
+
|
|
|
+import com.baomidou.mybatisplus.annotation.DbType;
|
|
|
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
|
|
|
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
|
|
|
import org.apache.ibatis.io.VFS;
|
|
|
import org.apache.ibatis.session.SqlSessionFactory;
|
|
|
import org.mybatis.spring.SqlSessionFactoryBean;
|
|
|
@@ -26,7 +33,7 @@ import com.ktg.common.utils.StringUtils;
|
|
|
|
|
|
/**
|
|
|
* Mybatis支持*匹配扫描包
|
|
|
- *
|
|
|
+ *
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
@Configuration
|
|
|
@@ -116,7 +123,7 @@ public class MyBatisConfig
|
|
|
@Bean
|
|
|
public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
|
|
|
{
|
|
|
- String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
|
|
|
+ /*String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
|
|
|
String mapperLocations = env.getProperty("mybatis.mapperLocations");
|
|
|
String configLocation = env.getProperty("mybatis.configLocation");
|
|
|
typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
|
|
|
@@ -127,6 +134,34 @@ public class MyBatisConfig
|
|
|
sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
|
|
|
sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
|
|
|
sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
|
|
|
+ return sessionFactory.getObject();*/
|
|
|
+ String typeAliasesPackage = env.getProperty("mybatis-plus.typeAliasesPackage");
|
|
|
+ String mapperLocations = env.getProperty("mybatis-plus.mapperLocations");
|
|
|
+ String configLocation = env.getProperty("mybatis-plus.configLocation");
|
|
|
+ typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
|
|
|
+ VFS.addImplClass(SpringBootVFS.class);
|
|
|
+
|
|
|
+ final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
|
|
|
+ sessionFactory.setDataSource(dataSource);
|
|
|
+ sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
|
|
|
+ sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
|
|
|
+ sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
|
|
|
+
|
|
|
+ //获取mybatis-plus全局配置
|
|
|
+ GlobalConfig globalConfig = GlobalConfigUtils.defaults();
|
|
|
+ globalConfig.setMetaObjectHandler(new MyMetaObjectHandler());
|
|
|
+ GlobalConfig.DbConfig dbConfig = new GlobalConfig.DbConfig();
|
|
|
+ dbConfig.setLogicDeleteField("delFlag");
|
|
|
+ dbConfig.setLogicDeleteValue("2");
|
|
|
+ globalConfig.setDbConfig(dbConfig);
|
|
|
+ sessionFactory.setGlobalConfig(globalConfig);
|
|
|
+
|
|
|
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
|
|
|
+ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
|
|
|
+ sessionFactory.setPlugins(interceptor);
|
|
|
+
|
|
|
return sessionFactory.getObject();
|
|
|
}
|
|
|
-}
|
|
|
+}
|
|
|
+
|
|
|
+
|