From bff0c1d428012050b18c3bf1d237407199c26686 Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Wed, 7 Nov 2018 18:11:42 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E7=9A=84=E5=AF=BC=E5=87=BA=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=202=E3=80=81=E4=BF=AE=E5=A4=8Dproxy?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6=E7=AD=96=E7=95=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E9=87=8D=E5=AE=9A=E5=90=91=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/HttpRedirectPolicyController.java     |  4 ++--
 .../proxy/InterceptController.java              | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

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());