center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 数据源校验

Browse Source
This commit is contained in:
taojinlong 2021-08-24 15:03:17 +08:00
parent 461f5135de
commit e83510f4b7
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java
View File

@ -38,8 +38,8 @@ public class DatasourceController {
@ApiOperation("验证数据源") @ApiOperation("验证数据源")
@PostMapping("/validate") @PostMapping("/validate")
public void validate(@RequestBody Datasource datasource) throws Exception { public ResultHolder validate(@RequestBody Datasource datasource) throws Exception {
datasourceService.validate(datasource); return datasourceService.validate(datasource);
} }
@ApiOperation("验证数据源") @ApiOperation("验证数据源")

21
backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
View File

@ -120,11 +120,17 @@ public class DatasourceService {
checkAndUpdateDatasourceStatus(datasource); checkAndUpdateDatasourceStatus(datasource);
} }
public void validate(Datasource datasource) throws Exception { public ResultHolder validate(Datasource datasource) throws Exception {
DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); try {
DatasourceRequest datasourceRequest = new DatasourceRequest(); DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
datasourceRequest.setDatasource(datasource); DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceProvider.checkStatus(datasourceRequest); datasourceRequest.setDatasource(datasource);
datasourceProvider.checkStatus(datasourceRequest);
return ResultHolder.success("Success");
}catch (Exception e){
return ResultHolder.error("Datasource is invalid: " + e.getMessage());
}
} }
public ResultHolder validate(String datasourceId) { public ResultHolder validate(String datasourceId) {
@ -133,7 +139,10 @@ public class DatasourceService {
return ResultHolder.error("Can not find datasource: "+ datasourceId); return ResultHolder.error("Can not find datasource: "+ datasourceId);
} }
try { try {
validate(datasource); DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);
datasourceProvider.checkStatus(datasourceRequest);
datasource.setStatus("Success"); datasource.setStatus("Success");
return ResultHolder.success("Success"); return ResultHolder.success("Success");
}catch (Exception e){ }catch (Exception e){

4
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -572,7 +572,9 @@ public class ExtractDataService {
} }
private void extractData(DatasetTable datasetTable, String extractType) throws Exception { private void extractData(DatasetTable datasetTable, String extractType) throws Exception {
datasourceService.validate(datasetTable.getDataSourceId()); if(StringUtils.isNotEmpty(datasetTable.getDataSourceId())){
datasourceService.validate(datasetTable.getDataSourceId());
}
KettleFileRepository repository = CommonBeanFactory.getBean(KettleFileRepository.class); KettleFileRepository repository = CommonBeanFactory.getBean(KettleFileRepository.class);
RepositoryDirectoryInterface repositoryDirectoryInterface = repository.loadRepositoryDirectoryTree(); RepositoryDirectoryInterface repositoryDirectoryInterface = repository.loadRepositoryDirectoryTree();
TransMeta transMeta = null; TransMeta transMeta = null;

4
frontend/src/views/system/datasource/form.vue
View File

@ -278,7 +278,7 @@ export default {
data.configuration = JSON.stringify(data.configuration) data.configuration = JSON.stringify(data.configuration)
if(data.showModel === 'show' && !this.canEdit){ if(data.showModel === 'show' && !this.canEdit){
validateDsById(data.id).then(res => { validateDsById(data.id).then(res => {
if(res.success === 'true'){ if(res.success){
this.$success(this.$t('datasource.validate_success')) this.$success(this.$t('datasource.validate_success'))
}else { }else {
this.$error(this.$t(res.message)) this.$error(this.$t(res.message))
@ -290,7 +290,7 @@ export default {
}else { }else {
validateDs(data).then(res => { validateDs(data).then(res => {
if(res.success === 'true'){ if(res.success){
this.$success(this.$t('datasource.validate_success')) this.$success(this.$t('datasource.validate_success'))
}else { }else {
this.$error(this.$t(res.message)) this.$error(this.$t(res.message))