center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 修复 API 数据源参数不显示

Browse Source
This commit is contained in:
taojinlong 2024-09-04 12:24:17 +08:00
parent 5ee18f4d01
commit 6826ed0c0f
4 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
View File

@ -140,7 +140,6 @@ public class ApiUtils {
return fetchResult(response, apiDefinition); return fetchResult(response, apiDefinition);
} }
public static String execHttpRequest(ApiDefinition apiDefinition, int socketTimeout, List<ApiDefinition> paramsList) { public static String execHttpRequest(ApiDefinition apiDefinition, int socketTimeout, List<ApiDefinition> paramsList) {
String response = ""; String response = "";
HttpClientConfig httpClientConfig = new HttpClientConfig(); HttpClientConfig httpClientConfig = new HttpClientConfig();
@ -297,8 +296,58 @@ public class ApiUtils {
DEException.throwException(e); DEException.throwException(e);
} }
for (JsonNode jsonNode : rootNode) { for (JsonNode jsonNode : rootNode) {
if (jsonNode.has("name")) { if (jsonNode.has("name") && jsonNode.has("value")) {
body.put(jsonNode.get("name").asText(), jsonNode.get("value").asText()); if (jsonNode.get("value") != null && StringUtils.isNotEmpty(jsonNode.get("value").asText())) {
if (jsonNode.get("nameType") != null && jsonNode.get("nameType").toString().equalsIgnoreCase("params")) {
String param = jsonNode.get("value").toString();
for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null);
List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) {
body.put(jsonNode.get("name").toString(), dataList.get(0)[i]);
}
}
}
}
} else if (jsonNode.get("nameType") != null && jsonNode.get("nameType").toString().equalsIgnoreCase("custom")) {
List<String> bodYparams = new ArrayList<>();
String regex = "\\$\\{(.*?)\\}";
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(jsonNode.get("value").toString());
while (matcher.find()) {
bodYparams.add(matcher.group(1));
}
String result = jsonNode.get("value").toString();
for (String param : bodYparams) {
for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), null);
List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) {
result = result.replace("${" + param + "}", dataList.get(0)[i]);
}
}
}
}
}
body.put(jsonNode.get("name").toString(), result);
} else if (jsonNode.get("nameType") != null && jsonNode.get("nameType").toString().equalsIgnoreCase("timeFun")) {
String timeFormat = jsonNode.get("value").toString();
Calendar calendar = Calendar.getInstance();
Date date = calendar.getTime();
if (StringUtils.isNotEmpty(timeFormat) && timeFormat.split(" ")[0].equalsIgnoreCase("currentDay")) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(timeFormat.split(" ")[1]);
body.put(jsonNode.get("name").toString(), simpleDateFormat.format(date));
}
} else {
body.put(jsonNode.get("name").asText(), jsonNode.get("value").asText());
}
}
} }
} }
response = HttpClientUtil.post(apiDefinition.getUrl(), body, httpClientConfig); response = HttpClientUtil.post(apiDefinition.getUrl(), body, httpClientConfig);

5
core/core-frontend/src/views/visualized/data/datasource/form/ApiBody.vue
View File

@ -38,6 +38,10 @@ const props = defineProps({
headers: { headers: {
type: Array as PropType<Item[]>, type: Array as PropType<Item[]>,
default: () => [] default: () => []
},
valueList: {
type: Array as PropType<Item[]>,
default: () => []
} }
}) })
const { t } = useI18n() const { t } = useI18n()
@ -216,6 +220,7 @@ const emits = defineEmits(['headersChange'])
:is-show-enable="isShowEnable" :is-show-enable="isShowEnable"
type="body" type="body"
@change-parameters="changeParameters" @change-parameters="changeParameters"
:value-list="valueList"
/> />
</div> </div>
<div v-if="apiBody.type == 'JSON'" class="ms-body"> <div v-if="apiBody.type == 'JSON'" class="ms-body">

1
core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestForm.vue
View File

@ -173,6 +173,7 @@ const emits = defineEmits(['changeId'])
:headers="apiRequest.headers" :headers="apiRequest.headers"
:body="apiRequest.body" :body="apiRequest.body"
:is-show-enable="isShowEnable" :is-show-enable="isShowEnable"
:value-list="valueList"
/> />
</el-tab-pane> </el-tab-pane>

1
core/core-frontend/src/views/visualized/data/datasource/form/ApiVariable.vue
View File

@ -77,6 +77,7 @@ const change = () => {
new KeyValue({ new KeyValue({
type: 'text', type: 'text',
enable: true, enable: true,
nameType: 'fixed',
uuid: guid(), uuid: guid(),
contentType: 'text/plain' contentType: 'text/plain'
}) })