From 3c95d4e2eb78365c48c1ae352e0b83414057e063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=87=E5=81=A5=E9=99=80=E8=9E=BA=E7=8E=8B?= Date: Mon, 1 Nov 2021 09:13:50 +0000 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=B2=A1=E6=9C=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=95=B0=E6=8D=AE=E6=BA=90=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring/boot/starter/MagicAPIAutoConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java index dafdfff4..0e0627ce 100644 --- a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java +++ b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java @@ -491,8 +491,10 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon MagicResourceLoader.addModule(module.getModuleName(), module); }); MagicResourceLoader.addModule(sqlModule.getModuleName(), new DynamicModuleImport(SQLModule.class, context -> { + String dataSourceKey = context.getString(Options.DEFAULT_DATA_SOURCE.getValue()); + if(StringUtils.isEmpty(dataSourceKey)) return new SQLModule(dynamicDataSource); SQLModule newSqlModule = sqlModule.cloneSQLModule(); - newSqlModule.setDataSourceNode(dynamicDataSource.getDataSource(context.getString(Options.DEFAULT_DATA_SOURCE.getValue()))); + newSqlModule.setDataSourceNode(dynamicDataSource.getDataSource(dataSourceKey)); return newSqlModule; })); MagicResourceLoader.getModuleNames().stream().filter(importModules::contains).forEach(moduleName -> { -- Gitee