Browse Source

多数据源优化

Mark 7 years ago
parent
commit
06e1dde8a5

+ 2 - 3
src/main/java/io/renren/datasources/DynamicDataSource.java

@ -3,7 +3,6 @@ package io.renren.datasources;
3 3
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
4 4
5 5
import javax.sql.DataSource;
6
import java.util.HashMap;
7 6
import java.util.Map;
8 7
9 8
/**
@ -15,9 +14,9 @@ import java.util.Map;
15 14
public class DynamicDataSource extends AbstractRoutingDataSource {
16 15
    private static final ThreadLocal<String> contextHolder = new ThreadLocal<>();
17 16
18
    public DynamicDataSource(DataSource defaultTargetDataSource, Map<String, DataSource> targetDataSources) {
17
    public DynamicDataSource(DataSource defaultTargetDataSource, Map<Object, Object> targetDataSources) {
19 18
        super.setDefaultTargetDataSource(defaultTargetDataSource);
20
        super.setTargetDataSources(new HashMap<>(targetDataSources));
19
        super.setTargetDataSources(targetDataSources);
21 20
        super.afterPropertiesSet();
22 21
    }
23 22

+ 1 - 1
src/main/java/io/renren/datasources/DynamicDataSourceConfig.java

@ -34,7 +34,7 @@ public class DynamicDataSourceConfig {
34 34
    @Bean
35 35
    @Primary
36 36
    public DynamicDataSource dataSource(DataSource firstDataSource, DataSource secondDataSource) {
37
        Map<String, DataSource> targetDataSources = new HashMap<>();
37
        Map<Object, Object> targetDataSources = new HashMap<>();
38 38
        targetDataSources.put(DataSourceNames.FIRST, firstDataSource);
39 39
        targetDataSources.put(DataSourceNames.SECOND, secondDataSource);
40 40
        return new DynamicDataSource(firstDataSource, targetDataSources);