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

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

@@ -276,7 +276,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -315,11 +314,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>

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

@@ -276,7 +276,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -315,11 +314,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>

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

@@ -272,12 +272,11 @@
 									<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><spring:message code="district"/></th>
-								    <th><spring:message code="keywords"/></th>
+								    <th><spring:message code="layer"/></th>
+								    <th><spring:message code="header"/></th>
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -322,11 +321,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>

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

@@ -278,7 +278,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -323,11 +322,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>

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

@@ -283,7 +283,6 @@
 									<th><spring:message code="server_ip"/></th>
 									<th><spring:message code="server_port"/></th>
 									<th><spring:message code="protocol"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<%-- <th><spring:message code="letter"/></th>
@@ -323,13 +322,6 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.doLog }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
-									</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">

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

@@ -277,7 +277,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-								    <th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -323,11 +322,6 @@
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
 		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
-		             					</c:forEach>
 									</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

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

@@ -273,7 +273,6 @@
 									<th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -314,11 +313,6 @@
 		             					</c:forEach>    
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-								    <td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>