admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

v1.3.3 release (^.^)YYa!!

Browse Source
This commit is contained in:
开源海哥 2023-05-30 17:38:04 +08:00
parent 7bf2328127
commit 718c430421
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSqlSessionFactoryBean.java
View File

@ -19,7 +19,7 @@ import com.mybatisflex.core.FlexConsts;
import com.mybatisflex.core.datasource.FlexDataSource; import com.mybatisflex.core.datasource.FlexDataSource;
import com.mybatisflex.core.mybatis.FlexConfiguration; import com.mybatisflex.core.mybatis.FlexConfiguration;
import com.mybatisflex.core.mybatis.FlexSqlSessionFactoryBuilder; import com.mybatisflex.core.mybatis.FlexSqlSessionFactoryBuilder;
import com.mybatisflex.core.mybatis.FlexXMLConfigBuilder; import org.apache.ibatis.builder.xml.XMLConfigBuilder;
import org.apache.ibatis.builder.xml.XMLMapperBuilder; import org.apache.ibatis.builder.xml.XMLMapperBuilder;
import org.apache.ibatis.cache.Cache; import org.apache.ibatis.cache.Cache;
import org.apache.ibatis.executor.ErrorContext; import org.apache.ibatis.executor.ErrorContext;
@ -492,8 +492,7 @@ public class FlexSqlSessionFactoryBean extends SqlSessionFactoryBean
final Configuration targetConfiguration; final Configuration targetConfiguration;
// XMLConfigBuilder xmlConfigBuilder = null; XMLConfigBuilder xmlConfigBuilder = null;
FlexXMLConfigBuilder xmlConfigBuilder = null;
if (this.configuration != null) { if (this.configuration != null) {
targetConfiguration = this.configuration; targetConfiguration = this.configuration;
if (targetConfiguration.getVariables() == null) { if (targetConfiguration.getVariables() == null) {
@ -502,12 +501,11 @@ public class FlexSqlSessionFactoryBean extends SqlSessionFactoryBean
targetConfiguration.getVariables().putAll(this.configurationProperties); targetConfiguration.getVariables().putAll(this.configurationProperties);
} }
} else if (this.configLocation != null) { } else if (this.configLocation != null) {
// xmlConfigBuilder = new XMLConfigBuilder(this.configLocation.getInputStream(), null, this.configurationProperties); xmlConfigBuilder = new XMLConfigBuilder(FlexConfiguration.class, this.configLocation.getInputStream(), null, this.configurationProperties);
xmlConfigBuilder = new FlexXMLConfigBuilder(this.configLocation.getInputStream(), null, this.configurationProperties);
targetConfiguration = xmlConfigBuilder.getConfiguration(); targetConfiguration = xmlConfigBuilder.getConfiguration();
} else { } else {
LOGGER.debug( LOGGER.debug(
() -> "Property 'configuration' or 'configLocation' not specified, using default MyBatis Configuration"); () -> "Property 'configuration' or 'configLocation' not specified, using default Flex Configuration");
// targetConfiguration = new Configuration(); // targetConfiguration = new Configuration();
targetConfiguration = new FlexConfiguration(); targetConfiguration = new FlexConfiguration();
Optional.ofNullable(this.configurationProperties).ifPresent(targetConfiguration::setVariables); Optional.ofNullable(this.configurationProperties).ifPresent(targetConfiguration::setVariables);