From aaf886e7d9869cc07e2047269bb0565a490097ed Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 12 Jul 2023 00:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90db=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddb=E9=93=BE=E6=8E=A5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsctn/persist/DataBaseInfoPersistence.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/DataBaseInfoPersistence.java b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/DataBaseInfoPersistence.java index 9e548cbd2..6c6be300f 100644 --- a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/DataBaseInfoPersistence.java +++ b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/DataBaseInfoPersistence.java @@ -24,6 +24,8 @@ */ package cn.stylefeng.roses.kernel.dsctn.persist; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; @@ -163,23 +165,21 @@ public class DataBaseInfoPersistence { */ private DruidProperties createDruidProperties(ResultSet resultSet) { - DruidProperties druidProperties = new DruidProperties(); - - druidProperties.setTestOnBorrow(true); - druidProperties.setTestOnReturn(true); + DruidProperties newDruidProperties = new DruidProperties(); + BeanUtil.copyProperties(this.druidProperties, newDruidProperties, CopyOptions.create().ignoreError()); try { - druidProperties.setDriverClassName(resultSet.getString("jdbc_driver")); - druidProperties.setUrl(resultSet.getString("jdbc_url")); - druidProperties.setUsername(resultSet.getString("username")); - druidProperties.setPassword(resultSet.getString("password")); + newDruidProperties.setDriverClassName(resultSet.getString("jdbc_driver")); + newDruidProperties.setUrl(resultSet.getString("jdbc_url")); + newDruidProperties.setUsername(resultSet.getString("username")); + newDruidProperties.setPassword(resultSet.getString("password")); } catch (SQLException exception) { log.info("根据数据库查询结果，创建DruidProperties失败！", exception); String userTip = StrUtil.format(DatasourceContainerExceptionEnum.CREATE_PROP_DAO_ERROR.getUserTip(), exception.getMessage()); throw new DatasourceContainerException(DatasourceContainerExceptionEnum.CREATE_PROP_DAO_ERROR, userTip); } - return druidProperties; + return newDruidProperties; } }