gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

多数据源修改

pull/16/head
AndrewFeng 2021-03-18 23:01:58 +08:00
parent ceadea43f8
commit 65f89af571
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java
View File

@ -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);

1
kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/DataBaseInfoPersistence.java
View File

@ -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());

4
kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java
View File

@ -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

6
kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DatabaseListSql.java
View File

@ -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";
}
}

4
kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java
View File

@ -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 ?;";
}
}