From e6ea4a36215967f74487b7ab28fb0830f5819153 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 23 Jan 2021 23:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90datasource=E3=80=91=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9F=A5=E8=AF=A2sql=E5=92=8C=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/dsctn/modular/pojo/DatabaseInfoParam.java      | 2 +-
 .../dsctn/modular/service/impl/DatabaseInfoServiceImpl.java     | 2 +-
 .../roses/kernel/dsctn/persist/sqls/DatabaseListSql.java        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/pojo/DatabaseInfoParam.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/pojo/DatabaseInfoParam.java
index 328888efa..e554b288f 100644
--- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/pojo/DatabaseInfoParam.java
+++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/pojo/DatabaseInfoParam.java
@@ -55,7 +55,7 @@ public class DatabaseInfoParam extends BaseRequest {
      * 数据库连接的账号
      */
     @NotBlank(message = "数据库连接的账号", groups = {add.class, edit.class})
-    private String userName;
+    private String username;
 
     /**
      * 数据库连接密码
diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
index c0b79e88f..b570b9bd7 100644
--- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
+++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
@@ -162,7 +162,7 @@ public class DatabaseInfoServiceImpl extends ServiceImpl<DatabaseInfoMapper, Dat
         Connection conn = null;
         try {
             Class.forName(param.getJdbcDriver());
-            conn = DriverManager.getConnection(param.getJdbcUrl(), param.getUserName(), param.getPassword());
+            conn = DriverManager.getConnection(param.getJdbcUrl(), param.getUsername(), param.getPassword());
         } catch (Exception e) {
             String userTip = StrUtil.format(VALIDATE_DATASOURCE_ERROR.getUserTip(), param.getJdbcUrl());
             throw new DatasourceContainerException(VALIDATE_DATASOURCE_ERROR, userTip);
diff --git a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DatabaseListSql.java b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DatabaseListSql.java
index 0eb6e2271..051824270 100644
--- a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DatabaseListSql.java
+++ b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DatabaseListSql.java
@@ -13,7 +13,7 @@ public class DatabaseListSql extends AbstractSql {
 
     @Override
     protected String mysql() {
-        return "select db_name,jdbc_driver,jdbc_url,username,password from sys_database_info";
+        return "select db_name, jdbc_driver, jdbc_url, username, password from sys_database_info where del_flag = 'N'";
     }
 
     @Override