forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

✨ up dynamic-datasource-spring-boot-starter 3.2.0 

. close #I1PW26 #I1PYJ9 up
This commit is contained in:
冷冷 2020-08-03 13:28:47 +08:00
parent f98008cce0
commit 9285874ed5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java
View File

@ -118,13 +118,13 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl<GenDatasourceConfM
@Override @Override
public void addDynamicDataSource(GenDatasourceConf conf) { public void addDynamicDataSource(GenDatasourceConf conf) {
DataSourceProperty dataSourceProperty = new DataSourceProperty(); DataSourceProperty dataSourceProperty = new DataSourceProperty();
dataSourceProperty.setPollName(conf.getName()); dataSourceProperty.setPoolName(conf.getName());
dataSourceProperty.setUrl(conf.getUrl()); dataSourceProperty.setUrl(conf.getUrl());
dataSourceProperty.setUsername(conf.getUsername()); dataSourceProperty.setUsername(conf.getUsername());
dataSourceProperty.setPassword(conf.getPassword()); dataSourceProperty.setPassword(conf.getPassword());
dataSourceProperty.setDriverClassName(DataSourceConstants.DS_DRIVER); dataSourceProperty.setDriverClassName(DataSourceConstants.DS_DRIVER);
DataSource dataSource = dataSourceCreator.createDataSource(dataSourceProperty); DataSource dataSource = dataSourceCreator.createDataSource(dataSourceProperty);
SpringContextHolder.getBean(DynamicRoutingDataSource.class).addDataSource(dataSourceProperty.getPollName(), SpringContextHolder.getBean(DynamicRoutingDataSource.class).addDataSource(dataSourceProperty.getPoolName(),
dataSource); dataSource);
} }

6
pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-cloud-dependencies-parent</artifactId> <artifactId>pig-cloud-dependencies-parent</artifactId>
<version>Hoxton.SR6</version> <version>Hoxton.SR7</version>
</parent> </parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
@ -36,7 +36,7 @@
<properties> <properties>
<spring-boot.version>2.3.2.RELEASE</spring-boot.version> <spring-boot.version>2.3.2.RELEASE</spring-boot.version>
<spring-cloud.version>Hoxton.SR6</spring-cloud.version> <spring-cloud.version>Hoxton.SR7</spring-cloud.version>
<spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version> <spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
@ -46,7 +46,7 @@
<spring-boot-admin.version>2.2.4</spring-boot-admin.version> <spring-boot-admin.version>2.2.4</spring-boot-admin.version>
<hutool.version>5.3.10</hutool.version> <hutool.version>5.3.10</hutool.version>
<mybatis-plus.version>3.3.2</mybatis-plus.version> <mybatis-plus.version>3.3.2</mybatis-plus.version>
<dynamic-ds.version>3.0.0</dynamic-ds.version> <dynamic-ds.version>3.2.0</dynamic-ds.version>
<captcha.version>2.0.0</captcha.version> <captcha.version>2.0.0</captcha.version>
<velocity.version>1.7</velocity.version> <velocity.version>1.7</velocity.version>
<jasypt.version>2.1.0</jasypt.version> <jasypt.version>2.1.0</jasypt.version>