国际化增加bypass

Intercept中证书改为Key Ring 白名单动作修改为Bypass 域名拦截强度规划为动作参数动作切换方法由common.js移除公共字符串界面，如果configHex值只有一个，则隐藏isHex和isCasesitive选项
2018-11-14 15:30:25 +08:00
parent 30ea5dfeaf
commit 0be964805c
9 changed files with 241 additions and 215 deletions
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -190,7 +190,7 @@
 			</div>
 		</div>
 </div>
-<div class="row">
+<div class="row <c:if test="${fn:length(fn:split(region.configHex,',')) ==1}">hidden</c:if>">
 		<c:if test="${!empty region.configHex}">
 		    <div class="col-md-6">
 		        <div class="form-group ">
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -22,6 +22,7 @@
 								openSingleBoxsolid();
 								
 						  });
+						setInterceptDefaultInfo($("input[name='cfgId']").val());
 						openSingleBoxsolid();
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -82,9 +83,11 @@
 											if(action==1){ //监测 
 												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}else if(action==64){//限速
 												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												var rateLimitType=$("input[name='userRegion1']checked").val();
 												if(rateLimitType == 0){//丢包率
 													$(".bandwith").find("input[name='userRegion3']").attr("disabled",true);
@@ -95,6 +98,7 @@
 											}else if(action==80){//替换
 												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}else {//白名单
 												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
@@ -168,58 +172,85 @@
 			var keyringType=$(".monitAction").find("select[name='userRegion1']").find("option[value='"+cert+"']").attr("keyringType");
 			if(cert != '' && keyringType == 'end-entity'){
 				var cn=$(".monitAction").find("select[name='userRegion1']").find("option[value='"+cert+"']").attr("cn");
-				var cnReg = new RegExp('^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\'+cn.replace("*","")+')+$');
-				var san=$(".monitAction").find("select[name='userRegion1']").find("option[value='"+cert+"']").attr("san");
-				if(cn.trim() =='' && san.trim() ==''){
-					flag=false;
-				}else{
-					$("input[name$='cfgRegionCode'").each(function(){
-						var serviceType=$(this).attr("serviceType");
-						var prefixName=$(this).attr("name").split("cfgRegionCode")[0];
-						if(serviceType == "intercept_domain"){
-							var domain=$("input[name='"+prefixName+"cfgKeywords']").val();
-							var domain=domain.trim();
-							if(!flag){
-								for (var i=0;i<san.split(",").length;i++) {
-									if(san.split(",")[i] != null && san.split(",")[i] != '' && san.split(",")[i].trim() !=''){
-										if(flag){
-											break;
+				if(cn !='' && cn != null){
+					var cnReg = new RegExp('^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\'+cn.replace("*","")+')+$');
+					var san=$(".monitAction").find("select[name='userRegion1']").find("option[value='"+cert+"']").attr("san");
+					if(san != null && san !=''){
+						$("input[name$='cfgRegionCode'").each(function(){
+							var serviceType=$(this).attr("serviceType");
+							var prefixName=$(this).attr("name").split("cfgRegionCode")[0];
+							if(serviceType == "intercept_domain"){
+								var domain=$("input[name='"+prefixName+"cfgKeywords']").val();
+								var domain=domain.trim();
+								if(!flag){
+									for (var i=0;i<san.split(",").length;i++) {
+										if(san.split(",")[i] != null && san.split(",")[i] != '' && san.split(",")[i].trim() !=''){
+											if(flag){
+												break;
+											}
+											var sanStr=san.split(",")[i].trim();
+											if(sanStr.indexOf("*") >-1){
+												var sanReg= new RegExp('^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\'+sanStr.replace("*","")+')+$');
+												if(sanReg.exec(domain) != null){
+													flag=true;
+												}
+											}else{
+												if(sanStr == domain){ //完全匹配
+													flag=true;
+												}
+											}
 										}
-										var sanStr=san.split(",")[i].trim();
-										if(sanStr.indexOf("*") >-1){
-											var sanReg= new RegExp('^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\'+sanStr.replace("*","")+')+$');
-											if(sanReg.exec(domain) != null){
+									}
+									
+									if(!flag){
+										if(cn.indexOf("*") > -1){
+											if(cnReg.exec(domain) != null){
 												flag=true;
 											}
 										}else{
-											if(sanStr == domain){ //完全匹配
+											if(cn == domain){ //完全匹配
 												flag=true;
 											}
 										}
 									}
+								}else{
+									flag=true;
 								}
-								
-								if(!flag){
-									if(cn.indexOf("*") > -1){
-										if(cnReg.exec(domain) != null){
-											flag=true;
-										}
-									}else{
-										if(cn == domain){ //完全匹配
-											flag=true;
-										}
-									}
-								}
+							}
+							if(!flag){
+								$("div[for='"+prefixName+"cfgKeywords']").html("");
+								$("div[for='"+prefixName+"cfgKeywords']").html("<label class='error'>"+$("#certNotMatchDomain").text()+"</label>");
 							}else{
-								flag=true;
+								$("div[for='"+prefixName+"cfgKeywords']").html("");
+							}
+						});
+					}else{
+						flag=false;
+						$("input[name$='cfgRegionCode'").each(function(){
+							var serviceType=$(this).attr("serviceType");
+							var prefixName=$(this).attr("name").split("cfgRegionCode")[0];
+							if(serviceType == "intercept_domain"){
+								if(error ==null || error.trim() == ''){
+									$("div[for='"+prefixName+"cfgKeywords']").html("");
+									$("div[for='"+prefixName+"cfgKeywords']").html("<label class='error'>"+$("#certNotMatchDomain").text()+"</label>");
+								}
+							}
+							
+						});
+					}
+				}else{
+					flag=false;
+					$("input[name$='cfgRegionCode'").each(function(){
+						var serviceType=$(this).attr("serviceType");
+						var prefixName=$(this).attr("name").split("cfgRegionCode")[0];
+						var error=$("div[for='"+prefixName+"cfgKeywords']").html();
+						if(serviceType == "intercept_domain"){
+							if(error ==null || error.trim() == ''){
+								$("div[for='"+prefixName+"cfgKeywords']").html("");
+								$("div[for='"+prefixName+"cfgKeywords']").html("<label class='error'>"+$("#certNotMatchDomain").text()+"</label>");
 							}
 						}
-						if(!flag){
-							$("div[for='"+prefixName+"cfgKeywords']").html("");
-							$("div[for='"+prefixName+"cfgKeywords']").html("<label class='error'>"+$("#certNotMatchDomain").text()+"</label>");
-						}else{
-							$("div[for='"+prefixName+"cfgKeywords']").html("");
-						}
+						
 					});
 				}
 			}else{
@@ -231,6 +262,105 @@
 		return flag;
 		
 	}
+	var setInterceptDefaultInfo=function(cfgId){
+		var action=$("input[name='action']:checked").val();
+		var interceptRatelimitIp="";
+		var interceptReplacePktBin="";
+		var protocolNamePrefix="";
+		var serviceType="";
+		//查找当前业务中的serviceRegionType，是否存在intercept_ratelimit_ip
+		$("input[name$='cfgRegionCode']").each(function(){
+			//替换动作非tcp
+			var serviceRegionTypeValue=$(this).attr("serviceType");
+			serviceType=serviceRegionTypeValue;
+			var serviceRegionTypeName=$(this).attr("name");
+			if(serviceRegionTypeName.indexOf(".") >-1){
+				serviceRegionTypeName=serviceRegionTypeName.substring(0,serviceRegionTypeName.indexOf(".")+1);
+			}else{
+				serviceRegionTypeName="";
+			}
+			if(serviceRegionTypeValue == 'intercept_ratelimit_ip'){
+				interceptRatelimitIp=serviceRegionTypeValue;
+				protocolNamePrefix=serviceRegionTypeName;
+			}
+			if(serviceRegionTypeValue == 'intercept_replace_pkt_bin'){
+				interceptReplacePktBin=serviceRegionTypeValue;
+			}
+		});
+		if(action==1){ 
+			//监测
+			$(".monitAction").removeClass("hidden");
+			$(".ratelimitAction").addClass("hidden");
+			$(".replaceAction").addClass("hidden");
+			$(".whiteListAction").addClass("hidden");
+			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
+				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+				//$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='0' selected>"+$.validator.messages.all+"</option>");
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6' selected>TCP</option>");
+				//$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17'>UDP</option>");
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+			}
+			if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){
+				$("."+interceptReplacePktBin).addClass("hidden");
+				$("."+interceptReplacePktBin+"_div").addClass("hidden");
+			}
+		}else if(action==64){
+			//限速
+			$(".monitAction").addClass("hidden");
+			$(".ratelimitAction").removeClass("hidden");
+			$(".replaceAction").addClass("hidden");
+			$(".whiteListAction").addClass("hidden");
+			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){	
+				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='0' selected>"+$.validator.messages.all+"</option>");
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6'>TCP</option>");
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17'>UDP</option>");
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+				switchRateLimitType();
+			}
+			if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){
+				$("."+interceptReplacePktBin).addClass("hidden");
+				$("."+interceptReplacePktBin+"_div").addClass("hidden");
+			}
+		}else if(action==80){
+			//替换
+			$(".monitAction").addClass("hidden");
+			$(".ratelimitAction").addClass("hidden");
+			$(".replaceAction").removeClass("hidden");
+			$(".whiteListAction").addClass("hidden");
+			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
+				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17' selected>UDP</option>")
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='1' >ICMP</option>")
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+			}
+			if(interceptReplacePktBin == 'intercept_replace_pkt_bin' && cfgId == ""){
+				$("."+interceptReplacePktBin).removeClass("hidden");
+				$("."+interceptReplacePktBin).find("span").removeClass("hidden");
+			}
+		}else if(action==128){
+			$(".monitAction").addClass("hidden");
+			$(".ratelimitAction").addClass("hidden");
+			$(".replaceAction").addClass("hidden");
+			$(".whiteListAction").removeClass("hidden");
+			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
+				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+				//$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='0' selected>"+$.validator.messages.all+"</option>")
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6' selected>TCP</option>")
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17'>UDP</option>")
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+			}
+			if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){
+				$("."+interceptReplacePktBin).addClass("hidden");
+				$("."+interceptReplacePktBin+"_div").addClass("hidden");
+			}
+		}
+		
+	}
 </script>
 </head>
 <body>
@@ -279,7 +409,6 @@

 							<div class="form-body">

-
 								<div class="row">
 									<div class="col-md-6">
 										<div class="form-group">
@@ -309,7 +438,10 @@
 																	<c:if test="${(dict.itemCode eq service.action) && (service.action eq 1) }">
 																			<spring:message code="intercept"/>
 																	</c:if>
-																	<c:if test="${(dict.itemCode eq service.action) && (service.action ne 1) }">
+																	<c:if test="${(dict.itemCode eq service.action) && (service.action eq 128) }">
+																			<spring:message code="bypass"/>
+																	</c:if>
+																	<c:if test="${(dict.itemCode eq service.action) && (service.action ne 1 && service.action ne 128 ) }">
 																		<spring:message code="${dict.itemValue }"/>
 																	</c:if>
 																</c:forEach>
@@ -345,37 +477,36 @@
 									</div>
 								</div>
 								<!-- dolog end-->
-								<!-- 域名拦截增加拦截强度 -->
-								<c:if test="${_cfg.functionId eq 201}">
-									<div class="row">
-											<div class="col-md-6">
-												<div class="form-group">
-													<label class="control-label col-md-3"><font color="red">*</font>
-															<spring:message code="intercept_intensity" />
-													</label>
-													<div class="col-md-6">
-														<select name="userRegion5"
-														class="selectpicker show-tick form-control required">
-															<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
-																<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
-															</c:forEach>
-														</select>
-													</div>
-													<div for="userRegion5"></div>
-												</div>
-											</div>
-										</div>
-								</c:if>
+								
 								<%--   action 为1 监测时 可以选择证书--%>
 								<div class="row monitAction hidden">
 								<h4 class="form-section">
 											<spring:message code="action_region" />
 											<small></small>
 										</h4>
+									<!-- 域名拦截增加拦截强度 -->
+									<c:if test="${_cfg.functionId eq 201}">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+														<spring:message code="intercept_intensity" />
+												</label>
+												<div class="col-md-6">
+													<select name="userRegion5"
+													class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
+															<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+												</div>
+												<div for="userRegion5"></div>
+											</div>
+										</div>
+									</c:if>
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message
-													code="certificate" /></label>
+													code="intercept_file_strategy" /></label>
 											<div class="col-md-6">
 												<select name="userRegion1" class="selectpicker show-tick form-control">
 													<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if> ><spring:message code="selected"/></option>
@@ -508,6 +639,32 @@
 											</div>
 										</div>
 								</div>
+								<%--   action 为128 白名单时 --%>
+								<c:if test="${_cfg.functionId eq 201}">
+								<div class="row whiteListAction hidden">
+								<h4 class="form-section">
+											<spring:message code="action_region" />
+											<small></small>
+										</h4>
+									<!-- 域名拦截增加拦截强度 -->
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+														<spring:message code="intercept_intensity" />
+												</label>
+												<div class="col-md-6">
+													<select name="userRegion5"
+													class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
+															<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+												</div>
+												<div for="userRegion5"></div>
+											</div>
+										</div>
+								</div>
+								</c:if>
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="complexCfgIndex" value="0"></c:set>
 								<c:set var="domainCfgIndex" value="0"></c:set>
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -373,7 +373,7 @@
 									<c:if test="${cfg.functionId ne 212 }">
 							    		<th><spring:message code="ratelimit"/></th>
 							    		<%-- <th><spring:message code="bandwith"/></th> --%>
-							    		<th><spring:message code="certificate"/></th>
+							    		<th><spring:message code="intercept_file_strategy"/></th>
 							    	</c:if>
 							    	<c:if test="${cfg.functionId eq 212 }">
 							    		<th><spring:message code="replace_zone"/></th>
@@ -413,7 +413,10 @@
 										<c:if test="${indexCfg.action eq 1}">
 											<spring:message code="intercept"/>
 										</c:if>
-										<c:if test="${indexCfg.action ne 1}">
+										<c:if test="${indexCfg.action eq 128}">
+											<spring:message code="bypass"/>
+										</c:if>
+										<c:if test="${(indexCfg.action ne 1) && (indexCfg.action ne 128)}">
 											<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 												<c:if test="${dict.itemCode eq indexCfg.action }">
 													<spring:message code="${dict.itemValue }"/>
@@ -442,7 +445,8 @@
 								    <td>
 								    	<c:if test="${indexCfg.action eq 1}">
 								    		<c:forEach items="${certificateList}" var="certificate">
-												<c:if test="${indexCfg.userRegion1==certificate.compileId}">${certificate.cfgDesc}</c:if>
+								    		${indexCfg.userRegion1}
+												<c:if test="${indexCfg.userRegion1=='${certificate.compileId}'}">${certificate.cfgDesc}</c:if>
 											</c:forEach>
 										</c:if>
 								    </td>
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
@@ -278,50 +278,6 @@
 							</div>
 						</div>
 					</c:if>
-					<c:if test="${cfg.isHexbin==1 }">
-						<div class="row">
-							<div class="col-md-4">
-								<div class="form-group">
-									<label><spring:message code="is_hex"/>:</label>
-									<label>
-										<spring:message code="hex"/>
-									</label>
-								</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="col-md-4">
-								<div class="form-group">
-									<label><spring:message code="is_case_insenstive"/>:</label>
-									<label>
-										<spring:message code="case_insenstive"/>
-									</label>
-								</div>
-							</div>
-						</div>
-					</c:if>
-					<c:if test="${cfg.isHexbin==2 }">
-						<div class="row">
-							<div class="col-md-4">
-								<div class="form-group">
-									<label><spring:message code="is_hex"/>:</label>
-									<label>
-										<spring:message code="not_hex"/>
-									</label>
-								</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="col-md-4">
-								<div class="form-group">
-									<label><spring:message code="is_case_insenstive"/>:</label>
-									<label>
-										<spring:message code="case_senstive"/>
-									</label>
-								</div>
-							</div>
-						</div>
-					</c:if>
 				</div>
 			</c:if>
 		</c:forEach>