From 977afdef15a5a9011b0384f778f6188611203672 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 20 Nov 2023 16:09:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AEAPI=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E5=90=8E=E4=BE=9D=E7=84=B6=E7=BB=99?= =?UTF-8?q?=E5=87=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/request/datasource/ApiDefinition.java | 2 +- .../java/io/dataease/provider/datasource/ApiProvider.java | 4 ++-- .../src/views/system/datasource/DsConfiguration.vue | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java b/core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java index f786e37618..ae93a7b09b 100644 --- a/core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java +++ b/core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java @@ -17,7 +17,7 @@ public class ApiDefinition { private List fields; private ApiDefinitionRequest request; private String dataPath; - private Integer queryTimeout; + private Integer apiQueryTimeout = 30; private String status; private List> data = new ArrayList<>(); private List jsonFields = new ArrayList<>(); diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java index 31d26fce1c..b6695e6e4b 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -40,7 +40,7 @@ public class ApiProvider extends Provider { @Override public List getData(DatasourceRequest datasourceRequest) throws Exception { ApiDefinition apiDefinition = checkApiDefinition(datasourceRequest); - String response = execHttpRequest(apiDefinition, apiDefinition.getQueryTimeout() == null || apiDefinition.getQueryTimeout()<=0 ? 30 : apiDefinition.getQueryTimeout()); + String response = execHttpRequest(apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout()<=0 ? 30 : apiDefinition.getApiQueryTimeout()); return fetchResult(response, apiDefinition); } @@ -68,7 +68,7 @@ public class ApiProvider extends Provider { List dataList = new ArrayList<>(); List fieldList = new ArrayList<>(); ApiDefinition apiDefinition = checkApiDefinition(datasourceRequest); - String response = execHttpRequest(apiDefinition, apiDefinition.getQueryTimeout() == null || apiDefinition.getQueryTimeout()<=0 ? 30 : apiDefinition.getQueryTimeout()); + String response = execHttpRequest(apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout()<=0 ? 30 : apiDefinition.getApiQueryTimeout()); fieldList = getTableFields(apiDefinition); result.put("fieldList", fieldList); diff --git a/core/frontend/src/views/system/datasource/DsConfiguration.vue b/core/frontend/src/views/system/datasource/DsConfiguration.vue index 34b9f4894d..270e2aa8d9 100644 --- a/core/frontend/src/views/system/datasource/DsConfiguration.vue +++ b/core/frontend/src/views/system/datasource/DsConfiguration.vue @@ -530,7 +530,7 @@ prop="apiQueryTimeout" > Date: Mon, 20 Nov 2023 17:11:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20API=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1=E5=A2=9E=E9=87=8F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=85=A8=E9=87=8F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableTaskService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java index c1eaddc933..19e1d3b818 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java @@ -82,12 +82,13 @@ public class DataSetTableTaskService { } datasetTableTaskMapper.insert(datasetTableTask); } else { - datasetTableTask.setStatus(TaskStatus.Underway.name()); + datasetTableTask.setStatus(null); datasetTableTask.setLastExecTime(null); datasetTableTask.setLastExecStatus(null); datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask); } + scheduleService.deleteSchedule(datasetTableTask); scheduleService.addSchedule(datasetTableTask); // simple From 56008051ea40beadea828b7634c3f4cc48ab6bf9 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 20 Nov 2023 17:51:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20oracle=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/datasource/JdbcProvider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index ec38b0a120..ddfa03c2e8 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -97,7 +97,8 @@ public class JdbcProvider extends DefaultJdbcProvider { } String schemaPattern = "%"; if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) { - schemaPattern = databaseMetaData.getUserName(); + OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class); + schemaPattern = oracleConfiguration.getSchema(); } ResultSet resultSet = databaseMetaData.getColumns(null, schemaPattern, tableNamePattern, "%"); while (resultSet.next()) { @@ -121,9 +122,11 @@ public class JdbcProvider extends DefaultJdbcProvider { list.add(tableField); } } else { + System.out.println(database); if (database != null) { if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) { TableField tableField = getTableFiled(resultSet, datasourceRequest); + System.out.println(new Gson().toJson(tableField)); list.add(tableField); } } else { From c18930191552c2e180f4ce1478862cd739754a5c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 20 Nov 2023 18:06:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7=20jsqlparser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/backend/pom.xml | 17 +++++++++++++++++ .../service/dataset/DataSetTableService.java | 5 ++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/core/backend/pom.xml b/core/backend/pom.xml index 69d5e919d3..926ece9e33 100644 --- a/core/backend/pom.xml +++ b/core/backend/pom.xml @@ -99,6 +99,17 @@ com.github.pagehelper pagehelper 5.3.1 + + + jsqlparser + com.github.jsqlparser + + + + + com.github.jsqlparser + jsqlparser + 4.6 org.apache.shiro @@ -331,6 +342,12 @@ ashot 1.5.4 + + io.dataease + dataease-plugin-common + 1.18.11 + compile + diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 19586b83dc..1ac62f60d3 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2865,9 +2865,8 @@ public class DataSetTableService { visitBinaryExpression(likeExpression, (likeExpression.isNot() ? " NOT" : "") + (likeExpression.isCaseInsensitive() ? " ILIKE " : " LIKE ")); - String escape = likeExpression.getEscape(); - if (escape != null) { - buffer.append(" ESCAPE '").append(escape).append('\''); + if (likeExpression.getEscape() != null) { + buffer.append(" ESCAPE '").append(likeExpression.getEscape()).append('\''); } } From 3fbb8db02e5d96c4a410f12223691648981b5966 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 20 Nov 2023 18:42:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20[Bug]=E4=BF=AE=E6=94=B9=E5=B7=B2?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=95=B0=E6=8D=AE=E6=BA=90=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=BA=90=20#6267?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/system/datasource/DsAppForm.vue | 2 +- core/frontend/src/views/system/datasource/DsFormContent.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/frontend/src/views/system/datasource/DsAppForm.vue b/core/frontend/src/views/system/datasource/DsAppForm.vue index 29321f856f..e8e8d27af8 100644 --- a/core/frontend/src/views/system/datasource/DsAppForm.vue +++ b/core/frontend/src/views/system/datasource/DsAppForm.vue @@ -566,7 +566,7 @@ export default { this.tData.forEach(item => { if (item.id === this.form.type) { item.children.forEach(child => { - if (this.formType === 'modify' && child.id === this.form.id) { + if (child.id === this.form.id) { return } const configuration = JSON.parse(child.configuration) diff --git a/core/frontend/src/views/system/datasource/DsFormContent.vue b/core/frontend/src/views/system/datasource/DsFormContent.vue index 425602dcef..a99defa973 100644 --- a/core/frontend/src/views/system/datasource/DsFormContent.vue +++ b/core/frontend/src/views/system/datasource/DsFormContent.vue @@ -886,7 +886,7 @@ export default { this.tData.forEach((item) => { if (item.id === this.form.type) { item.children.forEach((child) => { - if (this.formType === 'modify' && child.id === this.form.id) { + if (child.id === this.form.id) { return } const configuration = JSON.parse(child.configuration)