diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index cdcfb0d7c..2c081c9bb 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -121,7 +121,7 @@ subject_monitor=Subject Monit
 mail_keyword_monitor=Mail Content Monit
 mail_attachment_name_monitor=Mail Attachment Name Monit
 mail_attachment_content_monitor=Mail Attachment Content Monit
-specific_service_cfg=Specific Service Management
+specific_service_cfg=Specific Service
 file_transfer_monitor=File Transfer Monit
 ftp_address_monitor=FTP URL Monit
 encryption_monitor=Encypted Content Monit
@@ -328,7 +328,7 @@ attribute=Attribute
 area=Area
 isp=ISP
 scope=Feature Scope
-valid_identifier=Valid Intentifier
+valid_identifier=Effective Identification
 is_audit=Confirmation State
 creator=Creator
 config_time=Create Time
@@ -358,8 +358,8 @@ block_url=Block Url
 configuration=Configuration
 direction=Direction
 protocol=Protocol
-#oneway=\u5355\u5411
-#twoway=\u53CC\u5411
+oneway=single
+twoway=two-way
 arbitrary=Arbitrarily
 basic_config=Basic Configuration
 block_config=Configuration Info
@@ -856,8 +856,8 @@ file_upload_type_error=%s file type is incorrect,Allow uploaded files type conta
 file_upload_error=File upload failure!
 #=============multipart upload error info=================
 #=============function_service_dict==>service_name=================
-audio_sample_reject=Audio and video sample control
-audio_sample_monit=Audio and video sample monitoring
+audio_sample_reject=Multimedia sample control
+audio_sample_monit=Multimedia sample monitoring
 video_sample_reject=Video sample control
 video_sample_monit=Video sample monitoring
 pic_sample_reject=Picture sample control
@@ -871,24 +871,24 @@ video_pornography_sample_monit=Video pornography monitoring
 ip_white_monit=IP address white list monitoring
 ip_white_reject=IP address white list control
 ip_white_whitelist=IP address white list
-av_voip_ip_reject=Audio and video VoIp control
-av_voip_ip_monit=Audio and video VoIp monitoring
+av_voip_ip_reject=Multimedia VoIp control
+av_voip_ip_monit=Multimedia VoIp monitoring
 website_http_reject=Web site http control
 website_http_monit=Web site http monitoring
 domain_white_whitelist=Global domain name white list
-av_content_ip_reject=Audio and video content IP control
-av_content_ip_monit=Audio and video content IP monitoring
+av_content_ip_reject=Multimedia content IP control
+av_content_ip_monit=Multimedia content IP monitoring
 ip_reject=IP configure control
 ip_monit=IP configure monitoring
 ip_drop=IP configure drop
 ssl_monit=SSL monitoring
 ssl_reject=SSL control
-av_pic_ip_reject=Audio and video picture IP control
-av_pic_ip_monit=Audio and video picture IP monitoring
-av_content_url_reject=Audio and video content url control
-av_content_url_monit=Audio and video content url monitoring
-av_pic_url_reject=Audio and video picture url control
-av_pic_url_monit=Audio and video picture url monitoring
+av_pic_ip_reject=Multimedia picture IP control
+av_pic_ip_monit=Multimedia picture IP monitoring
+av_content_url_reject=Multimedia content url control
+av_content_url_monit=Multimedia content url monitoring
+av_pic_url_reject=Multimedia picture url control
+av_pic_url_monit=Multimedia picture url monitoring
 ip_loop=IP configure backflow
 website_dns_reject=Web sit dns control
 website_dns_monit=Web sit dns monitoring
diff --git a/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp
new file mode 100644
index 000000000..d6f4f39a1
--- /dev/null
+++ b/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp
@@ -0,0 +1,195 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<h3 class="form-section"><spring:message code="block_config"/></h3>
+<div class="row ipInfo">
+	<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="ip_type"/></label>
+	            <div class="col-md-6">
+	            	 <select name="ipType" class="selectpicker show-tick form-control required">
+	                   <c:forEach items="${fns:getDictList('WHITELIST_IPTYPE')}" var="ipTypeC">
+							<option value="${ipTypeC.itemCode}" 
+									<c:if test="${_cfg.ipType==ipTypeC.itemCode 
+										|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
+										selected
+									</c:if>
+									>
+							<spring:message code="${ipTypeC.itemValue}"/>
+							</option>
+               			</c:forEach>
+	                 </select>
+	            </div>
+	            <div for="ipType"></div>
+	        </div>
+	    </div>
+	</div>
+	<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="ip_pattern"/></label>
+	            <div class="col-md-6">
+	            	 <select name="ipPattern" class="selectpicker show-tick form-control required">
+	                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+							<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
+              			</c:forEach>
+	                 </select>
+	            </div>
+	            <div for="ipPattern"></div>
+	        </div>
+	    </div>
+	    <div class="col-md-6">
+	        <div class="form-group ">
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="IP"/></label>
+	            <div class="col-md-6">
+	                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
+	            </div>
+	            <div for="srcIpAddress"></div>
+	        </div>
+	    </div>
+	</div>
+	<div class="row port">
+	    <div class="col-md-6">
+	        <div class="form-group">
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
+	            <div class="col-md-6">
+	            	 <select name="portPattern" class="selectpicker show-tick form-control required">
+	                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+							<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
+              			</c:forEach>
+	                 </select>
+	            </div>
+	            <div for="portPattern"></div>
+	        </div>
+	    </div>
+	    <div class="col-md-6">
+	        <div class="form-group ">
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+	            <div class="col-md-6">
+	                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
+	            </div>
+	            <div for="srcPort"></div>
+	        </div>
+	    </div>
+	</div>
+	<input type="hidden" name="destPort" value="0">
+	<input type="hidden" name="destIpAddress" value="0.0.0.0">
+	<input type="hidden" name="direction" value="0">
+	<input type="hidden" name="protocolId" value="0">
+	<input type="hidden" name="protocol" value="0">
+</div>
+
+<%-- <c:choose>
+	<c:when test="${action==5}">
+		<input type="hidden" name="protocol" value="0">
+		<input type="hidden" name="direction" value="0">
+		<input type="hidden" name="isAreaEffective" value="0">
+	</c:when>
+	<c:when test="${action==8}">
+		<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="direction"/></label>
+		            <div class="col-md-6">
+		            	<select name="direction" class="selectpicker show-tick form-control required">
+		                   <option value=""><spring:message code="select"/></option>
+		                   <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
+		                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
+		                 </select>
+		            </div>
+		            <div for="direction"></div>
+		        </div>
+		    </div>
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
+		            <div class="col-md-6">
+		            	<select name="protocol" class="selectpicker show-tick form-control required">
+		                   <option value=""><spring:message code="select"/></option>
+		                   <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
+		                   <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
+		                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
+		                </select>
+		                <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}">
+		            </div>
+		            <div for="protocol"></div>
+		        </div>
+		    </div>
+		</div>
+		<input type="hidden" name="isAreaEffective" value="0">
+		<input type="hidden" name="areaEffectiveIds" value="">
+	</c:when>
+	<c:otherwise>
+		<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="protocol"/></label>
+		            <div class="col-md-6">
+		            	<select name="protocol" class="selectpicker show-tick form-control required">
+		                   <option value=""><spring:message code="select"/></option>
+		                   <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
+		                   <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
+		                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
+		                </select>
+		                <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}">
+		            </div>
+		            <div for="protocol"></div>
+		        </div>
+		    </div>
+		    <div class="col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
+		            <div class="col-md-6">
+		            	<select name="direction" class="selectpicker show-tick form-control required" >
+		                   <option value=""><spring:message code="select"/></option>
+		                   <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
+		                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
+		                 </select>
+		            </div>
+		            <div for="direction"></div>
+		        </div>
+		    </div>
+		</div>
+		<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="whether_area_block"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="isAreaEffective" value="1" class="required"
+		            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
+		            			<c:if test="${action==2}">disabled</c:if>
+		            		><spring:message code="yes"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="isAreaEffective" value="0" class="required"
+		            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
+		            			<c:if test="${action==2}">disabled</c:if>
+		            		><spring:message code="no"/>
+		            	</label>
+		            	<c:if test="${action==2}">
+		            		<input class="form-control" type="hidden" name="isAreaEffective" value="${_cfg.isAreaEffective}">
+			            </c:if>
+		            </div>
+		            <div for="isAreaEffective"></div>
+		        </div>
+		    </div>
+		    <div class="hidden areaType col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
+		            	</label>
+		            </div>
+		            <div for="areaType"></div>
+		            <input class="form-control" type="hidden" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
+		        </div>
+		    </div>
+		</div>
+	</c:otherwise>
+</c:choose> --%>
+<!--/row-->
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
index 38d4660ae..1d561ac65 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
@@ -76,18 +76,22 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index fafd0c0c2..cbd956359 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -100,18 +100,22 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
index 1a728fb38..8a42a2e83 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
@@ -76,18 +76,22 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index 0bebd7a01..2e696437c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -92,18 +92,22 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index 17df2e780..ed54574e1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -129,18 +129,22 @@ var delContent=function(contentClassName,addBtnClassName){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index 4f1e7bfc6..0480e00ec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -135,10 +135,10 @@
 								html+="<label><spring:message code='expression_type'/>：</label>";
 								html+="<label>"
 								if(item.exprType==1){
-									html+="<spring:message code='and'/>"
+									html+="<spring:message code='and_expression'/>"
 								}
 								if(item.exprType==0){
-									html+="<spring:message code='null'/>"
+									html+="<spring:message code='null_expression'/>"
 								}
 								html+="</label>";
 								html+="</div>";
@@ -270,7 +270,7 @@
 									html+="<spring:message code='twoway'/>"
 								}
 								if(item.direction==1){
-									html+="<spring:message code='ingress'/>"
+									html+="<spring:message code='oneway'/>"
 								}
 								if(item.direction==2){
 									html+="<spring:message code='egress'/>"
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index a81d4dd3d..b267b1b62 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -89,25 +89,29 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
 								   </div>
 								</div>
 							<!-- desc and action -->
-                           <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
+                           <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
index 666e61b9f..5d05a7500 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
@@ -85,19 +85,23 @@ $(function(){
 							        <div class="form-group">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
 							            <div class="col-md-6">
-							            	<c:forEach items="${serviceList}" var="service" varStatus="satus">
-							                	<label class="radio-inline">
-							                		<c:if test="${_cfg.functionId eq service.functionId}">
-							                			<input type="radio" name="action" serviceId="${service.serviceId }" value="${service.action }" class="required action"
-									            			<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-									            			<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-																	<c:if test="${dict.itemCode eq service.action }">
-																		<spring:message code="${dict.itemValue }"/>
-																	</c:if>
-																</c:forEach>
-							                		</c:if>
-							            		</label>
-							            	</c:forEach>
+							            	<c:forEach items="${serviceList}" var="service"
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 							            </div>
 							            <div for="action"></div>
 							        </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
index bed288ea1..ce2bb9bdf 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
@@ -122,17 +122,22 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index ff664d1b3..a07f0f488 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -146,18 +146,22 @@
 													code="action" /></label>
 											<div class="col-md-6">
 												<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 											</div>
 											<div for="action"></div>
 										</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
index 3a53703cc..906598bbc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
@@ -98,18 +98,22 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
index bcba20614..4b5adfc2f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
@@ -98,18 +98,22 @@ $(function(){
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css
index 8e0b3089a..67d0d96a1 100644
--- a/src/main/webapp/static/global/css/components.css
+++ b/src/main/webapp/static/global/css/components.css
@@ -22264,7 +22264,7 @@ Color library demo
 
 
 
-/*������ʽ*/
+/*锟斤拷锟斤拷锟斤拷式*/
 
 .sort-column {
 
@@ -22538,13 +22538,13 @@ transition: background-color .1s ease-in-out;
 
 /* END SHOW MORE CSS**/    
 
-/**子配置选项卡样式**/
+/**瀛愰厤缃�夐」鍗℃牱寮�**/
 .tabInfo {
-	width: 150px;
 	border: 1px solid #c2cad8;
 	padding: 5px;
 	border-bottom: 0px;
 	cursor:pointer;
+	display: inline;
 }
 .content {
 	width: 80%;