修改URL 和domain类的关键字显示为当前业务

界面增加带宽的选项
2018-08-29 10:50:40 +08:00
parent a6b6696521
commit 7a5b2dc32a
14 changed files with 149 additions and 28 deletions
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -35,7 +35,18 @@
 	<div class="col-md-6">
 		<div class="form-group">
 			<label class="control-label col-md-3"><font color="red">*</font>
-			<spring:message code="keywords" /></label>
+				<c:choose>
+					<c:when test="${fn:containsIgnoreCase(region.configServiceType,'domain') }">
+						<spring:message code="domain" /> 
+					</c:when>
+					<c:when test="${fn:containsIgnoreCase(region.configServiceType,'url') }">
+						<spring:message code="URL" />
+					</c:when>
+					<c:otherwise>
+						<spring:message code="keywords" />
+					</c:otherwise>
+				</c:choose>
+			</label>
 			<!-- 此配置的关键词可以输入多个关键词 -->
 			<c:if test="${region.configMultiKeywords eq 1}">
 				<div class="col-md-6">
@@ -47,7 +58,9 @@
 			<!-- 此配置的关键词不允许输入多个关键词 -->
 			<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
 				<div class="col-md-6">
-					<input class="form-control required invisibleChar" type="text"
+					<input class="form-control required invisibleChar
+						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
+					" type="text"
 						name="cfgKeywords"
 						value="${_cfg.cfgKeywords}">
 				</div>
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -103,7 +103,7 @@
                                        	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
+												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
 											</form:select>
 									
                                         </div>
@@ -276,7 +276,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="key_word"/></th>
+									<th><spring:message code="URL"/></th>
 									<th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -104,7 +104,7 @@
                                        	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
+												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
 											</form:select>
 									
                                         </div>
@@ -278,7 +278,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="key_word"/></th>
+									<th><spring:message code="URL"/></th>
 									<th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -67,7 +67,19 @@
 	<div class="col-md-6">
 		<div class="form-group">
 			<label class="control-label col-md-3"><font color="red">*</font>
-			<spring:message code="keywords" /></label>
+			<c:choose>
+				<c:when test="${fn:containsIgnoreCase(region.configServiceType,'domain') }">
+					<spring:message code="domain" /> 
+				</c:when>
+				<c:when test="${fn:containsIgnoreCase(region.configServiceType,'url') }">
+					<spring:message code="URL" />
+				</c:when>
+				<c:otherwise>
+					<spring:message code="keywords" />
+				</c:otherwise>
+			</c:choose>
+			</label>
+			
 			<!-- 此配置的关键词可以输入多个关键词 -->
 			<c:if test="${region.configMultiKeywords eq 1}">
 				<div class="col-md-6">
@@ -81,7 +93,7 @@
 				<div class="col-md-6">
 					
 					<input class="form-control required invisibleChar
-						<c:if test="${fn:contains(region.configServiceType,'domain') }"> domainCheck </c:if>
+						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
 						" 
 							type="text"
 						name="${cfgName}.cfgKeywords"
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
@@ -127,7 +127,16 @@
 					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>
+								<label>
+								<c:choose>
+									<c:when test="${fn:containsIgnoreCase(cfg.cfgType,'URL') }">
+										<spring:message code="URL" />
+									</c:when>
+									<c:otherwise>
+										<spring:message code="keywords" />
+									</c:otherwise>
+								</c:choose>
+								:</label><label>
 								${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 							</div>
 						</div>
--- 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,9 @@
 						  });
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
+						$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
+							switchRateLimitType();
+						});
 						$("#cfgFrom").validate(
 								{
 									errorPlacement : function(error, element) {
@@ -87,6 +90,13 @@
 											}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);
+												var rateLimitType=$("input[name='userRegion1']checked").val();
+												if(rateLimitType == 0){//丢包率
+													$(".bandwith").find("input[name='userRegion3']").attr("disabled",true);
+												}
+												if(rateLimitType == 1){//带宽
+													$(".droprate").find("input[name='userRegion2']").attr("disabled",true);
+												}
 											}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);
@@ -257,15 +267,50 @@
 								</div>
 								<%--   action 为64 限速时 可以选择证书--%>
 								<div class="row ratelimitAction hidden">
-								    <div class="col-md-6">
+							   		 <div class="col-md-6">
 								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="limit_rate_type"/></label>
 								            <div class="col-md-6">
-								            	<input class="form-control required number" range="[0,1]" type="text" name="userRegion1" value="${_cfg.userRegion1 }">
+								            	<label class="radio-inline"> 
+													<input type="radio"
+														name="userRegion1" value="0"
+														<c:if test="${(userRegion1 eq 0) || (empty userRegion1)}">
+															checked
+														</c:if>
+														class="required" > 
+													<spring:message	code="ratelimit" />
+												</label>
+								            	<label class="radio-inline"> 
+													<input type="radio"
+														name="userRegion1" value="1"
+														<c:if test="${(userRegion1 eq 1)}">
+															checked
+														</c:if>
+														class="required" > 
+													<spring:message	code="bandwith" />
+												</label>
 								            </div>
 								            <div for="userRegion1"></div>
 								        </div>
-								    </div>
+							   		 </div>
+							   		 <div class="col-md-6 droprate">
+								        <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 }">
+								            </div>
+								            <div for="userRegion2"></div>
+								        </div>
+							   		 </div>
+							   		 <div class="col-md-6 bandwith">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="bandwith"/></label>
+								            <div class="col-md-6">
+								            	<input class="form-control required number" type="text" name="userRegion3" value="${_cfg.userRegion3 }">
+								            </div>
+								            <div for="userRegion3"></div>
+								        </div>
+							   		 </div>
 								</div> 
 								<%--action 为80 替换时 可以选择替换动作--%>
 								<div class="row replaceAction hidden">
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -316,6 +316,7 @@
 									<th style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 							    	<th><spring:message code="ratelimit"/></th>
+							    	<th><spring:message code="bandwith"/></th>
 							    	<th><spring:message code="certificate"/></th>
 							    	<c:if test="${interceptType eq 'Ip' }">
 							    		<th><spring:message code="replace_zone"/></th>
@@ -351,7 +352,12 @@
 								    <td>${indexCfg.cfgDesc }</td>
 								    <td>
 								    	<c:if test="${indexCfg.action eq 64}">
-								    		${indexCfg.userRegion1 }
+								    		${indexCfg.userRegion2 }
+								    	</c:if>
+								    </td>
+								    <td>
+								    	<c:if test="${indexCfg.action eq 64}">
+								    		${indexCfg.userRegion3 }
 								    	</c:if>
 								    </td>
 								    <td>
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
@@ -161,7 +161,7 @@
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='URL' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>
 		</div>
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
@@ -162,7 +162,7 @@
 	<div class="row">
 		<div class="col-md-8">
 			<div class="form-group">
-				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+				<label><spring:message code='URL' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
 			</div>
 		</div>