From e5215accb9602434ebcb968529a01e1ae1ef6398 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 09:25:44 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=BB=9A=E5=8A=A8=E6=98=BE=E7=A4=BA=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E6=98=BE=E7=A4=BA=E6=9B=B4=E5=A4=A7=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E8=B0=83=E6=95=B4=E7=95=8C=E9=9D=A2table?=
 =?UTF-8?q?=E4=B8=ADtooltip=E4=B8=8E=E8=A1=A8=E5=A4=B4=E4=B8=8D=E4=BA=92?=
 =?UTF-8?q?=E7=9B=B8=E9=81=AE=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/dashBoardIndex.jsp        |  5 ++--
 .../plugins/bootstrap/css/bootstrap.css       |  4 +--
 .../webapp/static/pages/css/data_text.css     | 26 +++++++++++++++----
 .../webapp/static/pages/scripts/echart.js     | 12 ++-------
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index da48d31cf..d3e25f512 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -38,8 +38,7 @@
                     <div class="fl_fc">
 <%--                    <a href="${ctx}/dashboard/bandwidthList"> 详情显示--%>
 						<p>
-                        <label data-original-title="<spring:message code="bandwith"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
+                        <label data-original-title="<spring:message code="bandwith"/>" class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
                          <!-- 网络带宽 --><spring:message code="bandwith"/>
                         </label>
                         </p>
@@ -53,7 +52,7 @@
                 	 </div>
                     <div class="fl_fc">
 <!--                         <a href="javacript:;"> -->
-						<p>
+						<p style="margin-left: 0px;width:100%">
                         <label data-original-title="<spring:message code="action_reject"/>" 
                          class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
                          <!-- 阻断链接数 --><spring:message code="action_reject"/>
diff --git a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
index b2b19d023..c7b1d1d52 100644
--- a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
+++ b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css
@@ -2227,7 +2227,7 @@ table th[class*="col-"] {
 .table-responsive {
   overflow-x: auto;
   min-height: 0.01%;
-  position: fixed;
+  /* position: fixed; */
   right: 14px;
   left: 14px;
   margin-top: 20px;
@@ -3182,7 +3182,7 @@ tbody.collapse.in {
   position: absolute;
   top: 100%;
   left: 0/*rtl:auto*/;
-  z-index: 1000;
+  z-index: 2147483647;
   display: none;
   float: left;
   min-width: 160px;
diff --git a/src/main/webapp/static/pages/css/data_text.css b/src/main/webapp/static/pages/css/data_text.css
index 61be4ed55..2198426ed 100644
--- a/src/main/webapp/static/pages/css/data_text.css
+++ b/src/main/webapp/static/pages/css/data_text.css
@@ -43,7 +43,7 @@ p{
   		margin-top: 15px;
 }
 .data_content .data_info .fr_fc .fl_fc{
-    width: 68%;
+    width: 70%;
     height: 110px;
 	border-width: 0 1px;
 	margin-left: 0px;
@@ -105,58 +105,74 @@ p{
     text-align: center;
     overflow: hidden; 
 	white-space: nowrap;
-	text-overflow: ellipsis;
+/* 	text-overflow: ellipsis; */
+	margin-left: -12px;
 }
 .data_content .data_info .info_1 label:nth-child(1){
+	width:100%;
     color:#fff;
     font-size: 18px;
-    text-align: center;
     overflow: hidden; 
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	margin: -3px;
+	margin-left: -20px;
 }
 .data_content .data_info>div.info_1 p:nth-child(2){
+	width:100%;
     font-weight: 600;
     font-size: 16px;
     color:#288dce;
-    margin-top: 2.0em;
+    margin-top: 2.1em;
+    margin-left: 0px;
 }
 .data_content .data_info .info_2 .fr_fc .numberRun2{
+	width:100%;
     font-weight: 600;
     font-size: 16px;
     color:#288dce;
     margin-top: 2.1em;
+    margin-left: 0px;
 }
 .data_content .data_info .info_2 .fr_fc .numberRun3{
+	width:100%;
     font-weight: 600;
     font-size: 16px;
     color:#288dce;
     margin-top: 2.1em;
+    margin-left: 0px;
 }
 .data_content .data_info .info_2 .fr_fc .numberRun5{
+	width:100%;
     font-weight: 600;
     font-size: 16px;
     color:#288dce;
     margin-top: 2.1em;
+    margin-left: 0px;
 }
 .data_content .data_info .info_2 .fr_fc .numberRun6{
+	width:100%;
     font-weight: 600;
     font-size: 16px;
     color:#288dce;
     margin-top: 2.1em;
+    margin-left: 0px;
 }
 .data_content .data_info .info_2 .fr_fc .numberRun{
+	width:100%;
     font-weight: 600;
     font-size: 16px;
     color:#288dce;
     margin-top: 2.1em;
+    margin-left: 0px;
 }
 .data_content .data_info>div.info_1 .fl_fc .numberRun4{
+	width:100%;
     font-weight: 600;
     font-size: 16px;
     color:#288dce;
     margin-top: 1px;
+    margin-left: 0px;
 }
 .data_content .data_info>div.info_1 .fl_fc .numberRun4-unit{
     font-weight: 500;
@@ -344,7 +360,7 @@ p{
     margin-bottom: 5px;
 }
 .data_content .data_main1 .main_left1 div .main_title1{
-    width: 230px;
+    width: 250px;
     height: 35px;
     line-height: 33px;
     background-color: #3D3D3D;
diff --git a/src/main/webapp/static/pages/scripts/echart.js b/src/main/webapp/static/pages/scripts/echart.js
index 70f7f9251..f2925c011 100644
--- a/src/main/webapp/static/pages/scripts/echart.js
+++ b/src/main/webapp/static/pages/scripts/echart.js
@@ -47,7 +47,6 @@
     		},
     		exporting: {
     			allowHTML:true,
-    			
     			filename:'Protocol-Type',
     			chartOptions: {
     				plotOptions: {
@@ -233,8 +232,7 @@
     		},
     		exporting: {
     			allowHTML:true,
-//    			
-//    			filename:'Active-IP',
+    			filename:'Active-IP',
     			chartOptions: {
     				plotOptions: {
     					series: {
@@ -396,7 +394,6 @@
     		},
     		exporting: {
     			allowHTML:true,
-    			
     			filename:'App',
     			chartOptions: {
     				plotOptions: {
@@ -555,7 +552,6 @@ function echart_2(rs){
     		},
 			exporting: {
     			allowHTML:true,
-    			
     			filename:'BS',
     			chartOptions: {
     				plotOptions: {
@@ -699,7 +695,6 @@ function echart_5(rs){
 		},
 		exporting: {
 			allowHTML:true,
-			
 			filename:'BS',
 			chartOptions: {
 				plotOptions: {
@@ -845,7 +840,6 @@ function echart_4(rs){
 		},
 		exporting: {
 			allowHTML:true,
-			
 			filename:'Website',
 			chartOptions: {
 				plotOptions: {
@@ -984,7 +978,6 @@ function echart_6(rs){
 		},
 		exporting: {
 			allowHTML:true,
-			
 			filename:'Website',
 			chartOptions: {
 				plotOptions: {
@@ -1128,8 +1121,7 @@ function echart_topic_domain(rs){
 		},
 	    exporting: {
 			allowHTML:true,
-			
-			
+			filename:'Topic',
 			chartOptions: {
 				plotOptions: {
 					series: {

From 89253a265d0015e979a5b51e4252554f0d07e1e2 Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 10:26:37 +0800
Subject: [PATCH 2/7] =?UTF-8?q?antiddos=20=E7=95=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA=E5=8F=8A=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/configuration/BaseCfg.java |  2 +-
 .../nis/domain/configuration/BaseIpCfg.java   | 22 ++---
 .../nis/domain/configuration/DdosIpCfg.java   |  6 +-
 .../manipulation/DdosCfgController.java       |  2 +-
 .../WEB-INF/views/cfg/ddosIpCfgList.jsp       | 93 ++++++++++---------
 5 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java
index a664d1cef..ff75b0c11 100644
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java
@@ -154,7 +154,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 来函
 	 */
-	@ExcelField(title="letter",sort=50)
+	@ExcelField(title="letter",sort=58)
 	protected String requestName;
 	/**
 	 * 是否区域gk
diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
index c9ce097c0..146de6aa4 100644
--- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
@@ -43,24 +43,24 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	 */
 	@Expose
 	@SerializedName("ipType")
-	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
+	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=44)
 	protected Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=6)
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=45)
 	protected Integer ipPattern; 
-	@ExcelField(title="client_ip",sort=5)
+	@ExcelField(title="client_ip",sort=47)
 	protected String srcIpAddress; 
-	@ExcelField(title="server_ip",sort=4)
+	@ExcelField(title="server_ip",sort=46)
 	protected String destIpAddress;
-	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=7)
+	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48)
 	protected Integer portPattern;
-	@ExcelField(title="client_port",sort=8)
+	@ExcelField(title="client_port",sort=49)
 	protected String srcPort;
-	@ExcelField(title="server_port",sort=9)
+	@ExcelField(title="server_port",sort=50)
 	protected String destPort; 
 	protected Integer dnsStrategyId; 
-	@ExcelField(title="ir_type",dictType="IR_TYPE",sort=10)
+	@ExcelField(title="ir_type",dictType="IR_TYPE",sort=51)
 	protected Integer irType; 
-	@ExcelField(title="group_name",sort=11)
+	@ExcelField(title="group_name",sort=52)
 	protected String groupName; 
 	
 	private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
@@ -127,14 +127,14 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	 */
 	@Expose
 	@SerializedName("direction")
-	@ExcelField(title="direction",dictType="DIRECTION",sort=12)
+	@ExcelField(title="direction",dictType="DIRECTION",sort=53)
 	protected Integer direction ;
 	/**
 	 * 协议
 	 */
 	@Expose
 	@SerializedName("protocol")
-	@ExcelField(title="protocol",dictType="PROTOCOL",sort=13)
+	@ExcelField(title="protocol",dictType="PROTOCOL",sort=54)
 	protected Integer protocol ;
 	/**
 	 * 协议ID
diff --git a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java
index aefa33776..91200ff60 100644
--- a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java
@@ -23,11 +23,11 @@ public class DdosIpCfg extends BaseIpCfg {
 	 */
 	private static final long serialVersionUID = -5446903784736960824L;
 	private String indexTable="ddos_ip_cfg";
-	@ExcelField(title="antiddos_protocol",sort=22)
+	@ExcelField(title="antiddos_protocol",sort=41)
 	private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP，
-	@ExcelField(title="bps_threadshold",sort=23)
+	@ExcelField(title="bps_threadshold",sort=42)
 	private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数
-	@ExcelField(title="pps_threadshold",sort=24)
+	@ExcelField(title="pps_threadshold",sort=43)
 	private Long ppsThreadshold;
 
 	public String getAntiddosProtocol() {
diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
index 53f192ae4..6ea6f246c 100644
--- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
@@ -134,7 +134,7 @@ public class DdosCfgController extends BaseController {
 				Page<DdosIpCfg> page = ddosCfgService.findPage(pageInfo, entity);
 				titleList.add(entity.getMenuNameCode());
 				classMap.put(entity.getMenuNameCode(), DdosIpCfg.class);
-				String cfgIndexInfoNoExport=",client_ip,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+				String cfgIndexInfoNoExport=",do_log,client_ip,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 				noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 				dataMap.put(entity.getMenuNameCode(), page.getList());
 			/*}*/
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index e6bd842ee..5f1f802c4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -322,23 +322,24 @@
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
-									<th><spring:message code="ip_type"/></th>
-									<%-- <th><spring:message code="client_ip"/></th>
-									<th><spring:message code="client_port"/></th> --%>
-									<th><spring:message code="server_ip"/></th>
-									<th><spring:message code="server_port"/></th>
-									<th><spring:message code="ip_pattern"/></th>
-									<th><spring:message code="port_pattern"/></th>
-									<th><spring:message code="direction"/></th>
-									<th><spring:message code="protocol"/></th>
-									
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
+									<th><spring:message code="whether_area_block"/></th>
 									
 									<th><spring:message code="antiddos_protocol"/></th>
 									<th><spring:message code="bps_threadshold"/></th>
 									<th><spring:message code="pps_threadshold"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
-									<th><spring:message code="whether_area_block"/></th>
+									
+									<th><spring:message code="ip_type"/></th>
+									<%-- <th><spring:message code="client_ip"/></th>
+									<th><spring:message code="client_port"/></th> --%>
+									<th><spring:message code="ip_pattern"/></th>
+									<th><spring:message code="server_ip"/></th>
+									<th><spring:message code="port_pattern"/></th>
+									<th><spring:message code="server_port"/></th>
+									<th><spring:message code="direction"/></th>
+									<th><spring:message code="protocol"/></th>
+									
 									<th><spring:message code="letter"/></th>
 								<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
@@ -366,38 +367,6 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
-											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<%-- <td>${cfg.srcIpAddress }</td>
-									<td>${cfg.srcPort }</td> --%>
-									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
-									<td>${cfg.destPort }</td>
-									<td>
-										<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-											<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-											<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>${cfg.antiddosProtocol }</td>
-									<td>${cfg.bpsThreadshold }</td>
-									<td>${cfg.ppsThreadshold }</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -416,6 +385,40 @@
 												</a>
 										</c:if>
 									</td>
+									
+									<td>${cfg.antiddosProtocol }</td>
+									<td>${cfg.bpsThreadshold }</td>
+									<td>${cfg.ppsThreadshold }</td>
+									
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+											<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<%-- <td>${cfg.srcIpAddress }</td>
+									<td>${cfg.srcPort }</td> --%>
+									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+											<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${cfg.destPort }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
 									<td>${cfg.requestName }</td>
 									<td >
 										<c:set var="classify"></c:set>

From 3603527ec8866c2ea49d14688fb894fe25aa31d2 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 11:11:15 +0800
Subject: [PATCH 3/7] =?UTF-8?q?cfg=5Findex=5Finfo=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=89=B9=E9=87=8F,dao=E4=BF=9D=E5=AD=98sql?=
 =?UTF-8?q?=E4=B8=8D=E5=B8=A6last=5Finsert=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/IpCfgDao.java   |  1 +
 .../nis/web/dao/configuration/IpCfgDao.xml    | 57 +++++++++++++++++++
 .../service/configuration/IpCfgService.java   | 19 ++++++-
 3 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
index cc42353ba..00c727664 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
@@ -39,6 +39,7 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
 	public CfgIndexInfo getCfgIndexInfo(Long id);
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public void saveCfgIndex(CfgIndexInfo entity);
+	public void saveCfgIndexForBatch(CfgIndexInfo entity);
 	public void saveIpPortCfg(IpPortCfg entity);
 	public void updateCfgIndex(CfgIndexInfo entity);
 	public void deleteIpCfg(CfgIndexInfo entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 65c364bfa..5bc7e6ec0 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -831,6 +831,63 @@
     	#{doLog,jdbcType=INTEGER}
     )
   </insert>
+  <insert id="saveCfgIndexForBatch" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+    insert into cfg_index_info(
+     CFG_DESC,
+     ACTION,
+     IS_VALID,
+     IS_AUDIT,
+     CREATOR_ID,
+    CREATE_TIME,
+    EDITOR_ID,
+    EDIT_TIME,
+    AUDITOR_ID,
+    AUDIT_TIME,
+   	SERVICE_ID,
+   	REQUEST_ID,
+   	COMPILE_ID,
+   	IS_AREA_EFFECTIVE,
+   	CLASSIFY,
+    ATTRIBUTE,
+    LABLE,
+    AREA_EFFECTIVE_IDS,
+    function_id,
+    dns_strategy_id,
+    user_region1,
+    user_region2,
+    user_region3,
+    user_region4,
+    user_region5,
+    do_log
+    )values (
+   		#{cfgDesc,jdbcType=VARCHAR},
+   		#{action,jdbcType=INTEGER}, 
+    	0,
+    	0,
+    	#{creatorId,jdbcType=INTEGER}, 
+   		#{createTime,jdbcType=TIMESTAMP},
+   		#{editorId,jdbcType=INTEGER},
+   		#{editTime,jdbcType=TIMESTAMP}, 
+   	 	#{auditorId,jdbcType=INTEGER},
+    	#{auditTime,jdbcType=TIMESTAMP},
+    	#{serviceId,jdbcType=INTEGER}, 
+    	#{requestId,jdbcType=INTEGER},
+    	#{compileId,jdbcType=INTEGER},
+    	#{isAreaEffective,jdbcType=INTEGER},
+    	#{classify,jdbcType=VARCHAR},
+    	#{attribute,jdbcType=VARCHAR},
+    	#{lable,jdbcType=VARCHAR},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+    	#{dnsStrategyId,jdbcType=INTEGER},
+    	#{userRegion1,jdbcType=VARCHAR},
+    	#{userRegion2,jdbcType=VARCHAR},
+    	#{userRegion3,jdbcType=VARCHAR},
+    	#{userRegion4,jdbcType=VARCHAR},
+    	#{userRegion5,jdbcType=VARCHAR},
+    	#{doLog,jdbcType=INTEGER}
+    )
+  </insert>
   <!-- insert ip_port_cfg表信息 -->
   <insert id="saveIpPortCfg" parameterType="com.nis.domain.configuration.IpPortCfg" >
     <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 3f357e171..e4032eea2 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -7,6 +7,9 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -44,6 +47,7 @@ import com.nis.web.dao.configuration.StringCfgDao;
 import com.nis.web.dao.specific.ConfigGroupInfoDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.CrudService;
+import com.nis.web.service.SpringContextHolder;
 
 /**
  * IP相关配置事务类
@@ -108,8 +112,19 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 	} 
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void saveCfgIndexOf(List<CfgIndexInfo> cfgIndexInfos){
-		for (CfgIndexInfo cfgIndexInfo : cfgIndexInfos) {
-			ipCfgDao.saveCfgIndex(cfgIndexInfo);
+		SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
+		SqlSession batchSqlSession = null;
+		try{
+			batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
+			for(int index = 0; index < cfgIndexInfos.size();index++){
+				CfgIndexInfo cfgIndexInfo = cfgIndexInfos.get(index);
+				((IpCfgDao) batchSqlSession.getMapper(IpCfgDao.class)).saveCfgIndex(cfgIndexInfo);
+			}
+			batchSqlSession.commit();
+		}finally {
+			if(batchSqlSession != null){
+				batchSqlSession.close();
+			}
 		}
 	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)

From c62b56019d2aac1c5c94c7857d0be44ef085bb4a Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 11:44:50 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=96=B9=E5=90=91=E5=AD=97=E6=AE=B5=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/log/manipulation/dkBehaviorList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/appList.jsp           | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp           | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp          | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp           | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp           | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp          | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp            | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp         | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp          | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp        | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp  | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp      | 6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp  | 6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp  | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp  | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp  | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp   | 6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp    | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp  | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp      | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp    | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp           | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp           | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp        | 6 +++---
 src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp       | 6 +++---
 35 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 9a6ab1b72..4788dcfee 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -124,10 +124,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -303,7 +303,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index f00e39fdb..a66204b37 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -295,7 +295,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
index c60d27565..58a1703f8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -109,10 +109,10 @@
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -257,7 +257,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 5b56e3479..b39d2b458 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -104,10 +104,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -276,7 +276,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
index 522c1ec34..5933426ae 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -111,10 +111,10 @@
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -307,7 +307,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index a02622d43..1cc4458ee 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -283,7 +283,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
index 10365c35f..3343cc60e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
@@ -134,10 +134,10 @@
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -303,7 +303,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index 18d0c1be6..fa8eac90b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -110,10 +110,10 @@
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -345,7 +345,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index d6eb3e76b..cfc1d6c49 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -110,10 +110,10 @@
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -253,7 +253,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index 4140f4895..ffa051d14 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -101,10 +101,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -259,7 +259,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 3199d1034..2778d31df 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -113,10 +113,10 @@
 										</div>
 										<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 												<form:select path="direction" class="selectpicker form-control select2">
 			                                    <form:option value=""><spring:message code="select"/></form:option>
-			                                     <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+			                                     <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 													 <form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 										         </c:forEach>
 			                                </form:select>
@@ -271,7 +271,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index f2b94eaf3..5db1181ba 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -109,10 +109,10 @@
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -284,7 +284,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index dc51b8d1a..76289d250 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -114,10 +114,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -300,7 +300,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index b7b2634b0..99b7eadc4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -296,7 +296,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
index fc8bcd046..d3ae8699c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -114,10 +114,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -298,7 +298,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 519cf24f5..d32677bb6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -296,7 +296,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 9bfdff9be..9c658bfdd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -112,10 +112,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -295,7 +295,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 6d713263a..4b748be7e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -297,7 +297,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index 086c5a1f9..384abf5c9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -297,7 +297,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 066e98860..9466d30e7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -156,13 +156,13 @@
 
 										<%-- <div class="col-md-2">
 											<div class="form-group">
-												<label><spring:message code="direct" />：</label>
+												<label><spring:message code="direction" />：</label>
 												<form:select path="direction"
 													class="selectpicker select2 form-control">
 													<form:option value="">
 														<spring:message code="select" />
 													</form:option>
-													<c:forEach items="${fns:getDictList('IP_LOCATION')}"
+													<c:forEach items="${fns:getDictList('LOG_DIRECTION')}"
 														var="dict">
 														<form:option value="${dict.itemCode}">
 															<spring:message code="${dict.itemValue}" />
@@ -355,7 +355,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
index e6b35e973..cbc19e0c5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -297,7 +297,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
index f7cf19806..841b2b4dd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -297,7 +297,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 37a33c399..c8bf658b9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -114,10 +114,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -296,7 +296,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
index c7d3bfb1a..bf1a83aae 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -297,7 +297,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 2ae9343bc..7c79d66f4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -297,7 +297,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index 7f5698bfb..a1f5c9a16 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -300,7 +300,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index cb93f8bdc..420fb3d88 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -301,7 +301,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 42ff92e1d..9f0e464e0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -302,7 +302,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
index 581eb2da4..6b5e817c1 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -265,7 +265,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index aefbe58b1..d1c2e05e0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -272,7 +272,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
index 231119c1f..2e597b2ed 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -126,10 +126,10 @@
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -278,7 +278,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index cd8af9865..66ff6fc6a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -112,10 +112,10 @@
 										</div>
 										<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker form-control select2">
 			                                	 <form:option value=""><spring:message code="select"/></form:option>
-			                                     <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+			                                     <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 													 <form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 										         </c:forEach>
 			                                </form:select>
@@ -264,7 +264,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index 58b703492..4b9bc0a69 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -115,10 +115,10 @@ $(document).ready(function(){
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -271,7 +271,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index 8633673b8..4d67e2517 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -121,10 +121,10 @@
 										</div>
 										<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direct"/>：</label>
+											<label><spring:message code="direction"/>：</label>
 											<form:select path="direction" class="selectpicker form-control select2">
 			                                    <form:option value=""><spring:message code="select"/></form:option>
-			                                     <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+			                                     <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
 													 <form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 										         </c:forEach>
 			                                </form:select>
@@ -271,7 +271,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index 1f954ce67..bdf549229 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -96,10 +96,10 @@
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -278,7 +278,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>

From 859e96ec1e9451cb33ec638d95c2e5d406168ae2 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 12:36:01 +0800
Subject: [PATCH 5/7] =?UTF-8?q?IpCfgService=E8=B0=83=E7=94=A8saveCfgIndexI?=
 =?UTF-8?q?nfo=E7=9A=84=E6=96=B9=E6=B3=95=E6=94=B9=E6=88=90=E4=B8=8D?=
 =?UTF-8?q?=E5=B8=A6last=5Finsert=5Fid=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/service/configuration/IpCfgService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index e4032eea2..ebb6dc5a8 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -118,7 +118,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 			batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
 			for(int index = 0; index < cfgIndexInfos.size();index++){
 				CfgIndexInfo cfgIndexInfo = cfgIndexInfos.get(index);
-				((IpCfgDao) batchSqlSession.getMapper(IpCfgDao.class)).saveCfgIndex(cfgIndexInfo);
+				((IpCfgDao) batchSqlSession.getMapper(IpCfgDao.class)).saveCfgIndexForBatch(cfgIndexInfo);
 			}
 			batchSqlSession.commit();
 		}finally {

From f7270efecb83b1de7fb4d1aa6966e1949d4a47d8 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 12:40:36 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E4=B8=AD=E6=97=A0=E6=96=B9=E5=90=91?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=9A=84=E6=96=B9=E5=90=91?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties     | 11 ++++++++++-
 src/main/resources/messages/message_ru.properties     | 11 ++++++++++-
 src/main/resources/messages/message_zh_CN.properties  | 11 ++++++++++-
 src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp  |  6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp |  6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp     |  6 +++---
 .../WEB-INF/views/log/ntc/mmSampleAudioList.jsp       |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp  |  6 +++---
 .../WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp     |  6 +++---
 .../WEB-INF/views/log/ntc/mmSampleVideoList.jsp       |  6 +++---
 .../WEB-INF/views/log/ntc/mmVoipAccountList.jsp       |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp     |  6 +++---
 16 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index e9b867725..a15e8de97 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1298,4 +1298,13 @@ cache_size_error=Cache size can not exceed 1024TB(1048576GB,1073741824MB).
 ignore_qs_error=Ignore query string has invisible character or comma
 NTC_DDOS_PROTECT_TARGET_IP=DDOS IP Configuration
 bypass=Bypass
-unlimited=unlimited
\ No newline at end of file
+unlimited=unlimited
+req_line=Request Line
+res_line=Response Line
+user_agent=UA
+content_len=Content-Length
+set_cookie=set-Cookie
+req_header=Request Header
+resp_header=Response Header
+req_body=Request Body
+resp_body=Response Body
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index c943c60fb..4b4988f69 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1304,4 +1304,13 @@ cache_size_error=Cache size can not exceed 1024TB(1048576GB,1073741824MB).
 ignore_qs_error=Ignore query string has invisible character or comma
 NTC_DDOS_PROTECT_TARGET_IP=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F IP-\u0410\u0434\u0440\u0435\u0441\u0430 DDOS
 bypass=Bypass
-unlimited=unlimited
\ No newline at end of file
+unlimited=unlimited
+req_line=Request Line
+res_line=Response Line
+user_agent=UA
+content_len=Content-Length
+set_cookie=set-Cookie
+req_header=Request Header
+resp_header=Response Header
+req_body=Request Body
+resp_body=Response Body
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 212a891cd..70c553ef6 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1294,4 +1294,13 @@ cache_size_error=\u7F13\u5B58\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC71024TB(1048576G
 ignore_qs_error=\u5FFD\u7565\u7684\u67E5\u8BE2\u53C2\u6570\u4E2D\u5305\u542B\u4E0D\u53EF\u89C1\u5B57\u7B26\u6216\u8005\u9017\u53F7
 NTC_DDOS_PROTECT_TARGET_IP=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E
 bypass=Bypass
-unlimited=unlimited
\ No newline at end of file
+unlimited=unlimited
+req_line=请求行
+res_line=应答行
+user_agent=UA值
+content_len=Content-Length值
+set_cookie=set-Cookie值
+req_header=原始请求头
+resp_header=原始应答头
+req_body=原始请求体
+resp_body=原始应答体
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 76289d250..f8bfe7062 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -195,7 +195,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -299,11 +299,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index 99b7eadc4..c4474f3d4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -192,7 +192,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -295,11 +295,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
index d3ae8699c..51d652cbe 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -193,7 +193,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -297,11 +297,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index d32677bb6..2dfc6eadc 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -191,7 +191,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -295,11 +295,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 9c658bfdd..c856c2661 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -190,7 +190,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -294,11 +294,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 9466d30e7..067a267c3 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -250,7 +250,7 @@
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -354,11 +354,11 @@
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
index cbc19e0c5..d859a31b9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -192,7 +192,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -296,11 +296,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
index 841b2b4dd..91986d7c3 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -192,7 +192,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -296,11 +296,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index c8bf658b9..40c882f3e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -191,7 +191,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -295,11 +295,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
index bf1a83aae..1c5fd3a93 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -192,7 +192,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -296,11 +296,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 7c79d66f4..87f593b61 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -192,7 +192,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -296,11 +296,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index 420fb3d88..79962e6c6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -199,7 +199,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -300,11 +300,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 9f0e464e0..88364d7cd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -200,7 +200,7 @@ $(document).ready(function(){
 								<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
 								<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
-								<th class="sort-column direction"><spring:message code="direction"/></th>
+<%-- 								<th class="sort-column direction"><spring:message code="direction"/></th> --%>
 								<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
 								<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
 								<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
@@ -301,11 +301,11 @@ $(document).ready(function(){
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.innerSmac }</td>
 									<td>${log.innerDmac }</td>
 									<td>

From 6f6a129193b2fcb41e903577daf522cd85c19001 Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 13:39:52 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8--?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/report/list.jsp | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index b5ce3e173..c8f954acb 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -89,6 +89,10 @@ $(document).ready(function() {
 			$('.table-responsive').css({'height':height-166+'px'});
 			//style.height=height-130+'px';
 		}
+		
+		var li=document.getElementById("liwhite").offsetWidth;
+	    var lipx=Number(li/6);
+	    $(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'});
 	});
 	function getXlsxFileName() {
 		var cfgName = $("[name=cfgName2]").val() + "_";
@@ -356,8 +360,16 @@ function customColumnClick(){
 		if($('.table-responsive')){
 			$('.table-responsive').css({'height':height-186+'px'});
 		}
+	    var li=document.getElementById("liwhite").offsetWidth;
+	    var lipx=Number(li/6);
+	    $(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'});
 	}
 </script>
+<style type="text/css">
+li{
+white-space:nowrap; 
+}
+</style>
 </head>
 <body>
 <div class="page-content">
@@ -470,40 +482,40 @@ function customColumnClick(){
 					</form:form>
 				</div>
 				
-				<div>
+				<div id="liwhite">
 					<sys:message content="${message}"/>
 					<br>
-					<ul class="nav nav-tabs nav-justified">
+					<ul class="nav nav-tabs nav-justified"  >
 						<li 
 						<c:if test="${bean.reportBusinessType eq 'label_report' or bean.reportBusinessType ==null}">
 						class="active"
 						</c:if>
-						><a data-bussiness="label_report" data-toggle="tab" href="#label"><spring:message code="label_report"/></a></li>
+						><a   class="lireport" data-bussiness="label_report" data-toggle="tab" href="#label"  title="<spring:message code="label_report"/>"><spring:message code="label_report"/></a></li>
 						<li
 						<c:if test="${bean.reportBusinessType eq 'attr_type_report'}">
 						class="active"
 						</c:if>
-						><a data-bussiness="attr_type_report" data-toggle="tab" href="#attrType"><spring:message code="attr_type_report"/></a></li>
+						><a class="lireport" data-bussiness="attr_type_report" data-toggle="tab" href="#attrType"   title="<spring:message code="attr_type_report"/>"  ><spring:message code="attr_type_report"/></a></li>
 						<li
 						<c:if test="${bean.reportBusinessType eq 'lwhh_report'}">
 						class="active"
 						</c:if> 
-						><a data-bussiness="lwhh_report" data-toggle="tab" href="#lwhh"><spring:message code="lwhh_report"/></a></li>
+						><a class="lireport" data-bussiness="lwhh_report" data-toggle="tab" href="#lwhh" title="<spring:message code="lwhh_report"/>"  ><spring:message code="lwhh_report"/></a></li>
 						<li 
 						<c:if test="${bean.reportBusinessType eq 'src_ip_report'}">
 						class="active"
 						</c:if> 
-						><a data-bussiness="src_ip_report" data-toggle="tab" href="#srcIp"><spring:message code="src_ip_report"/></a></li>
+						><a class="lireport" data-bussiness="src_ip_report" data-toggle="tab" href="#srcIp" title="<spring:message code="src_ip_report"/>"  ><spring:message code="src_ip_report"/></a></li>
 						<li 
 						<c:if test="${bean.reportBusinessType eq 'dest_ip_report'}">
 						class="active"
 						</c:if> 
-						><a data-bussiness="dest_ip_report" data-toggle="tab" href="#destIp"><spring:message code="dest_ip_report"/></a></li>
+						><a class="lireport" data-bussiness="dest_ip_report" data-toggle="tab" href="#destIp"  title="<spring:message code="dest_ip_report"/>" ><spring:message code="dest_ip_report"/></a></li>
 						<li 
 						<c:if test="${bean.reportBusinessType eq 'isp_report'}">
 						class="active"
 						</c:if>
-						><a data-bussiness="isp_report" data-toggle="tab" href="#entranceId"><spring:message code="isp_report"/></a></li>
+						><a class="lireport" data-bussiness="isp_report" data-toggle="tab" href="#entranceId"  title="<spring:message code="isp_report"/>"><spring:message code="isp_report"/></a></li>
 					</ul>
 					<div class="tab-content table-responsive">
 						<div id="label" class="tab-pane fade