From 74613decc72aa32d82099deda0a8e26e0033970d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Sun, 17 Apr 2022 16:52:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bean=20=E5=90=8D=E7=A7=B0=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/provider/ProviderFactory.java | 4 ++-- .../java/io/dataease/provider/datasource/ApiProvider.java | 2 +- .../main/java/io/dataease/provider/datasource/EsProvider.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/ProviderFactory.java b/backend/src/main/java/io/dataease/provider/ProviderFactory.java index 63df829941..994f9019ec 100644 --- a/backend/src/main/java/io/dataease/provider/ProviderFactory.java +++ b/backend/src/main/java/io/dataease/provider/ProviderFactory.java @@ -38,9 +38,9 @@ public class ProviderFactory implements ApplicationContextAware { DatasourceTypes datasourceType = DatasourceTypes.valueOf(type); switch (datasourceType) { case es: - return context.getBean("es", Provider.class); + return context.getBean("esProviders", Provider.class); case api: - return context.getBean("api", Provider.class); + return context.getBean("apiProvider", Provider.class); default: return context.getBean("jdbc", Provider.class); } diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java index 235ab53072..d8efe83d4a 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -@Service("api") +@Service("apiProvider") public class ApiProvider extends Provider{ diff --git a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java index 421af66520..b26555c93a 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java @@ -25,7 +25,7 @@ import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; -@Service("es") +@Service("esProviders") public class EsProvider extends Provider {