Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

2018-08-28 18:52:44 +08:00
parent 2b14a7db2b 414992b5ac
commit 2674eedcb7
8 changed files with 85 additions and 80 deletions
--- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
@@ -324,24 +324,24 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 			}
 			//限速需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps
 			if(entity.getAction().equals(Constants.RATELIMIT_ACTION)){
-				entity.setUserRegion2(StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2());
+				entity.setUserRegion1(StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1());
 				
-				maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+entity.getUserRegion2());
+				maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+entity.getUserRegion1());
 			}
 			String userRegion="";
 			//替换需要发zone
 			if(entity.getAction().equals(Constants.REPLACE_ACTION)){
 				//HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null)
-					userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion3();
+					userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion1();
 					String substitute="";
-					String userRegion4=StringUtil.isEmpty(entity.getUserRegion4()) ? "":entity.getUserRegion4();
+					String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
 					substitute="/";
-					userRegion4 = BaseService.replaceContentEscape(userRegion4);
-					substitute=substitute+userRegion4;
+					userRegion2 = BaseService.replaceContentEscape(userRegion2);
+					substitute=substitute+userRegion2;
 					
-					String userRegion5=StringUtil.isEmpty(entity.getUserRegion5()) ? "":entity.getUserRegion5();
-					userRegion5 = BaseService.replaceContentEscape(userRegion5);
-					substitute=substitute+"/"+userRegion5;
+					String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3();
+					userRegion3 = BaseService.replaceContentEscape(userRegion3);
+					substitute=substitute+"/"+userRegion3;
 					
 					userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
 					maatCfg.setUserRegion(userRegion);
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -4,8 +4,8 @@
 <head>
 <title></title>
 		<input type="hidden" name="cfgType" value="${region.configRegionValue }">
-		<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode }">
-		<input type="hidden" name="configMultiKeywords" value="${region.configRegionCode }">
+		<input type="hidden" name="cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
+		<input type="hidden" name="configMultiKeywords" value="${region.configMultiKeywords }">
 		<input type="hidden" name="configServiceType" value="${region.configServiceType }">
 		<input type="hidden" name="configHex" value="${region.configHex }">
 </head>
--- a/src/main/webapp/WEB-INF/sitemesh3.xml
+++ b/src/main/webapp/WEB-INF/sitemesh3.xml
@@ -35,6 +35,7 @@
  <mapping path="/nis/ntc/whitelist/ip/ajax*" exclue="true"/>
  <mapping path="/nis/ntc/whitelist/domain/ajax*" exclue="true"/>
  <mapping path="/nis/ntc/iplist/ajax*" exclue="true"/>
+  <mapping path="/nis/ntc/whitelist/ajax*" exclue="true"/>
  <!-- 对同一路径，启用多个装饰器 -->
  <mapping>
    <path>/articles/*</path>
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -12,8 +12,8 @@
 		and regionValue eq regionDistrict.configRegionValue}"> --%>
 		<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
 		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
-		<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configRegionCode }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
+		<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configMultiKeywords }">
 		<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
 		<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
 <%-- 	</c:if>
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -82,25 +82,18 @@
 											$("input[name$='exprType']").attr("disabled",false);
 											var action=$("input[name='action']:checked").val();
 											if(action==1){ //监测 
-												$("input[name='userRegion2']").val("");
-												$("select[name='userRegion3']").val("");
-												$("input[name='userRegion4']").val("");
-												$("input[name='userRegion5']").val("");
+												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}else if(action==64){//限速
-												$("select[name='userRegion1']").val("");
-												$("select[name='userRegion3']").val("");
-												$("input[name='userRegion4']").val("");
-												$("input[name='userRegion5']").val("");
+												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}else if(action==80){//替换
-												$("input[name='userRegion1']").val("");
-												$("input[name='userRegion2']").val("");
-												$("input[name='userRegion2']").val("");
+												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}else {//白名单
-												$("select[name='userRegion1']").val("");
-												$("input[name='userRegion2']").val("");
-												$("select[name='userRegion3']").val("");
-												$("input[name='userRegion4']").val("");
-												$("input[name='userRegion5']").val("");
+												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}
 											loading('onloading...');
 											form.submit();
@@ -268,9 +261,9 @@
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
 								            <div class="col-md-6">
-								            	<input class="form-control required number" range="[0,1]" type="text" name="userRegion2" value="${_cfg.userRegion2 }">
+								            	<input class="form-control required number" range="[0,1]" type="text" name="userRegion1" value="${_cfg.userRegion1 }">
 								            </div>
-								            <div for="userRegion2"></div>
+								            <div for="userRegion1"></div>
 								        </div>
 								    </div>
 								</div> 
@@ -287,15 +280,15 @@
 															<spring:message code="replace_zone" />
 													</label>
 													<div class="col-md-6">
-														<select name="userRegion3"
+														<select name="userRegion1"
 														class="selectpicker show-tick form-control required">
 															<option value="" ><spring:message code="selected"/></option>
 															<c:forEach items="${fns:getDictList('INTERCEPT_REPLACE_ZONE')}" var="replaceZoneC">
-																<option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion3==replaceZoneC.itemCode || _cfg.userRegion3==null}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option>
+																<option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion1==replaceZoneC.itemCode || _cfg.userRegion1==null}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option>
 															</c:forEach>
 														</select>
 													</div>
-													<div for="userRegion3"></div>
+													<div for="userRegion1"></div>
 												</div>
 											</div>
 										</div>
@@ -306,10 +299,10 @@
 														<spring:message code="replaced_content" /></label>
 													<div class="col-md-6">
 														<input class="form-control required" type="text"
-															name="userRegion4"
-															value="${_cfg.userRegion4 }">
+															name="userRegion2"
+															value="${_cfg.userRegion2 }">
 													</div>
-													<div for="userRegion4"></div>
+													<div for="userRegion2"></div>
 												</div>
 											</div>
 											<div class="col-md-6">
@@ -318,10 +311,10 @@
 														<spring:message code="replace_content" /></label>
 													<div class="col-md-6">
 														<input class="form-control required" type="text"
-															name="userRegion5"
-															value="${_cfg.userRegion5 }">
+															name="userRegion3"
+															value="${_cfg.userRegion3 }">
 													</div>
-													<div for="userRegion5"></div>
+													<div for="userRegion3"></div>
 												</div>
 											</div>
 										</div>
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -350,27 +350,36 @@
 									<td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
 								    <td>
-								    	${indexCfg.userRegion2 }
+								    	<c:if test="${indexCfg.action eq 64}">
+								    		${indexCfg.userRegion1 }
+								    	</c:if>
 								    </td>
 								    <td>
-							    		<c:forEach items="${certificateList}" var="certificate">
-											<c:if test="${indexCfg.userRegion1==certificate.compileId}">${certificate.cfgDesc}</c:if>
-										</c:forEach>
+								    	<c:if test="${indexCfg.action eq 1}">
+								    		<c:forEach items="${certificateList}" var="certificate">
+												<c:if test="${indexCfg.userRegion1==certificate.compileId}">${certificate.cfgDesc}</c:if>
+											</c:forEach>
+										</c:if>
 								    </td>
 								    <c:if test="${interceptType eq 'Ip' }">
-									    <td>
-									    	<c:forEach items="${fns:getDictList('INTERCEPT_REPLACE_ZONE')}" var="replaceZoneC">
-												<c:if test="${indexCfg.userRegion3==replaceZoneC.itemCode}">
-												<spring:message code="${replaceZoneC.itemValue}"/>
-												</c:if>
-											</c:forEach>
-									    </td>
-									    <td>
-									    	${indexCfg.userRegion4 }
-									    </td>
-									    <td>
-									    	${indexCfg.userRegion5 }
-									    </td>
+								    	<c:if test="${indexCfg.action eq 80}">
+										    <td>
+										    	<c:forEach items="${fns:getDictList('INTERCEPT_REPLACE_ZONE')}" var="replaceZoneC">
+													<c:if test="${indexCfg.userRegion1==replaceZoneC.itemCode}">
+													<spring:message code="${replaceZoneC.itemValue}"/>
+													</c:if>
+												</c:forEach>
+										    </td>
+										    <td>
+										    	${indexCfg.userRegion2 }
+										    </td>
+										    <td>
+										    	${indexCfg.userRegion3 }
+										    </td>
+									    </c:if>
+									    <c:if test="${indexCfg.action ne 80}">
+									    	<td></td><td></td><td></td>
+									    </c:if>
 									</c:if>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -243,7 +243,7 @@
 															<c:if test="${dict.itemCode==1}">
 																<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_business_type"/>:</label>
 																<div class="col-md-4">
-																	<select id="businessType1" name="businessType" class="form-control required">
+																	<select id="businessType1" name="businessType" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search">
 																		<option value=""><spring:message code="select"/></option>
 						                                                <c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE')}" var="dict">
 																		  <option value="${dict.itemCode}"
@@ -256,9 +256,9 @@
 															<c:if test="${dict.itemCode==3}">
 																<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="basic_protocol_business_type"/>:</label>
 																<div class="col-md-4">
-																<select id="businessType3" name="businessType"  class="form-control required">
+																<select id="businessType3" name="businessType"  class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search">
 					                                                <option value=""><spring:message code="select"/></option>
-					                                                <c:forEach items="${fns:getDictList('BASIC_PROTOCOL_BUSINESS_TYPE')}" var="dict">
+					                                                <c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE')}" var="dict">
 																	  <option value="${dict.itemCode}"
 																	  <c:if test="${dict.itemCode==specificServiceCfg.businessType}">selected</c:if>
 																	  ><spring:message code="${dict.itemValue}"/></option>
@@ -269,7 +269,7 @@
 															<c:if test="${dict.itemCode==2}">
 																<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="tunnel_behavior_business_type"/>:</label>
 																<div class="col-md-4">
-																<select id="businessType2" name="businessType"  class="form-control required">
+																<select id="businessType2" name="businessType" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search">
 					                                                <option value=""><spring:message code="select"/></option>
 					                                                <c:forEach items="${fns:getDictList('TUNNEL_BEHAV_BUSINESS_TYPE')}" var="dict">
 																	  <option value="${dict.itemCode}"
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -477,9 +477,9 @@ var setInterceptDefaultInfo=function(cfgId){
 	var interceptReplacePktBin="";
 	var protocolNamePrefix="";
 	//查找当前业务中的serviceRegionType，是否存在intercept_ratelimit_ip
-	$("input[name$='configServiceType']").each(function(){
+	$("input[name$='cfgRegionCode']").each(function(){
 		//替换动作非tcp
-		var serviceRegionTypeValue=$(this).val();
+		var serviceRegionTypeValue=$(this).attr("serviceType");
 		var serviceRegionTypeName=$(this).attr("name");
 		if(serviceRegionTypeName.indexOf(".") >-1){
 			serviceRegionTypeName=serviceRegionTypeName.substring(0,serviceRegionTypeName.indexOf(".")+1);
@@ -494,17 +494,17 @@ var setInterceptDefaultInfo=function(cfgId){
 			interceptReplacePktBin=serviceRegionTypeValue;
 		}
 	});
-	
 	if(action==1){ 
 		//监测
 		$(".monitAction").removeClass("hidden");
 		$(".ratelimitAction").addClass("hidden");
 		$(".replaceAction").addClass("hidden");
 		if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true);
+			$("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");
 		}
 		if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){
@@ -517,10 +517,11 @@ var setInterceptDefaultInfo=function(cfgId){
 		$(".ratelimitAction").removeClass("hidden");
 		$(".replaceAction").addClass("hidden");
 		if(interceptRatelimitIp == 'intercept_ratelimit_ip'){	
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true);
+			$("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");
 		}
 		if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){
@@ -533,10 +534,10 @@ var setInterceptDefaultInfo=function(cfgId){
 		$(".ratelimitAction").addClass("hidden");
 		$(".replaceAction").removeClass("hidden");
 		if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").attr("disabled",true);
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").attr("disabled",true);
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").removeAttr("disabled");
+			$("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 == ""){
@@ -551,10 +552,11 @@ var setInterceptDefaultInfo=function(cfgId){
 		$(".ratelimitAction").addClass("hidden");
 		$(".replaceAction").addClass("hidden");
 		if(interceptRatelimitIp == 'intercept_ratelimit'){
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled");
-			$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true);
+			$("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");
 		}
 		if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){