From 9285874ed5e304c29c5888e63dcaefc3de9b4cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Mon, 3 Aug 2020 13:28:47 +0800
Subject: [PATCH] :sparkles: up dynamic-datasource-spring-boot-starter 3.2.0 .
 close #I1PW26 #I1PYJ9 up

---
 .../codegen/service/impl/GenDatasourceConfServiceImpl.java  | 4 ++--
 pom.xml                                                     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java
index b53a0079..83a895d0 100755
--- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java
+++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java
@@ -118,13 +118,13 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl<GenDatasourceConfM
 	@Override
 	public void addDynamicDataSource(GenDatasourceConf conf) {
 		DataSourceProperty dataSourceProperty = new DataSourceProperty();
-		dataSourceProperty.setPollName(conf.getName());
+		dataSourceProperty.setPoolName(conf.getName());
 		dataSourceProperty.setUrl(conf.getUrl());
 		dataSourceProperty.setUsername(conf.getUsername());
 		dataSourceProperty.setPassword(conf.getPassword());
 		dataSourceProperty.setDriverClassName(DataSourceConstants.DS_DRIVER);
 		DataSource dataSource = dataSourceCreator.createDataSource(dataSourceProperty);
-		SpringContextHolder.getBean(DynamicRoutingDataSource.class).addDataSource(dataSourceProperty.getPollName(),
+		SpringContextHolder.getBean(DynamicRoutingDataSource.class).addDataSource(dataSourceProperty.getPoolName(),
 				dataSource);
 	}
 
diff --git a/pom.xml b/pom.xml
index 99f6ef9f..ba403e7a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-cloud-dependencies-parent</artifactId>
-		<version>Hoxton.SR6</version>
+		<version>Hoxton.SR7</version>
 	</parent>
 
 	<groupId>com.pig4cloud</groupId>
@@ -36,7 +36,7 @@
 
 	<properties>
 		<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>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -46,7 +46,7 @@
 		<spring-boot-admin.version>2.2.4</spring-boot-admin.version>
 		<hutool.version>5.3.10</hutool.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>
 		<velocity.version>1.7</velocity.version>
 		<jasypt.version>2.1.0</jasypt.version>