ip增加源目的不相同校验

action默认选中第一个动作
list列表type修改为classification

src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp

@@ -21,7 +21,7 @@
    <!--/span-->
    <div class="col-md-6">
        <div class="form-group">
-           <label class="control-label col-md-3"><spring:message code="type"/></label>
+           <label class="control-label col-md-3"><spring:message code="classification"/></label>
            <div class="col-md-6">
            	 <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                	<c:forEach items="${fls}" var="fl">

src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp

@@ -275,7 +275,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -275,7 +275,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp

@@ -276,7 +276,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -272,7 +272,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="social_app"/></th>
-								    <th>ip<spring:message code="type"/></th>
+								    <th>IP<spring:message code="type"/></th>
 									<%-- <th><spring:message code="client_ip"/></th>
 									<th><spring:message code="client_port"/></th> --%>
 									<th><spring:message code="server_ip"/></th>
@@ -281,7 +281,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -314,7 +314,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp

@@ -322,7 +322,7 @@
 									<th><spring:message code="letter"/></th>
 									<!-- <th>编译id</th> -->
 									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<!-- <th>区域生效id</th> -->

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp

@@ -83,7 +83,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -288,7 +288,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp

@@ -107,7 +107,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -281,7 +281,7 @@
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp

@@ -191,19 +191,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">
-							                	<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}">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 && 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>
 							            </div>
 							            <div for="action"></div>
 							        </div>

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -276,7 +276,7 @@
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp

@@ -83,7 +83,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -288,7 +288,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp

@@ -99,7 +99,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -282,7 +282,7 @@
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp

@@ -128,19 +128,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">
-							                	<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}">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 && 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>
 							            </div>
 							             <div for="action"></div>
 							        </div>

src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp

@@ -279,7 +279,7 @@
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp

@@ -136,7 +136,7 @@ var delContent=function(contentClassName,addBtnClassName){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -615,7 +615,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp

@@ -278,7 +278,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
-									<th>IP <spring:message code="type"/></th>
+									<th>IP<spring:message code="type"/></th>
 									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
 									<th><spring:message code="client_ip"/></th>
 									<th><spring:message code="client_port"/></th>

src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp

@@ -289,7 +289,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp

@@ -292,7 +292,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+								<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp

@@ -96,7 +96,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp

@@ -284,7 +284,7 @@
 									<th><spring:message code="port_pattern"/></th>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp

@@ -93,7 +93,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp

@@ -268,7 +268,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp

@@ -154,7 +154,7 @@
 																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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp

@@ -309,7 +309,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp

@@ -279,7 +279,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
-									<th>ip<spring:message code="type"/></th>
+									<th>IP<spring:message code="type"/></th>
 									<th><spring:message code="client_ip"/></th>
 									<th><spring:message code="client_address_mask"/></th>
 									<th><spring:message code="client_port"/></th>
@@ -301,7 +301,7 @@
 											<th><spring:message code="protocol"/></th>
 											<th><spring:message code="whether_area_block"/></th>
 											<th><spring:message code="letter"/></th>
-											<th><spring:message code="type"/></th>
+											<th><spring:message code="classification"/></th>
 											<th><spring:message code="attribute"/></th>
 											<th><spring:message code="label"/></th>
 										</c:otherwise>

src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp

@@ -160,7 +160,7 @@
 																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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp

@@ -309,7 +309,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp

@@ -129,7 +129,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp

@@ -270,7 +270,7 @@
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp

@@ -97,7 +97,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp

@@ -272,7 +272,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp

@@ -336,7 +336,7 @@
 										<%--IP --%>
 										<c:when test="${mainTableType eq '1'}">
 											<th><spring:message code="${mainTableDesc}"/><spring:message code="config_describe"/></th>
-											<th>ip<spring:message code="type"/></th>
+											<th>IP<spring:message code="type"/></th>
 											<th><spring:message code="client_ip"/></th>
 											<th><spring:message code="client_address_mask"/></th>
 											<th><spring:message code="client_port"/></th>
@@ -368,7 +368,7 @@
 										</c:if>
 										<c:if test="${tableInfo.tableName ne mainTable and tableInfo.tableType eq '1'}">
 											<th><spring:message code="${tableInfo.tableDesc}"/><spring:message code="config_describe"/></th>
-											<th>ip<spring:message code="type"/></th>
+											<th>IP<spring:message code="type"/></th>
 											<th><spring:message code="client_ip"/></th>
 											<th><spring:message code="client_address_mask"/></th>
 											<th><spring:message code="client_port"/></th>
@@ -385,7 +385,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp

@@ -153,7 +153,7 @@
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp

@@ -310,7 +310,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp

@@ -150,7 +150,7 @@
 																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:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 															<spring:message code="${service.actionCode }" />
 														</c:if>
 													</label>

src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp

@@ -309,7 +309,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp

@@ -230,7 +230,7 @@
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp

@@ -468,7 +468,7 @@
 									<th><spring:message code="redirect_content"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp

@@ -105,7 +105,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp

@@ -268,7 +268,7 @@
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp

@@ -105,7 +105,7 @@ $(function(){
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp

@@ -268,7 +268,7 @@
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp

@@ -275,7 +275,7 @@
 										<c:otherwise>
 											<th><spring:message code="whether_area_block"/></th>
 											<th><spring:message code="letter"/></th>
-											<th><spring:message code="type"/></th>
+											<th><spring:message code="classification"/></th>
 											<th><spring:message code="attribute"/></th>
 											<th><spring:message code="label"/></th>
 										</c:otherwise>

src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp

@@ -154,7 +154,7 @@
 																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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp

@@ -309,7 +309,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp

@@ -221,7 +221,7 @@
 																					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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp

@@ -466,7 +466,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>

src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp

@@ -154,7 +154,7 @@
 																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: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 }"/>

src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp

@@ -308,7 +308,7 @@
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
+									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>