app ssl、http、header界面关键字十六进制校验，关键字去掉系统多关键字分隔符

修改关键字配置跳转http日志菜单，日志菜单选中
字符串域配置修改，修复表达式一直选中第一个值问题
地址池和拦截controller中增加messageType

10 files changed, 59 insertions, 36 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 57be837..892047f 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 87b2725..687596d 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/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
index 4e5bab5..250714c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
@@ -32,6 +32,7 @@ $(function(){
 				var isHexbin=$(this).val();
 				if(isHexbin == 1){ 
 					var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+					keywords=keywords.replace("***and***","");
 					if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 						$(this).parents(".form-body").find(
 								"div[for='"
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index 397bca3..dc132d0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -32,6 +32,7 @@ $(function(){
 				var isHexbin=$(this).val();
 				if(isHexbin == 1){ 
 					var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+					keywords=keywords.replace("***and***","");
 					if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 						$(this).parents(".form-body").find(
 								"div[for='"
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
index 0585bcb..abd8f65 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
@@ -32,13 +32,14 @@ $(function(){
 				var isHexbin=$(this).val();
 				if(isHexbin == 1){ 
 					var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+					keywords=keywords.replace("***and***","");	
 					if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 						$(this).parents(".form-body").find(
 								"div[for='"
 										+ $(this).attr("name").replace("isHexbin","cfgKeywords")
 										+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
 						flag = false;
-					}					
+					}
 				}
 			});
 			if(flag){
@@ -53,6 +54,13 @@ $(function(){
 		errorContainer: "#messageBox",
 	});
 });
+function changeDistrict(obj){
+	if("others"==obj.val()){
+		obj.parent().siblings(".otherValue").prop("type","text");
+	}else{
+		obj.parent().siblings(".otherValue").prop("type","hidden");
+	}
+}
 </script>
 </head>
 <body>
@@ -441,4 +449,4 @@ $(function(){
 	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
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 c059bb7..62ad6a1 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 cfbce85..ee752f8 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>
diff --git a/src/main/webapp/static/global/scripts/pzLog.js b/src/main/webapp/static/global/scripts/pzLog.js
index 1871377..4508963 100644
--- a/src/main/webapp/static/global/scripts/pzLog.js
+++ b/src/main/webapp/static/global/scripts/pzLog.js
@@ -100,8 +100,8 @@ var toLogSearch = function(index){
 	// 保存配置界面URL
 	$("#searchForm").each(function(){
 		var cfgUrl = $(this).attr("action");
-		sessionStorage.removeItem('cfgUrl');
-		sessionStorage.setItem('cfgUrl',cfgUrl);
+		sessionStorage.removeItem('cfg_url');
+		sessionStorage.setItem('cfg_url',cfgUrl);
 	});
 	
 	var td = document.getElementById(index+"logTotal");
@@ -114,7 +114,7 @@ var toLogSearch = function(index){
 			var date=$(this).attr("date");
 			var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
 			
-			switchMenu("152");
+			switchMenu("152",functionId);
 			window.location.href = pathName+"/toLogSearch?service="+serviceId+"&functionId="+functionId+"&cfgId="+compileId+"&date="+date+"&isLogTotalSearch=yes";			
 			
 		}
@@ -122,7 +122,7 @@ var toLogSearch = function(index){
 	
 }
 
-var switchMenu = function(topMenuId){
+var switchMenu = function(topMenuId,functionId,oldMenuName){
 	// 顶部菜单切换	menuId： Policies/86 Logs/152
 	$(".hor-menu ul li",parent.document).each(function(){
 		var id = $(this).children("a").attr("id");
@@ -145,43 +145,49 @@ var switchMenu = function(topMenuId){
 		}
 	});
 	
+	if(topMenuId == 152){
+		if(functionId == 8 || functionId == 35){// HTTP or Mail
+			lastMenuName = middleMenu[0];
+		}
+		sessionStorage.removeItem('old_memu_name');
+		sessionStorage.setItem('old_memu_name',middleMenu[middleMenu.length-1]);
+	}else{
+		lastMenuName = oldMenuName;
+	}
+	
 	// 左侧菜单切换
 	$(".page-sidebar",parent.document).find("ul[id]").each(function(){
 		var id = $(this).attr("id")
 		if(id.indexOf(topMenuId) != -1){
 			$(this).removeClass("hide");
-			// 收回展开的菜单
+			// 收回原展开的菜单
 			$(this).find("li").each(function(index){
 				$(this).children("a").children("span").next().removeClass("open");
 				$(this).children("ul").hide();
 			});
-			
+			var count = 0;
 			// 选中左侧菜单
-			$(this).children("li").each(function(){
-				if($(this).attr("menu-name") == firstMenuName){
-					$(this).addClass("active open");// 选中主菜单
-					$(this).children("a").children("span").next().addClass("open");//﹀
-					$(this).children("ul").show();
-					
-					$(this).find("li").each(function(){
-						if($.inArray($(this).attr("menu-name"),middleMenu) != -1){
-							$(this).addClass("active open");
-							$(this).children("a").children("span").next().addClass("open");
-							$(this).children("ul").show();
-						}
-						if($(this).attr("menu-name") == lastMenuName){
-							//$(this).addClass("active");
-							$(this).children("a").trigger("click");
-							return false;
-						}
-						
+			$(this).find("li").each(function(index){
+				if($(this).attr("menu-name") == lastMenuName){
+					count++;
+					$(this).children("a").trigger("click");// 选中底层菜单
+					$(this).parents("li").each(function(){
+						$(this).addClass("active open");
+						$(this).children("a").children("span").next().addClass("open");
+						$(this).children("ul").show();
 					});
-					
+					if(topMenuId == 86){
+						if(functionId == 35 && count == 1){// HTTP/Mail(Advanced)
+							return true;
+						}
+						return false;
+					}
 				}
-				
 			});
+			
 		}else{
 			$(this).addClass("hide");
+			
 		}
 	});
 	//loading('onloading');
diff --git a/src/main/webapp/static/pages/scripts/home.js b/src/main/webapp/static/pages/scripts/home.js
index 7bec90a..0979560 100644
--- a/src/main/webapp/static/pages/scripts/home.js
+++ b/src/main/webapp/static/pages/scripts/home.js
@@ -39,12 +39,14 @@ var home = function () {
 			}
 			
 			//默认点击左侧第一个有链接的菜单，显示其功能界面
-			/*$(menuId).find("li").removeClass("open active");
-			$(menuId).find("li > a > .arrow").removeClass("open");*/
+			$(menuId).find("li").removeClass("open active");
+			$(menuId).find("li > a > .arrow").removeClass("open");
 			$(menuId).find('li > .sub-menu').slideUp();
+			
 			var $firstLi1 = $(menuId).find("li > a[onclick]:first");
 			$firstLi1.trigger("click");
 			$firstLi1.parent().parent().slideDown();
+			$firstLi1.parents("ul:first").parents("li:first").find('> a > .arrow').addClass('open');
 			
 			//点击顶部菜单，默认展开左侧菜单，如果左侧菜单已有被选中的则忽视
 			/*var left_menu_lis = $(menuId).find("li");
diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index e2bda68..6692dd0 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -86,8 +86,10 @@ function getPixelsCount(str, strFontSize){
 }
 function back(){
 	// 获取配置界面URl并跳转
-	var url = sessionStorage.getItem('cfgUrl');
-	switchMenu("86");
+	var url = sessionStorage.getItem('cfg_url');
+	var oldMenuName = sessionStorage.getItem('old_memu_name');
+	var functionId = url.substr(url.lastIndexOf("=")+1);
+	switchMenu("86",functionId,oldMenuName);
 	window.location.href = url;
 }
 //对Date的扩展，将 Date 转化为指定格式的String