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

1、修复拦截策略的导出空指针异常

Browse Source 
2、修复proxy的控制策略导出重定向错误信息
This commit is contained in:
leijun
2018-11-07 18:11:42 +08:00
parent 37dd47ef45
commit bff0c1d428
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,7 @@ public class HttpRedirectPolicyController extends BaseController{
//http配置导出 //http配置导出
@RequestMapping(value = "exportHttp") @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){ @ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try { try {
//export data info //export data info
@@ -405,6 +405,6 @@ public class HttpRedirectPolicyController extends BaseController{
logger.error("http export failed",e); logger.error("http export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes, "export_failed");
} }
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId(); /*return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();*/
} }
} }

13
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -237,12 +237,21 @@ public class InterceptController extends CommonController{
} }
if(certificateList!=null){ if(certificateList!=null){
if(entity.getFunctionId()==200|| entity.getFunctionId()==201){ if(entity.getFunctionId()==200|| entity.getFunctionId()==201){
if(!StringUtil.isEmpty(str.getUserRegion1())){
boolean flag=false;
for (PxyObjKeyring pxyObjKeyring : certificateList) { for (PxyObjKeyring pxyObjKeyring : certificateList) {
if(str.getUserRegion2().equals(pxyObjKeyring.getCompileId())){ if(str.getUserRegion1().equals(String.valueOf(pxyObjKeyring.getCompileId()))){
str.setUserRegion2(pxyObjKeyring.getCfgDesc()); str.setUserRegion1(pxyObjKeyring.getCfgDesc());
flag=true;
break;
}
}
if(!flag){
str.setUserRegion1(null);
} }
} }
} }
} }
} }
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());