1.修复多数据源兼容错误

master
董哲奇 1 year ago
parent 88f184a408
commit f647391f51

@ -25,9 +25,7 @@ import java.util.Properties;
@EnableAsync @EnableAsync
@EnableMPP @EnableMPP
@SpringBootApplication(exclude = { @SpringBootApplication(exclude = {
DataSourceAutoConfiguration.class, DataSourceAutoConfiguration.class} )
HibernateJpaAutoConfiguration.class,
DataSourceTransactionManagerAutoConfiguration.class} )
@EnableSwagger2 @EnableSwagger2
@EnableTransactionManagement @EnableTransactionManagement
public class GjErpApplication { public class GjErpApplication {

@ -54,7 +54,9 @@ public class JapConfig {
@Bean @Bean
public PlatformTransactionManager manTransactionManager() { //4 public PlatformTransactionManager manTransactionManager() { //4
EntityManagerFactory factory = manEntityManagerFactory().getObject(); EntityManagerFactory factory = manEntityManagerFactory().getObject();
return new JpaTransactionManager(factory); JpaTransactionManager jpaTransactionManager = new JpaTransactionManager(factory);
System.out.println(jpaTransactionManager.isNestedTransactionAllowed());
return jpaTransactionManager;
} }
@Bean @Bean

@ -33,9 +33,9 @@ public class MyBatisPlusConfigJiuZhou {
configuration.setMapUnderscoreToCamelCase(true); configuration.setMapUnderscoreToCamelCase(true);
sqlSessionFactory.setConfiguration(configuration); sqlSessionFactory.setConfiguration(configuration);
sqlSessionFactory.setTypeAliasesPackage("com.dsic.gj_erp.bean"); sqlSessionFactory.setTypeAliasesPackage("com.dsic.gj_erp.bean.jiuzhou");
sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver(). sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().
getResources("classpath:mappers/*/*.xml")); getResources("classpath:jiuzhoumappers/*.xml"));
sqlSessionFactory.setPlugins(new PaginationInterceptor()); sqlSessionFactory.setPlugins(new PaginationInterceptor());
sqlSessionFactory.setGlobalConfig(globalConfig(mppSqlInjector)); sqlSessionFactory.setGlobalConfig(globalConfig(mppSqlInjector));

@ -19,7 +19,7 @@ public class MyPhysicalNamingStrategy implements PhysicalNamingStrategy {
@Override @Override
public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment jdbcEnvironment) { public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment jdbcEnvironment) {
return name; return Identifier.toIdentifier(StringUtils.camelToUnderline(name.getText()));
} }
@Override @Override

@ -4,4 +4,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.jiuzhou.Sljh; import com.dsic.gj_erp.bean.jiuzhou.Sljh;
public interface SljhMapper extends BaseMapper<Sljh> { public interface SljhMapper extends BaseMapper<Sljh> {
} }

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.jiuzhoumapper.SljhMapper">
</mapper>
Loading…
Cancel
Save