From 7abbec08fe73dd7332e9eb1b18ad96ebf5bd2b8c Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 1 Jun 2021 22:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E6=95=B4=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/db/flyway/FlywayInitListener.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java index bfc5e399b..aba6b89c7 100644 --- a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java +++ b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java @@ -59,14 +59,16 @@ public class FlywayInitListener extends ContextInitializedListener implements Or String dataSourceUrl = environment.getProperty("spring.datasource.url"); String dataSourceUsername = environment.getProperty("spring.datasource.username"); String dataSourcePassword = environment.getProperty("spring.datasource.password"); + // 判断是否开启 sharding jdbc - Boolean isEnableShardingDb = environment.getProperty("spring.shardingsphere.enabled", Boolean.class); - if (ObjectUtil.isNotNull(isEnableShardingDb) && isEnableShardingDb){ - //读取 sharding jdbc 主库配置 - dataSourceUrl = environment.getProperty("spring.shardingsphere.datasource.m0.url"); - dataSourceUsername = environment.getProperty("spring.shardingsphere.datasource.m0.username"); - dataSourcePassword = environment.getProperty("spring.shardingsphere.datasource.m0.password"); - driverClassName = environment.getProperty("spring.shardingsphere.datasource.m0.driver-class-name"); + Boolean enableSharding = environment.getProperty("spring.shardingsphere.enabled", Boolean.class); + + // 如果开启了sharding jdbc，则读取 sharding jdbc 主库配置 + if (ObjectUtil.isNotNull(enableSharding) && enableSharding) { + driverClassName = environment.getProperty("spring.shardingsphere.datasource.master.driver-class-name"); + dataSourceUrl = environment.getProperty("spring.shardingsphere.datasource.master.url"); + dataSourceUsername = environment.getProperty("spring.shardingsphere.datasource.master.username"); + dataSourcePassword = environment.getProperty("spring.shardingsphere.datasource.master.password"); } // flyway的配置