Commit a7c692be by 韩兵

add: 调整配置值

parent 173a7936
Pipeline #75080 failed with stages
in 32 seconds
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
<commons.lang.version>2.4</commons.lang.version> <commons.lang.version>2.4</commons.lang.version>
<des.version>1.0.2-SNAPSHOT</des.version> <des.version>1.0.2-SNAPSHOT</des.version>
<mapstruct.version>1.3.1.Final</mapstruct.version> <mapstruct.version>1.3.1.Final</mapstruct.version>
<pandora.version>1.1.0-SNAPSHOT</pandora.version>
</properties> </properties>
<!-- 子模块可选依赖 --> <!-- 子模块可选依赖 -->
...@@ -185,12 +184,6 @@ ...@@ -185,12 +184,6 @@
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis.spring.boot.starter.version}</version> <version>${mybatis.spring.boot.starter.version}</version>
</dependency> </dependency>
<!--引入潘多拉-->
<dependency>
<groupId>com.netease.yanxuan</groupId>
<artifactId>pandora</artifactId>
<version>${pandora.version}</version>
</dependency>
<!-- store-redis --> <!-- store-redis -->
<dependency> <dependency>
......
...@@ -26,10 +26,6 @@ ...@@ -26,10 +26,6 @@
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.netease.yanxuan</groupId>
<artifactId>pandora</artifactId>
</dependency>
<!--store-redis--> <!--store-redis-->
<dependency> <dependency>
......
package com.netease.mail.yanxuan.change.dal.config; package com.netease.mail.yanxuan.change.dal.config;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; //import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.google.common.collect.ImmutableSet; //import com.google.common.collect.ImmutableSet;
import com.netease.yanxuan.pandora.DataSourceRefresher; //import com.netease.yanxuan.pandora.DataSourceRefresher;
import com.netease.yanxuan.pandora.spring.annotation.EnableDataSourceRefresh; //import com.netease.yanxuan.pandora.spring.annotation.EnableDataSourceRefresh;
import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.dbcp.BasicDataSource;
import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.SqlSessionFactoryBean;
...@@ -28,24 +28,24 @@ import java.util.Set; ...@@ -28,24 +28,24 @@ import java.util.Set;
*/ */
@Configuration @Configuration
@EnableTransactionManagement @EnableTransactionManagement
@EnableApolloConfig("db-public") //@EnableApolloConfig("db-public")
@EnableDataSourceRefresh //@EnableDataSourceRefresh
@MapperScan(basePackages = "com.netease.mail.yanxuan.change.dal.mapper", sqlSessionFactoryRef = "sqlSessionFactoryBean") @MapperScan(basePackages = "com.netease.mail.yanxuan.change.dal.mapper", sqlSessionFactoryRef = "sqlSessionFactoryBean")
public class DataSourceConfiguration { public class DataSourceConfiguration {
@Autowired @Autowired
private DrmDBConfig drmDBConfig; private DrmDBConfig drmDBConfig;
/** // /**
* pandora热切换数据源 // * pandora热切换数据源
* */ // * */
@Bean // @Bean
public DataSourceRefresher dataSourceRefresher() { // public DataSourceRefresher dataSourceRefresher() {
DataSourceRefresher dataSourceRefresher = new DataSourceRefresher("db-public"); // DataSourceRefresher dataSourceRefresher = new DataSourceRefresher("db-public");
Set<String> dataSource = ImmutableSet.of("db.url", "db.driverClassName", "db.username", "db.password"); // Set<String> dataSource = ImmutableSet.of("db.url", "db.driverClassName", "db.username", "db.password");
dataSourceRefresher.bindDataSourceWithPropertyKey("dataSource", dataSource); // dataSourceRefresher.bindDataSourceWithPropertyKey("dataSource", dataSource);
return dataSourceRefresher; // return dataSourceRefresher;
} // }
/** /**
* 数据源 * 数据源
......
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