From 5f09346929ea0f3ea27bf1cf0590f391e99996f8 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 27 Sep 2022 11:11:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(API=E6=95=B0=E6=8D=AE=E6=BA=90):=20?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=20form-data=20=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/ApiDefinitionRequest.java | 5 ++- .../provider/datasource/ApiProvider.java | 34 ++++++++++--------- .../service/datasource/DatasourceService.java | 16 ++++----- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinitionRequest.java b/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinitionRequest.java index ef07542903..6f403541f5 100644 --- a/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinitionRequest.java +++ b/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinitionRequest.java @@ -1,16 +1,15 @@ package io.dataease.controller.request.datasource; -import com.google.gson.JsonObject; +import com.alibaba.fastjson.JSONObject; import lombok.Data; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @Data public class ApiDefinitionRequest { private List> headers = new ArrayList<>(); - private Map body = new HashMap<>(); + private JSONObject body = new JSONObject(); private AuthManager authManager = new AuthManager(); 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 8953615172..dbf77ecdac 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -5,8 +5,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.google.gson.*; -import com.google.gson.reflect.TypeToken; +import com.google.common.reflect.TypeToken; +import com.google.gson.Gson; +import com.google.gson.JsonObject; import io.dataease.controller.sys.response.BasicInfo; import io.dataease.dto.dataset.DatasetTableFieldDTO; import io.dataease.plugins.common.dto.datasource.TableDesc; @@ -161,11 +162,12 @@ public class ApiProvider extends Provider { if (StringUtils.equalsAny(type, "Form_Data", "WWW_FORM")) { if (apiDefinitionRequest.getBody().get("kvs") != null) { Map body = new HashMap<>(); - JsonArray kvsArr = JsonParser.parseString(apiDefinitionRequest.getBody().get("kvs").toString()).getAsJsonArray(); + JSONObject bodyObj = JSONObject.parseObject(apiDefinitionRequest.getBody().toString()); + JSONArray kvsArr = bodyObj.getJSONArray("kvs"); for (int i = 0; i < kvsArr.size(); i++) { - JsonObject kv = kvsArr.get(i).getAsJsonObject(); - if (kv.get("name") != null) { - body.put(kv.get("name").getAsString(), kv.get("value").getAsString()); + JSONObject kv = kvsArr.getJSONObject(i); + if (kv.containsKey("name")) { + body.put(kv.getString("name"), kv.getString("value")); } } response = HttpClientUtil.post(apiDefinition.getUrl(), body, httpClientConfig); @@ -216,14 +218,14 @@ public class ApiProvider extends Provider { try { JSONArray jsonArray = jsonObject.getJSONArray(s); List childrenField = new ArrayList<>(); - for (Object object: jsonArray) { + for (Object object : jsonArray) { JSONObject.parseObject(object.toString()); handleStr(apiDefinition, JSON.toJSONString(object, SerializerFeature.WriteMapNullValue), childrenField, rootPath + "." + s + "[*]"); } o.put("children", childrenField); o.put("childrenDataType", "LIST"); - }catch (Exception e){ + } catch (Exception e) { JSONArray array = new JSONArray(); array.add(StringUtils.isNotEmpty(jsonObject.getString(s)) ? jsonObject.getString(s) : ""); o.put("value", array); @@ -295,11 +297,11 @@ public class ApiProvider extends Provider { } - static void mergeField(JSONObject field, JSONObject item){ - if(item.getJSONArray("children") != null ){ + static void mergeField(JSONObject field, JSONObject item) { + if (item.getJSONArray("children") != null) { JSONArray itemChildren = item.getJSONArray("children"); JSONArray fieldChildren = field.getJSONArray("children"); - if(fieldChildren == null){ + if (fieldChildren == null) { fieldChildren = new JSONArray(); } for (Object itemChild : itemChildren) { @@ -307,12 +309,12 @@ public class ApiProvider extends Provider { JSONObject itemChildObject = JSONObject.parseObject(itemChild.toString()); for (Object fieldChild : fieldChildren) { JSONObject fieldChildObject = JSONObject.parseObject(fieldChild.toString()); - if(itemChildObject.getString("jsonPath").equals(fieldChildObject.getString("jsonPath"))){ + if (itemChildObject.getString("jsonPath").equals(fieldChildObject.getString("jsonPath"))) { mergeField(fieldChildObject, itemChildObject); hasKey = true; } } - if(!hasKey){ + if (!hasKey) { fieldChildren.add(itemChild); } } @@ -325,7 +327,7 @@ public class ApiProvider extends Provider { array.add(item.getJSONArray("value").get(0).toString()); field.put("value", array); } - if(CollectionUtils.isNotEmpty(field.getJSONArray("children"))&& CollectionUtils.isNotEmpty(item.getJSONArray("children"))){ + if (CollectionUtils.isNotEmpty(field.getJSONArray("children")) && CollectionUtils.isNotEmpty(item.getJSONArray("children"))) { JSONArray fieldChildren = field.getJSONArray("children"); JSONArray itemChildren = item.getJSONArray("children"); @@ -335,11 +337,11 @@ public class ApiProvider extends Provider { JSONObject find = null; for (Object itemChild : itemChildren) { JSONObject itemObject = JSONObject.parseObject(itemChild.toString()); - if(jsonObject.getString("jsonPath").equals(itemObject.getString("jsonPath"))){ + if (jsonObject.getString("jsonPath").equals(itemObject.getString("jsonPath"))) { find = itemObject; } } - if(find != null){ + if (find != null) { mergeValue(jsonObject, apiDefinition, find); } fieldArrayChildren.add(jsonObject); diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 0f9993c2f7..9722ee5a1d 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -184,7 +184,7 @@ public class DatasourceService { for (int i = 0; i < apiDefinitionList.size(); i++) { String status = null; - if(apiItemStatuses.get(apiDefinitionList.get(i).getName()) != null){ + if (apiItemStatuses.get(apiDefinitionList.get(i).getName()) != null) { status = apiItemStatuses.get(apiDefinitionList.get(i).getName()).getAsString(); } apiDefinitionList.get(i).setStatus(status); @@ -304,9 +304,9 @@ public class DatasourceService { return ResultHolder.success(datasourceDTO); } if (success > 0 && success < apiDefinitionList.size()) { - return ResultHolder.error(Translator.get("I18N_DS_INVALID_TABLE") , datasourceDTO); + return ResultHolder.error(Translator.get("I18N_DS_INVALID_TABLE"), datasourceDTO); } - return ResultHolder.error(Translator.get("I18N_DS_INVALID") , datasourceDTO); + return ResultHolder.error(Translator.get("I18N_DS_INVALID"), datasourceDTO); } return ResultHolder.success(datasourceDTO); } catch (Exception e) { @@ -530,7 +530,7 @@ public class DatasourceService { }); } - public void updateDatasourceStatusJob(BasicInfo basicInfo, List parameters) { + public void updateDatasourceStatusJob(BasicInfo basicInfo, List parameters) { String type = ""; Integer interval = 30; @@ -547,7 +547,7 @@ public class DatasourceService { type = parameter.getParamValue(); } } - if(!changeDsCheckTime){ + if (!changeDsCheckTime) { return; } addJob(type, interval); @@ -555,7 +555,7 @@ public class DatasourceService { private void addJob(String type, Integer interval) { String cron = ""; - switch (type){ + switch (type) { case "hour": cron = "0 0 0/hour * * ? *".replace("hour", interval.toString()); break; @@ -572,12 +572,12 @@ public class DatasourceService { globalTask.setStartTime(System.currentTimeMillis()); try { scheduleService.addSchedule(globalTask); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } - public void initDsCheckJob(){ + public void initDsCheckJob() { BasicInfo basicInfo = systemParameterService.basicInfo(); addJob(basicInfo.getDsCheckIntervalType(), Integer.valueOf(basicInfo.getDsCheckInterval())); }