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

【datasource】修正一个查询sql和字段匹配

pull/3/head
fengshuonan 2021-01-23 23:44:07 +08:00
parent fb1fdf07ea
commit e6ea4a3621
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/pojo/DatabaseInfoParam.java
View File

@ -55,7 +55,7 @@ public class DatabaseInfoParam extends BaseRequest {
* 数据库连接的账号
*/
@NotBlank(message = "数据库连接的账号", groups = {add.class, edit.class})
private String userName;
private String username;
/**
* 数据库连接密码

2
kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
View File

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

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

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