From 6b328735af7a29c14dcd23fc44f00c28fb6edd5c Mon Sep 17 00:00:00 2001 From: vran Date: Sat, 7 May 2022 10:06:10 +0800 Subject: [PATCH] fix: properties not work when use custom driver (#150) * fix: properties not work when use custom driver * fix: checkstyle --- .../connection/CustomDatabaseConnectionFactory.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java b/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java index 3358a2e..a1c0a4b 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java +++ b/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java @@ -71,14 +71,17 @@ public class CustomDatabaseConnectionFactory implements DatabaseConnectionFactor throw DomainErrors.CONNECT_DATABASE_FAILED.exception("驱动初始化异常：" + e.getMessage()); } + Properties info = new Properties(); + info.put("user", context.getUsername()); + info.put("password", context.getPassword()); + if (context.getProperties() != null && !context.getProperties().isEmpty()) { + info.putAll(context.getProperties()); + } String urlPattern = type.getUrlPattern(); String jdbcUrl = urlPattern.replace("{{jdbc.protocol}}", type.getJdbcProtocol()) .replace("{{db.url}}", context.getUrl()) .replace("{{db.name}}", context.getDatabaseName()) .replace("{{db.schema}}", context.getSchemaName()); - Properties info = new Properties(); - info.put("user", context.getUsername()); - info.put("password", context.getPassword()); return driver.connect(jdbcUrl, info); }