Commit 94641753 authored by 吴琼's avatar 吴琼

edit

parent ab178abd
...@@ -2,7 +2,10 @@ package cn.quantgroup.customer.config.data; ...@@ -2,7 +2,10 @@ package cn.quantgroup.customer.config.data;
import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.DependsOn;
...@@ -21,7 +24,9 @@ import javax.sql.DataSource; ...@@ -21,7 +24,9 @@ import javax.sql.DataSource;
import java.util.Properties; import java.util.Properties;
@Configuration @Configuration
@EnableJpaRepositories(basePackages = "cn.quantgroup.customer.moice.repo") //@EntityScan(basePackages = {"cn.quantgroup.customer.moice.model"})
@EnableJpaRepositories(basePackages = "cn.quantgroup.customer.moice.repo",
entityManagerFactoryRef = "xyqbEntityManagerFactory", transactionManagerRef = "xyqbTransactionManager")
@EnableTransactionManagement @EnableTransactionManagement
public class DbCashConfig { public class DbCashConfig {
...@@ -37,13 +42,13 @@ public class DbCashConfig { ...@@ -37,13 +42,13 @@ public class DbCashConfig {
@Value("${data.mysql.cash.max-pool-size}") @Value("${data.mysql.cash.max-pool-size}")
private Integer maxPoolSize; private Integer maxPoolSize;
@Bean @Bean(name = "xyqbEntityManagerFactory")
@DependsOn(value = "dataSource") @DependsOn(value = "xyqbDataSource")
public EntityManagerFactory entityManagerFactory(DataSource dataSource) { public EntityManagerFactory xyqbEntityManagerFactory(@Qualifier(value = "xyqbDataSource") DataSource xyqbDataSource) {
LocalContainerEntityManagerFactoryBean entityManager = new LocalContainerEntityManagerFactoryBean(); LocalContainerEntityManagerFactoryBean entityManager = new LocalContainerEntityManagerFactoryBean();
entityManager.setDataSource(dataSource); entityManager.setDataSource(xyqbDataSource);
entityManager.setPackagesToScan("cn.quantgroup.customer"); entityManager.setPackagesToScan("cn.quantgroup.customer.moice.model");
entityManager.setPersistenceUnitName("dataSource"); entityManager.setPersistenceUnitName("xyqbDataSource");
Properties properties = new Properties(); Properties properties = new Properties();
properties.put("hibernate.jdbc.batch_size", 30); properties.put("hibernate.jdbc.batch_size", 30);
properties.put("hibernate.order_inserts", true); properties.put("hibernate.order_inserts", true);
...@@ -54,9 +59,8 @@ public class DbCashConfig { ...@@ -54,9 +59,8 @@ public class DbCashConfig {
return entityManager.getObject(); return entityManager.getObject();
} }
@Bean @Bean(name = "xyqbDataSource")
@Primary public DataSource xyqbDataSource() {
public DataSource dataSource() {
HikariConfig config = new HikariConfig(); HikariConfig config = new HikariConfig();
config.setJdbcUrl(jdbcUrl); config.setJdbcUrl(jdbcUrl);
config.setPassword(password); config.setPassword(password);
...@@ -79,10 +83,11 @@ public class DbCashConfig { ...@@ -79,10 +83,11 @@ public class DbCashConfig {
return hibernateJpaVendorAdapter; return hibernateJpaVendorAdapter;
} }
@Bean @Bean(name = "xyqbTransactionManager")
public PlatformTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) { public PlatformTransactionManager xyqbTransactionManager(@Autowired @Qualifier(value = "xyqbEntityManagerFactory")
EntityManagerFactory xyqbEntityManagerFactory) {
JpaTransactionManager transactionManager = new JpaTransactionManager(); JpaTransactionManager transactionManager = new JpaTransactionManager();
transactionManager.setEntityManagerFactory(entityManagerFactory); transactionManager.setEntityManagerFactory(xyqbEntityManagerFactory);
return transactionManager; return transactionManager;
} }
......
...@@ -2,7 +2,9 @@ package cn.quantgroup.customer.config.data; ...@@ -2,7 +2,9 @@ package cn.quantgroup.customer.config.data;
import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.DependsOn;
...@@ -21,7 +23,9 @@ import javax.sql.DataSource; ...@@ -21,7 +23,9 @@ import javax.sql.DataSource;
import java.util.Properties; import java.util.Properties;
@Configuration @Configuration
@EnableJpaRepositories(basePackages = "cn.quantgroup.customer.repo") //@EntityScan(basePackages = {"cn.quantgroup.customer.entity"})
@EnableJpaRepositories(basePackages = "cn.quantgroup.customer.repo",
transactionManagerRef = "risktTransactionManager", entityManagerFactoryRef = "riskEntityManagerFactory")
@EnableTransactionManagement @EnableTransactionManagement
public class DbConfig { public class DbConfig {
...@@ -37,13 +41,15 @@ public class DbConfig { ...@@ -37,13 +41,15 @@ public class DbConfig {
@Value("${data.mysql.max-pool-size}") @Value("${data.mysql.max-pool-size}")
private Integer maxPoolSize; private Integer maxPoolSize;
@Bean
@DependsOn(value = "dataSource") @Primary
public EntityManagerFactory entityManagerFactory(DataSource dataSource) { @Bean(name = "riskEntityManagerFactory")
@DependsOn(value = "riskDataSource")
public EntityManagerFactory riskEntityManagerFactory(@Qualifier(value = "riskDataSource") DataSource dataSource) {
LocalContainerEntityManagerFactoryBean entityManager = new LocalContainerEntityManagerFactoryBean(); LocalContainerEntityManagerFactoryBean entityManager = new LocalContainerEntityManagerFactoryBean();
entityManager.setDataSource(dataSource); entityManager.setDataSource(dataSource);
entityManager.setPackagesToScan("cn.quantgroup.customer"); entityManager.setPackagesToScan("cn.quantgroup.customer.entity");
entityManager.setPersistenceUnitName("dataSource"); entityManager.setPersistenceUnitName("riskDataSource");
Properties properties = new Properties(); Properties properties = new Properties();
properties.put("hibernate.jdbc.batch_size", 30); properties.put("hibernate.jdbc.batch_size", 30);
properties.put("hibernate.order_inserts", true); properties.put("hibernate.order_inserts", true);
...@@ -54,9 +60,9 @@ public class DbConfig { ...@@ -54,9 +60,9 @@ public class DbConfig {
return entityManager.getObject(); return entityManager.getObject();
} }
@Bean
@Primary @Primary
public DataSource dataSource() { @Bean(name = "riskDataSource")
public DataSource riskDataSource() {
HikariConfig config = new HikariConfig(); HikariConfig config = new HikariConfig();
config.setJdbcUrl(jdbcUrl); config.setJdbcUrl(jdbcUrl);
config.setPassword(password); config.setPassword(password);
...@@ -79,8 +85,10 @@ public class DbConfig { ...@@ -79,8 +85,10 @@ public class DbConfig {
return hibernateJpaVendorAdapter; return hibernateJpaVendorAdapter;
} }
@Bean
public PlatformTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) { @Primary
@Bean(name = "risktTransactionManager")
public PlatformTransactionManager risktTransactionManager(@Qualifier(value = "riskEntityManagerFactory") EntityManagerFactory entityManagerFactory) {
JpaTransactionManager transactionManager = new JpaTransactionManager(); JpaTransactionManager transactionManager = new JpaTransactionManager();
transactionManager.setEntityManagerFactory(entityManagerFactory); transactionManager.setEntityManagerFactory(entityManagerFactory);
return transactionManager; return transactionManager;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment