From 65f89af571bbd55fe2da4edf167860bf9dc4fd9b Mon Sep 17 00:00:00 2001
From: AndrewFeng <lf1980250960@163.com>
Date: Thu, 18 Mar 2021 23:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/db/flyway/FlywayInitListener.java          | 3 ++-
 .../roses/kernel/dsctn/persist/DataBaseInfoPersistence.java | 1 +
 .../roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java | 4 ++--
 .../roses/kernel/dsctn/persist/sqls/DatabaseListSql.java    | 6 +++---
 .../roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java    | 4 ++--
 5 files changed, 10 insertions(+), 8 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 5c1df2be2..88ba57c34 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
@@ -32,6 +32,7 @@ public class FlywayInitListener implements ApplicationListener<ApplicationContex
         ConfigurableEnvironment environment = applicationEnvironmentPreparedEvent.getApplicationContext().getEnvironment();
 
         // 获取数据库连接配置
+        String driverClassName = environment.getProperty("spring.datasource.driver-class-name");
         String dataSourceUrl = environment.getProperty("spring.datasource.url");
         String dataSourceUsername = environment.getProperty("spring.datasource.username");
         String dataSourcePassword = environment.getProperty("spring.datasource.password");
@@ -80,7 +81,7 @@ public class FlywayInitListener implements ApplicationListener<ApplicationContex
             assert dataSourceUrl != null;
             // 手动创建数据源
             dmDataSource = new DriverManagerDataSource();
-            dmDataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+            dmDataSource.setDriverClassName(driverClassName);
             dmDataSource.setUrl(dataSourceUrl);
             dmDataSource.setUsername(dataSourceUsername);
             dmDataSource.setPassword(dataSourcePassword);
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 49fca1641..6a64fbcd7 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
@@ -80,6 +80,7 @@ public class DataBaseInfoPersistence {
             PreparedStatement preparedStatement = conn.prepareStatement(new AddDatabaseInfoSql().getSql(druidProperties.getUrl()));
 
             preparedStatement.setLong(1, IdWorker.getId());
+
             preparedStatement.setString(2, MASTER_DATASOURCE_NAME);
             preparedStatement.setString(3, druidProperties.getDriverClassName());
             preparedStatement.setString(4, druidProperties.getUrl());
diff --git a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java
index 0a5d7e3b9..39edda0e4 100644
--- a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java
+++ b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java
@@ -18,12 +18,12 @@ public class AddDatabaseInfoSql extends AbstractSql {
 
     @Override
     protected String sqlServer() {
-        return "INSERT INTO [sys_database_info] ([id], [db_name], [jdbc_driver], [user_name], [password], [jdbc_url], [remarks], [create_time]) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+        return "INSERT INTO [sys_database_info] ([db_id], [db_name], [jdbc_driver], [username], [password], [jdbc_url], [remarks], [create_time]) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
     }
 
     @Override
     protected String pgSql() {
-        return "INSERT INTO sys_database_info(id, db_name, jdbc_driver, user_name, password, jdbc_url, remarks, create_time) VALUES (?, ?, ?, ?, ?, ?, ?, to_timestamp(?,'YYYY-MM-DD HH24:MI:SS'))";
+        return "INSERT INTO sys_database_info(db_id, db_name, jdbc_driver, username, password, jdbc_url, remarks, create_time) VALUES (?, ?, ?, ?, ?, ?, ?, to_timestamp(?,'YYYY-MM-DD HH24:MI:SS'))";
     }
 
     @Override
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 051824270..1658962c3 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
@@ -18,16 +18,16 @@ public class DatabaseListSql extends AbstractSql {
 
     @Override
     protected String sqlServer() {
-        return "select db_name,jdbc_driver,jdbc_url,user_name,password from sys_database_info";
+        return "select db_name,jdbc_driver,jdbc_url,username,password from sys_database_info";
     }
 
     @Override
     protected String pgSql() {
-        return "select db_name,jdbc_driver,jdbc_url,user_name,password from sys_database_info";
+        return "select db_name,jdbc_driver,jdbc_url,username,password from sys_database_info";
     }
 
     @Override
     protected String oracle() {
-        return "select db_name,jdbc_driver,jdbc_url,user_name,password from sys_database_info";
+        return "select db_name,jdbc_driver,jdbc_url,username,password from sys_database_info";
     }
 }
diff --git a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java
index 26cf6ecba..38a886fab 100644
--- a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java
+++ b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java
@@ -18,7 +18,7 @@ public class DropDatabaseSql extends AbstractSql {
 
     @Override
     protected String sqlServer() {
-        return "";
+        return "DROP DATABASE ?;";
     }
 
     @Override
@@ -28,6 +28,6 @@ public class DropDatabaseSql extends AbstractSql {
 
     @Override
     protected String oracle() {
-        return "";
+        return "DROP DATABASE ?;";
     }
 }