From cd2703c5030583d1575cc7609dad4f7d888cd12c Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 27 Jul 2022 11:43:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=20API=20=E6=95=B0=E6=8D=AE=E6=BA=90=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/datasource/ApiProvider.java        | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
index 8d3328e6af..5e0a16b9b4 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
@@ -69,7 +69,7 @@ public class ApiProvider extends Provider {
         ApiDefinition apiDefinition = checkApiDefinition(datasourceRequest);
         String response = execHttpRequest(apiDefinition, StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 10);
 
-        fieldList = getTableFileds(apiDefinition, response);
+        fieldList = getTableFileds(apiDefinition);
         result.put("fieldList", fieldList);
         dataList = fetchResult(response, apiDefinition);
         result.put("dataList", dataList);
@@ -77,9 +77,9 @@ public class ApiProvider extends Provider {
     }
 
 
-    private List<TableField> getTableFileds(ApiDefinition apiDefinition, String response) throws Exception {
+    private List<TableField> getTableFileds(ApiDefinition apiDefinition) throws Exception {
         List<TableField> tableFields = new ArrayList<>();
-        for (DatasetTableFieldDTO field : checkApiDefinition(apiDefinition, response).getFields()) {
+        for (DatasetTableFieldDTO field : apiDefinition.getFields()) {
             TableField tableField = new TableField();
             tableField.setFieldName(field.getName());
             tableField.setRemarks(field.getName());
@@ -91,21 +91,12 @@ public class ApiProvider extends Provider {
     }
 
     public List<TableField> getTableFileds(DatasourceRequest datasourceRequest) throws Exception {
-        BasicInfo basicInfo = systemParameterService.basicInfo();
         List<ApiDefinition> lists = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), new TypeToken<List<ApiDefinition>>() {
         }.getType());
         List<TableField> tableFields = new ArrayList<>();
         for (ApiDefinition apiDefinition : lists) {
             if (datasourceRequest.getTable().equalsIgnoreCase(apiDefinition.getName())) {
-                String response = ApiProvider.execHttpRequest(apiDefinition, StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 10);
-                for (DatasetTableFieldDTO field : checkApiDefinition(apiDefinition, response).getFields()) {
-                    TableField tableField = new TableField();
-                    tableField.setFieldName(field.getOriginName());
-                    tableField.setRemarks(field.getName());
-                    tableField.setFieldSize(field.getSize());
-                    tableField.setFieldType(field.getDeExtractType().toString());
-                    tableFields.add(tableField);
-                }
+                tableFields = getTableFileds(apiDefinition);
             }
         }
         return tableFields;