diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/config/ConnectionConfig.java b/hutool-db/src/main/java/org/dromara/hutool/db/config/ConnectionConfig.java index 50dceb1aa..84d4ea9bd 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/config/ConnectionConfig.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/config/ConnectionConfig.java @@ -186,4 +186,16 @@ public class ConnectionConfig> { this.poolProps.setProperty(key, value); return (T) this; } + + @Override + public String toString() { + return "ConnectionConfig{" + + "driver='" + driver + '\'' + + ", url='" + url + '\'' + + ", user='" + user + '\'' + + ", pass='****" + '\'' + + ", connProps=" + connProps + + ", poolProps=" + poolProps + + '}'; + } } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java index e90a5ea7c..93b7f829a 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java @@ -56,7 +56,7 @@ public class C3p0DSFactory implements DSFactory { // 连接配置 final Properties connProps = config.getConnProps(); if(MapUtil.isNotEmpty(connProps)){ - ds.setProperties(connProps); + ds.getProperties().putAll(connProps); } return ds; diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/ds/DsTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/ds/DsTest.java index a41de92c9..640a8f70f 100644 --- a/hutool-db/src/test/java/org/dromara/hutool/db/ds/DsTest.java +++ b/hutool-db/src/test/java/org/dromara/hutool/db/ds/DsTest.java @@ -104,7 +104,7 @@ public class DsTest { public void c3p0DsuserAndPassTest() { // https://gitee.com/dromara/hutool/issues/I4T7XZ DSUtil.setGlobalDSFactory(new C3p0DSFactory()); - final ComboPooledDataSource ds = (ComboPooledDataSource) ((DSWrapper) DSUtil.getDS("mysql")).getRaw(); + final ComboPooledDataSource ds = (ComboPooledDataSource) DSUtil.getDS("mysql").getRaw(); Assertions.assertEquals("root", ds.getUser()); Assertions.assertEquals("123456", ds.getPassword()); }