提交 a4fb46cd authored 作者: taojinlong's avatar taojinlong

fix: mongo 校验错误

上级 b9bbbe19
...@@ -12,13 +12,14 @@ public class MongodbConfiguration extends JdbcConfiguration { ...@@ -12,13 +12,14 @@ public class MongodbConfiguration extends JdbcConfiguration {
private String connectionType; private String connectionType;
private String extraParams = "rebuildschema=true"; private String extraParams = "rebuildschema=true";
public String getJdbc() { public String getJdbc(String dsId) {
if(StringUtils.isEmpty(extraParams.trim())){ if(StringUtils.isEmpty(extraParams.trim()) && StringUtils.isEmpty(dsId)){
return "jdbc:mongodb://HOSTNAME:PORT/DATABASE" return "jdbc:mongodb://HOSTNAME:PORT/DATABASE"
.replace("HOSTNAME", getHost().trim()) .replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim()) .replace("PORT", getPort().toString().trim())
.replace("DATABASE", getDataBase().trim()); .replace("DATABASE", getDataBase().trim());
}else { }else {
this.extraParams = StringUtils.isEmpty(dsId) ? getExtraParams().trim() : getExtraParams().trim() + "&schema=" + dsId +".xml";
return "jdbc:mongodb://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS" return "jdbc:mongodb://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
.replace("HOSTNAME", getHost().trim()) .replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim()) .replace("PORT", getPort().toString().trim())
......
...@@ -467,7 +467,7 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -467,7 +467,7 @@ public class JdbcProvider extends DatasourceProvider {
username = mongodbConfiguration.getUsername(); username = mongodbConfiguration.getUsername();
password = mongodbConfiguration.getPassword(); password = mongodbConfiguration.getPassword();
driver = mongodbConfiguration.getDriver(); driver = mongodbConfiguration.getDriver();
jdbcurl = mongodbConfiguration.getJdbc(); jdbcurl = mongodbConfiguration.getJdbc(datasourceRequest.getDatasource().getId());
break; break;
case redshift: case redshift:
RedshiftConfigration redshiftConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), RedshiftConfigration.class); RedshiftConfigration redshiftConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), RedshiftConfigration.class);
...@@ -566,7 +566,7 @@ public class JdbcProvider extends DatasourceProvider { ...@@ -566,7 +566,7 @@ public class JdbcProvider extends DatasourceProvider {
case mongo: case mongo:
MongodbConfiguration mongodbConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MongodbConfiguration.class); MongodbConfiguration mongodbConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MongodbConfiguration.class);
dataSource.setDriverClassName(mongodbConfiguration.getDriver()); dataSource.setDriverClassName(mongodbConfiguration.getDriver());
dataSource.setUrl(mongodbConfiguration.getJdbc()); dataSource.setUrl(mongodbConfiguration.getJdbc(datasourceRequest.getDatasource().getId()));
jdbcConfiguration = mongodbConfiguration; jdbcConfiguration = mongodbConfiguration;
break; break;
case redshift: case redshift:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论