diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java deleted file mode 100644 index 907f04dd..00000000 --- a/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ /dev/null @@ -1,108 +0,0 @@ -//package com.ruoyi.framework.config; -// -//import java.io.IOException; -//import java.util.ArrayList; -//import java.util.HashSet; -//import java.util.List; -//import javax.sql.DataSource; -//import org.apache.ibatis.io.VFS; -//import org.apache.ibatis.session.SqlSessionFactory; -//import org.mybatis.spring.SqlSessionFactoryBean; -//import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; -//import org.springframework.beans.factory.annotation.Autowired; -//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; -//import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -//import org.springframework.core.type.classreading.MetadataReader; -//import org.springframework.core.type.classreading.MetadataReaderFactory; -//import org.springframework.util.ClassUtils; -// -///** -// * Mybatis支持*匹配扫描包 -// * -// * @author ruoyi -// */ -//@Configuration -//public class MyBatisConfig -//{ -// @Autowired -// private Environment env; -// -// static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; -// -// public static String setTypeAliasesPackage(String typeAliasesPackage) -// { -// ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); -// MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); -// List allResult = new ArrayList(); -// try -// { -// for (String aliasesPackage : typeAliasesPackage.split(",")) -// { -// List result = new ArrayList(); -// aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX -// + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; -// Resource[] resources = resolver.getResources(aliasesPackage); -// if (resources != null && resources.length > 0) -// { -// MetadataReader metadataReader = null; -// for (Resource resource : resources) -// { -// if (resource.isReadable()) -// { -// metadataReader = metadataReaderFactory.getMetadataReader(resource); -// try -// { -// result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); -// } -// catch (ClassNotFoundException e) -// { -// e.printStackTrace(); -// } -// } -// } -// } -// if (result.size() > 0) -// { -// HashSet hashResult = new HashSet(result); -// allResult.addAll(hashResult); -// } -// } -// if (allResult.size() > 0) -// { -// typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); -// } -// else -// { -// throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); -// } -// } -// catch (IOException e) -// { -// e.printStackTrace(); -// } -// return typeAliasesPackage; -// } -// -// @Bean -// public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception -// { -// 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); -// -// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); -// 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 diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml index 9073aa75..b5631c7a 100644 --- a/ruoyi/src/main/resources/application.yml +++ b/ruoyi/src/main/resources/application.yml @@ -67,15 +67,6 @@ token: secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期(默认30分钟) expireTime: 30 - -## MyBatis配置 -#mybatis: -# # 搜索指定包别名 -# typeAliasesPackage: com.ruoyi.project.**.domain -# # 配置mapper的扫描,找到所有的mapper.xml映射文件 -# mapperLocations: classpath*:mybatis/**/*Mapper.xml -# # 加载全局的配置文件 -# configLocation: classpath:mybatis/mybatis-config.xml # MyBatis配置 mybatis-plus: diff --git a/ruoyi/src/main/resources/mybatis/mybatis-config.xml b/ruoyi/src/main/resources/mybatis/mybatis-config.xml deleted file mode 100644 index e8b52be8..00000000 --- a/ruoyi/src/main/resources/mybatis/mybatis-config.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - -