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 53364d9c5..1641591c7 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 @@ -251,7 +251,7 @@ public class HttpRedirectPolicyController extends BaseController{ //http配置导出 @RequestMapping(value = "exportHttp") - public String exportHttp(Model model,HttpServletRequest request,HttpServletResponse response, + public void exportHttp(Model model,HttpServletRequest request,HttpServletResponse response, @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -405,6 +405,6 @@ public class HttpRedirectPolicyController extends BaseController{ logger.error("http export failed",e); addMessage(redirectAttributes, "export_failed"); } - return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId(); + /*return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();*/ } } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 94cf2b122..5afd0a4e5 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -237,12 +237,21 @@ public class InterceptController extends CommonController{ } if(certificateList!=null){ if(entity.getFunctionId()==200|| entity.getFunctionId()==201){ + if(!StringUtil.isEmpty(str.getUserRegion1())){ + boolean flag=false; for (PxyObjKeyring pxyObjKeyring : certificateList) { - if(str.getUserRegion2().equals(pxyObjKeyring.getCompileId())){ - str.setUserRegion2(pxyObjKeyring.getCfgDesc()); - } + if(str.getUserRegion1().equals(String.valueOf(pxyObjKeyring.getCompileId()))){ + str.setUserRegion1(pxyObjKeyring.getCfgDesc()); + flag=true; + break; + } + } + if(!flag){ + str.setUserRegion1(null); + } } - } + } + } } titleList.add(entity.getMenuNameCode());