From cc0a30795856e9a38abbf4f7833b26c57b5c12fc Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Sun, 26 Aug 2018 10:20:50 +0800
Subject: [PATCH] =?UTF-8?q?http=E5=A2=9E=E5=8A=A0compileId=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20apptcpsessionBYte=E5=A2=9E=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp | 14 +++++++++-----
 .../webapp/WEB-INF/views/cfg/website/httpList.jsp  |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 93dcfa362..308f66b76 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -270,10 +270,12 @@
 									<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="whether_hexbinary"/></th>
+								    <th><spring:message code="lowBoundary"/></th>
+								    <th><spring:message code="upBoundary"/></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="do_log"/></th> --%>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -299,7 +301,9 @@
 									</td>
 								    <td>${cfg.cfgDesc }</td>
 								    <td>${cfg.appName }</td>
-								    <td>
+								    <td>${cfg.lowBoundary }</td>
+								    <td>${cfg.upBoundary }</td>
+								    <%-- <td>
 										<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
 											<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
 				               			</c:forEach>
@@ -317,7 +321,7 @@
 										<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> --%>
 								    <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>
@@ -331,7 +335,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 7bad1eed4..589b0b51f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -465,6 +465,7 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
@@ -491,6 +492,7 @@
 									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
+								    <td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -586,7 +588,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>