From d81b53910e88167ae65e19bb1419ecfa4ff7cd39 Mon Sep 17 00:00:00 2001 From: xinzirun Date: Sat, 21 Sep 2024 12:01:34 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8Drun()=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../many/datasource/ManyDataSource.java | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java index 3285ce6..08f2300 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java @@ -91,29 +91,17 @@ public class ManyDataSource implements ApplicationRunner { */ @Bean public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) { - List sourceInfoList = dataSourceInfoList().stream() + Map dataSourceMap = dataSourceInfoList().stream() .map(entInfo -> DataSourceInfo.hostAndPortBuild( entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort() ) - ).toList(); - - Map dataSourceMap = sourceInfoList.stream().collect(Collectors.toMap( - dataSourceInfo -> dataSourceInfo.getKey(), - dataSourceInfo -> druidDataSourceFactory.create(dataSourceInfo) - )); -// Map dataSourceMap = dataSourceInfoList().stream() -// .map(entInfo -> DataSourceInfo.hostAndPortBuild( -// entInfo.getEntCode(), -// entInfo.getIp(), -// entInfo.getPort() -// ) -// ) -// .collect(Collectors.toMap( -// dataSourceInfo -> dataSourceInfo.getKey(), -// dataSourceInfo -> druidDataSourceFactory.create(dataSourceInfo) -// )); + ) + .collect(Collectors.toMap( + dataSourceInfo -> dataSourceInfo.getKey(), + dataSourceInfo -> druidDataSourceFactory.create(dataSourceInfo) + )); //设置动态数据源 DynamicDataSource dynamicDataSource = new DynamicDataSource();