From 5c06435d77d30aab42a618b61ca444cfb9a7a1d2 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Fri, 14 Dec 2018 18:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=85=8D=E7=BD=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E4=B8=8E=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/IpMultiplexPoolCfgController.java            | 2 +-
 .../controller/configuration/proxy/InterceptController.java  | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp         | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
index 1f8bd42f5..1457add36 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
@@ -100,7 +100,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 			if(!StringUtil.isEmpty(ids)){
 				ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId);
 			}
-			addMessage(redirectAttributes,"delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		}catch(Exception e){
 				logger.error(e);
 				addMessage(redirectAttributes,"error", "delete_failed");
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 6d4f8dd9e..d6e03e5e8 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
@@ -192,7 +192,7 @@ public class InterceptController extends CommonController{
 	public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		try {
 			interceptCfgService.updatInterceptValid(isValid,ids,functionId);
-			addMessage(redirectAttributes,"error","delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			logger.error("intercept ip delete failed",e);
 			addMessage(redirectAttributes,"error","delete_failed");
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 0234908b5..97d53643d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -54,7 +54,7 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<shiro:hasPermission name="app:http:config">
+		<shiro:hasPermission name="app:ssl:config">
 			<button type="button" class="btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/sslCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 58c4926a9..882cb7229 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -123,7 +123,10 @@
 										<input type="radio"
 											name="${cfgName}.exprType" value="${exprType }"
 											class="required"
-											<c:if test="${stat.index == 0 }"> checked </c:if>
+											<%-- <c:if test="${stat.index == 0 }"> checked </c:if> --%>
+											<c:if test="${cfg.exprType eq exprType || (empty cfg.exprType && exprType eq 0)}">
+												checked
+											</c:if>
 										> 
 										<spring:message	code="${exprTypeC.itemValue }" />
 									</label>