hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改header先后顺序

This commit is contained in:
lvleigang 2024-05-28 11:21:42 +08:00
parent 1a3e4ea999
commit c709069318
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
View File

@ -1696,12 +1696,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
return BaseResult.getFailureMessageEntity(receiveApi.getApiName() + "未授权给" + sendApp.getName() + "，请联系管理员"); return BaseResult.getFailureMessageEntity(receiveApi.getApiName() + "未授权给" + sendApp.getName() + "，请联系管理员");
} }
SysExtensionApiEntity sysExtensionApiEntity = new SysExtensionApiEntity(); SysExtensionApiEntity sysExtensionApiEntity = new SysExtensionApiEntity();
sysExtensionApiEntity.setHeaders(oldheaderMap);
sysExtensionApiEntity.setQuerys(oldquerys);
sysExtensionApiEntity.setBodys(oldbodys);
Method[] methods = 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"}); 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<>(); Map<String, String> headers = new HashMap<>();
@ -1714,14 +1709,25 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
} }
} }
} }
if (headerMap != null && headerMap.size() > 0) { if (oldheaderMap != null && oldheaderMap.size() > 0) {
for (Map.Entry<String, String> entry : headerMap.entrySet()) { for (Map.Entry<String, String> entry : oldheaderMap.entrySet()) {
if (!a.contains(entry.getKey())) { if (!a.contains(entry.getKey())) {
headers.put(entry.getKey(), entry.getValue()); headers.put(entry.getKey(), entry.getValue());
} }
} }
} }
sysExtensionApiEntity.setHeaders(headers);
sysExtensionApiEntity.setQuerys(oldquerys);
sysExtensionApiEntity.setBodys(oldbodys);
Method[] methods = null;
Object object = null;
// 判断是否有内部api 是否扩展api 1、启用 2、停用 // 判断是否有内部api 是否扩展api 1、启用 2、停用
if (receiveApi.getExtensionApi() != null && "1".equals(receiveApi.getExtensionApi()) if (receiveApi.getExtensionApi() != null && "1".equals(receiveApi.getExtensionApi())
&& receiveApi.getBeanName() != null && !"".equals(receiveApi.getBeanName()) && receiveApi.getBeanName() != null && !"".equals(receiveApi.getBeanName())
@ -1754,6 +1760,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
} }
} }
headers = sysExtensionApiEntity.getHeaders();
String querys = sysExtensionApiEntity.getQuerys(); String querys = sysExtensionApiEntity.getQuerys();
String bodys = sysExtensionApiEntity.getBodys(); String bodys = sysExtensionApiEntity.getBodys();
//设置参数获取参数 //设置参数获取参数
@ -1773,6 +1780,24 @@ 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)) {
@ -1826,7 +1851,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
} }
logger.info("保存日志开始"); logger.info("保存日志开始");
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(),true,null); SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headers, headers, oldquerys,querys, body.toString(),true,null);
if (methods != null && methods.length > 0) { if (methods != null && methods.length > 0) {
for (Method m : methods) { for (Method m : methods) {
if (null != m) { if (null != m) {
@ -1907,7 +1932,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
} }
} }
logger.info("保存日志开始"); logger.info("保存日志开始");
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(), true,null); SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headers, headers, oldquerys,querys, body.toString(), true,null);
if (methods != null && methods.length > 0) { if (methods != null && methods.length > 0) {
for (Method m : methods) { for (Method m : methods) {
if (null != m) { if (null != m) {