修改header先后顺序
This commit is contained in:
parent
fb0e87992c
commit
1a3e4ea999
|
@ -1701,6 +1701,26 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
sysExtensionApiEntity.setBodys(oldbodys);
|
sysExtensionApiEntity.setBodys(oldbodys);
|
||||||
Method[] methods = null;
|
Method[] methods = null;
|
||||||
Object object = null;
|
Object object = null;
|
||||||
|
Map<String, String> headerMap = sysExtensionApiEntity.getHeaders();
|
||||||
|
|
||||||
|
List<String> a = Arrays.asList(new String[]{"apicode", "appid", "secretkey", "publickey", "x-forwarded-for", "cookie", "x-forwarded-proto", "x-real-ip", "content-length", "accept-language", "host", "content-type", "connection", "cache-control", "accept-encoding", "pragma", "accept", "user-agent"});
|
||||||
|
Map<String, String> headers = new HashMap<>();
|
||||||
|
if (receiveApi.getHeaderIn() != null && !"".equals(receiveApi.getHeaderIn())) {
|
||||||
|
JSONArray jsonArray = JSONArray.parseArray(receiveApi.getHeaderIn());
|
||||||
|
if (jsonArray != null && jsonArray.size() > 0) {
|
||||||
|
for (int i = 0; i < jsonArray.size(); i++) {
|
||||||
|
JSONObject object1 = jsonArray.getJSONObject(i);
|
||||||
|
headers.put(object1.getString("parameterName"), object1.getString("example"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (headerMap != null && headerMap.size() > 0) {
|
||||||
|
for (Map.Entry<String, String> entry : headerMap.entrySet()) {
|
||||||
|
if (!a.contains(entry.getKey())) {
|
||||||
|
headers.put(entry.getKey(), entry.getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 判断是否有内部api 是否扩展api 1、启用 2、停用
|
// 判断是否有内部api 是否扩展api 1、启用 2、停用
|
||||||
if (receiveApi.getExtensionApi() != null && "1".equals(receiveApi.getExtensionApi())
|
if (receiveApi.getExtensionApi() != null && "1".equals(receiveApi.getExtensionApi())
|
||||||
|
@ -1734,7 +1754,6 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Map<String, String> headerMap = sysExtensionApiEntity.getHeaders();
|
|
||||||
String querys = sysExtensionApiEntity.getQuerys();
|
String querys = sysExtensionApiEntity.getQuerys();
|
||||||
String bodys = sysExtensionApiEntity.getBodys();
|
String bodys = sysExtensionApiEntity.getBodys();
|
||||||
//设置参数获取参数
|
//设置参数获取参数
|
||||||
|
@ -1754,24 +1773,6 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
|
||||||
if ("2".equals(receiveApi.getRequestMethod())) {
|
if ("2".equals(receiveApi.getRequestMethod())) {
|
||||||
method = "GET";
|
method = "GET";
|
||||||
}
|
}
|
||||||
List<String> a = Arrays.asList(new String[]{"apicode", "appid", "secretkey", "publickey", "x-forwarded-for", "cookie", "x-forwarded-proto", "x-real-ip", "content-length", "accept-language", "host", "content-type", "connection", "cache-control", "accept-encoding", "pragma", "accept", "user-agent"});
|
|
||||||
Map<String, String> headers = new HashMap<>();
|
|
||||||
if (receiveApi.getHeaderIn() != null && !"".equals(receiveApi.getHeaderIn())) {
|
|
||||||
JSONArray jsonArray = JSONArray.parseArray(receiveApi.getHeaderIn());
|
|
||||||
if (jsonArray != null && jsonArray.size() > 0) {
|
|
||||||
for (int i = 0; i < jsonArray.size(); i++) {
|
|
||||||
JSONObject object1 = jsonArray.getJSONObject(i);
|
|
||||||
headers.put(object1.getString("parameterName"), object1.getString("example"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (headerMap != null && headerMap.size() > 0) {
|
|
||||||
for (Map.Entry<String, String> entry : headerMap.entrySet()) {
|
|
||||||
if (!a.contains(entry.getKey())) {
|
|
||||||
headers.put(entry.getKey(), entry.getValue());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if ("POST".equals(method)) {
|
if ("POST".equals(method)) {
|
||||||
|
|
Loading…
Reference in New Issue