gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复http block导出response content字段不统一、http manipulate导出少域问题

Browse Source
This commit is contained in:
wangwei
2019-06-04 08:52:41 +08:00
parent 87dc47cbf3
commit 0406998c42
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -331,8 +331,18 @@ public class HttpRedirectPolicyController extends BaseController {
Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
ipLists = page.getList();
}
Integer fucntionId = Integer.parseInt(request.getParameter("functionId"));
if(fucntionId==207){
for(CfgIndexInfo cfg:ipLists){
String userRegion3 = cfg.getUserRegion3();
if(!"".equals(userRegion3) && userRegion3 !=null){
ProxyFileResponsePageCfg temp = new ProxyFileResponsePageCfg();
temp.setCompileId(Integer.parseInt(cfg.getUserRegion3()));
List<ProxyFileResponsePageCfg> list = proxyFileResponsePageService.getProxyFileResponsePageCfgList(temp);
cfg.setUserRegion2(list.get(0).getFileDesc());
}
}
}
//日志总量
List<Map<String,Object>> logTotals=new ArrayList<Map<String,Object>>();
StringBuilder compileIds=new StringBuilder(",");//配置ids

25
src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java
View File

@@ -520,21 +520,16 @@ public class ManipulatPolicyController extends BaseController {
dataMap.put(entity.getMenuNameCode(), baseLists);
dataMap.put("NTC_HTTP_URL", httpUrlList);
dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList);
if (entity.getFunctionId() != 208 && entity.getFunctionId() != 211) {
titleList.add("NTC_HTTP_RES_BODY");
classMap.put("NTC_HTTP_RES_BODY", HttpBodyCfg.class);
noExportMap.put("NTC_HTTP_RES_BODY", httpResBodyCfgNoExport);
dataMap.put("NTC_HTTP_RES_BODY", httpResBodyList);
} else if (entity.getFunctionId() != 211) {
titleList.add("NTC_HTTP_RES_HDR");
titleList.add("NTC_HTTP_REQ_BODY");
classMap.put("NTC_HTTP_RES_HDR", HttpResHeadCfg.class);
classMap.put("NTC_HTTP_REQ_BODY", HttpBodyCfg.class);
noExportMap.put("NTC_HTTP_RES_HDR", httpResHeadCfgNoExport);
noExportMap.put("NTC_HTTP_REQ_BODY", httpReqBodyCfgNoExport);
dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList);
dataMap.put("NTC_HTTP_REQ_BODY", httpReqBodyList);
}
titleList.add("NTC_HTTP_RES_HDR");
titleList.add("NTC_HTTP_REQ_BODY");
classMap.put("NTC_HTTP_RES_HDR", HttpResHeadCfg.class);
classMap.put("NTC_HTTP_REQ_BODY", HttpBodyCfg.class);
noExportMap.put("NTC_HTTP_RES_HDR", httpResHeadCfgNoExport);
noExportMap.put("NTC_HTTP_REQ_BODY", httpReqBodyCfgNoExport);
dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList);
dataMap.put("NTC_HTTP_REQ_BODY", httpReqBodyList);
titleList.add("NTC_UNIVERSAL_IP");
titleList.add("NTC_SUBSCRIBE_ID");
classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class);