From 977afdef15a5a9011b0384f778f6188611203672 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 Nov 2023 16:09:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AEAPI=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=90=8E=E4=BE=9D=E7=84=B6=E7=BB=99=E5=87=BA?=
 =?UTF-8?q?=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<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<>();
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<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);
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"
           >
             <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: [],