wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev

Browse Source
This commit is contained in:
潘飞
2023-03-28 17:01:21 +08:00
parent bf847beeae 11b6bb5545
commit 975744d5ec
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
system/Tnb.Systems/System/DataInterfaceService.cs
View File

@@ -326,11 +326,11 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
}
VerifyRequired(info, dicParameters);
ReplaceParameterValue(info, dicParameters);
if (info.DataType == 1)
if (info?.DataType == 1)
{
output = await GetData(info);
}
else if (info.DataType == 2)
else if (info?.DataType == 2)
{
output = info.Query.ToObject<object>();
}
@@ -338,7 +338,7 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
{
output = await GetApiDataByTypePreview(info);
}
if (info.DataProcessing.IsNullOrEmpty())
if (info is null || info.DataProcessing.IsNullOrEmpty())
{
return output;
}
@@ -897,8 +897,8 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
private async Task<JObject> GetApiDataByTypePreview(DataInterfaceEntity entity)
{
var result = new JObject();
var parameters = entity.RequestParameters.ToObject<List<DataInterfaceReqParameter>>();
var parametersHerader = entity.RequestHeaders.ToObject<List<DataInterfaceReqParameter>>();
var parameters = entity?.RequestParameters.ToObject<List<DataInterfaceReqParameter>>() ?? new List<DataInterfaceReqParameter>();
var parametersHerader = entity?.RequestHeaders.ToObject<List<DataInterfaceReqParameter>>() ?? new List<DataInterfaceReqParameter>();
var dic = new Dictionary<string, object>();
var dicHerader = new Dictionary<string, object>();
dicHerader.Add("JNPF_API", true);
@@ -914,7 +914,7 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
dicHerader[key.field] = key.defaultValue;
}
switch (entity.RequestMethod)
switch (entity?.RequestMethod)
{
case "6":
result = (await entity.Path.SetHeaders(dicHerader).SetQueries(dic).GetAsStringAsync()).ToObject<JObject>();