github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: mongo 校验错误

Browse Source
This commit is contained in:
taojinlong 2022-02-28 23:30:54 +08:00
parent b9bbbe1907
commit a4fb46cd53
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/dataease/dto/datasource/MongodbConfiguration.java
View File

@ -12,13 +12,14 @@ public class MongodbConfiguration extends JdbcConfiguration {
private String connectionType;
private String extraParams = "rebuildschema=true";
public String getJdbc() {
if(StringUtils.isEmpty(extraParams.trim())){
public String getJdbc(String dsId) {
if(StringUtils.isEmpty(extraParams.trim()) && StringUtils.isEmpty(dsId)){
return "jdbc:mongodb://HOSTNAME:PORT/DATABASE"
.replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim())
.replace("DATABASE", getDataBase().trim());
}else {
this.extraParams = StringUtils.isEmpty(dsId) ? getExtraParams().trim() : getExtraParams().trim() + "&schema=" + dsId +".xml";
return "jdbc:mongodb://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
.replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim())

4
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -467,7 +467,7 @@ public class JdbcProvider extends DatasourceProvider {
username = mongodbConfiguration.getUsername();
password = mongodbConfiguration.getPassword();
driver = mongodbConfiguration.getDriver();
jdbcurl = mongodbConfiguration.getJdbc();
jdbcurl = mongodbConfiguration.getJdbc(datasourceRequest.getDatasource().getId());
break;
case redshift:
RedshiftConfigration redshiftConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), RedshiftConfigration.class);
@ -566,7 +566,7 @@ public class JdbcProvider extends DatasourceProvider {
case mongo:
MongodbConfiguration mongodbConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MongodbConfiguration.class);
dataSource.setDriverClassName(mongodbConfiguration.getDriver());
dataSource.setUrl(mongodbConfiguration.getJdbc());
dataSource.setUrl(mongodbConfiguration.getJdbc(datasourceRequest.getDatasource().getId()));
jdbcConfiguration = mongodbConfiguration;
break;
case redshift: