dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 设置API超时时间后依然给出提示

Browse Source
This commit is contained in:
taojinlong 2023-11-20 16:09:38 +08:00
parent 4605b862b4
commit 977afdef15
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
View File

@ -17,7 +17,7 @@ public class ApiDefinition {
private List<DatasetTableFieldDTO> fields;
private ApiDefinitionRequest request;
private String dataPath;
private Integer queryTimeout;
private Integer apiQueryTimeout = 30;
private String status;
private List<Map<String,String>> data = new ArrayList<>();
private List<JSONObject> jsonFields = new ArrayList<>();

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

@ -40,7 +40,7 @@ public class ApiProvider extends Provider {
@Override
public List<String[]> 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<String[]> dataList = new ArrayList<>();
List<TableField> 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);

8
core/frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -530,7 +530,7 @@
prop="apiQueryTimeout"
>
<el-input
v-model="apiItem.queryTimeout"
v-model="apiItem.apiQueryTimeout"
autocomplete="off"
type="number"
:min="0"
@ -855,7 +855,7 @@ export default {
acquireIncrement: 5,
idleConnectionTestPeriod: 5,
connectTimeout: 5,
queryTimeout: 30
apiQueryTimeout: 30
},
apiConfiguration: []
}
@ -1022,7 +1022,7 @@ export default {
name: '',
url: '',
method: 'GET',
queryTimeout: 30,
apiQueryTimeout: 30,
request: {
headers: [{}],
arguments: [],
@ -1040,7 +1040,7 @@ export default {
url: '',
method: 'GET',
dataPath: '',
queryTimeout: 30,
apiQueryTimeout: 30,
request: {
headers: [],
arguments: [],