diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 077274645..53d39418b 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -331,8 +331,18 @@ public class HttpRedirectPolicyController extends BaseController { Page 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 list = proxyFileResponsePageService.getProxyFileResponsePageCfgList(temp); + cfg.setUserRegion2(list.get(0).getFileDesc()); + } + } + } //日志总量 List> logTotals=new ArrayList>(); StringBuilder compileIds=new StringBuilder(",");//配置ids diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java index 4dae7e9a5..5212497cc 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java @@ -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);