diff --git a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
index 742839279..09b9d092a 100644
--- a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
@@ -34,7 +34,7 @@ public class NtcLwhhReportController extends BaseController {
 	@RequestMapping("/ajaxNtcLwhhReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+		List<RequestInfo> requestInfos=requestInfoService.getAllLwhhRequestInfo();
 		model.addAttribute("requestInfos", requestInfos);
 		if(bean.getServiceId()!=null){
 			bean.setServices(bean.getServiceId().toString());
diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
index dd2a81609..1111b97c8 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
@@ -379,6 +379,9 @@
 	      <if test="ipTotal != null" >
 	        ip_total = #{ipTotal,jdbcType=INTEGER},
 	      </if>
+	      <if test="addrPoolName != null and addrPoolName != ''" >
+	        addr_pool_name = #{addrPoolName,jdbcType=VARCHAR},
+	      </if>
 	      <if test="isValid != null" >
 	        is_valid = #{isValid,jdbcType=INTEGER},
 	      </if>
diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
index 2f4972b93..c4cfc7cbb 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
@@ -252,6 +252,9 @@
 	      <if test="userType != null and userType != ''" >
 	        user_type = #{userType,jdbcType=VARCHAR},
 	      </if>
+	      <if test="cfgDesc != null and cfgDesc != ''" >
+	        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+	      </if>
 	      <if test="addrPoolId != null" >
 	        addr_pool_id = #{addrPoolId,jdbcType=INTEGER},
 	      </if>
diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
index 205854335..3259fb23f 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
@@ -26,6 +26,8 @@ public interface RequestInfoDao  extends CrudDao {
 	void delete(@Param("id") Long id);
 	
 	String getRequestTitleById(@Param("id")Long id);
+	
+	List<RequestInfo> findAllLwhhList();
 
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index 875a2d6f4..ad9f2afbf 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -218,6 +218,13 @@
 	from request_info
   </select>
   
+    <select id="findAllLwhhList" resultMap="BaseResultMap">
+	select
+		<include refid="Base_Column_List" />
+	from request_info
+	where  is_audit =1 or is_audit=3 
+  </select>
+  
   <select id="getRequestTitleById" resultType="string">
   	select request_title requestTitle from request_info where id=#{id}
   </select>
diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
index c922de8f1..e2c27fb67 100644
--- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
+++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
@@ -114,6 +114,11 @@ public class RequestInfoService extends BaseService{
 		RequestInfo requestInfo=new RequestInfo();
 		return requestInfoDao.findAllList(requestInfo);
 	}
+	
+	public List<RequestInfo> getAllLwhhRequestInfo(){
+		return requestInfoDao.findAllLwhhList();
+	}
+	
 
 	public List<TaskInfo> showTask(TaskInfo taskInfo) {
 		return taskInfoDao.findList(taskInfo);
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 253507778..9fafde797 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1018,7 +1018,7 @@ domain_intercepter_ratelimit=Domain Intercept Rate Limit
 app_built_in_features_config=APP Built-in Features
 PXY_INTERCEPT_PKT_BIN=Packet Payload
 certificate=Certificate
-do_log=Unstructured Log Option
+do_log=Log Option
 file_strategy=File Strategy
 file_desc=File Desc
 content_type=Content Type
@@ -1335,4 +1335,5 @@ log_to_cfg=Config
 address_pool_is_used=Address pool is used and cannot perform this operation!
 cgi_service_failed=Request CGI server failed
 available_ip=Available IP
-config_sync=Configuration Synchronization
\ No newline at end of file
+config_sync=Configuration Synchronization
+info_failed=Information Acquisition Failure
\ 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 b3088d4bf..7923f5fcc 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1333,4 +1333,5 @@ log_to_cfg=\u914D\u7F6E
 address_pool_is_used=\u5730\u5740\u6C60\u5DF2\u88AB\u4F7F\u7528\uFF0C\u65E0\u6CD5\u6267\u884C\u8BE5\u64CD\u4F5C\uFF01
 cgi_service_failed=\u8BF7\u6C42CGI\u670D\u52A1\u63A5\u53E3\u5931\u8D25
 available_ip=\u53EF\u7528IP\u5730\u5740
-config_sync=\u914D\u7F6E\u540C\u6B65
\ No newline at end of file
+config_sync=\u914D\u7F6E\u540C\u6B65
+info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
\ No newline at end of file
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 0c6a1d8a5..dfb941c41 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -18,7 +18,7 @@
 	    	<serviceCfg cfgType="1" tableName="asn_ip_cfg"  groupReuse="true" groupId="userRegion4"></serviceCfg>
 	    	<userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0"  ></userRegion>
 	</service>
-	<service id="3" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP丢弃">
+	<service id="3" functionId="5" serviceType="2" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP丢弃">
 	    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 	</service>
 	<service id="514" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP限速">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 25d24bc5a..48049f571 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -378,7 +378,7 @@
 								    <th><spring:message code="behaviour_type"/></th>
 								    <th><spring:message code="is_audit"/></th>
 								    <th><spring:message code="do_log"/></th>
-								    <%-- <th><spring:message code="log_total"/></th> --%>
+								    <th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -446,7 +446,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index 75459f4e9..5d3041fca 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -357,7 +357,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -500,7 +500,7 @@
 											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
 											</c:when></c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index 068286321..e33e926a0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -373,7 +373,7 @@
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -421,7 +421,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index c7ae209ab..a703de5dd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -358,7 +358,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid" ><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -502,7 +502,7 @@
 											</c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 1cbe481ff..7c3a31cda 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -345,7 +345,7 @@
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -419,7 +419,7 @@
 											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
 											</c:when></c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 4d2517bb8..ffbe3d1db 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -305,7 +305,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -416,7 +416,7 @@
 											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
 											</c:when></c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index e0655254d..b5b1f88a7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -365,7 +365,7 @@
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -412,7 +412,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									 <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index d8db05b85..4159ea057 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -380,7 +380,7 @@
 									<th><spring:message code="basic_protocol"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -439,7 +439,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index 33cec2e14..2489c421a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -324,7 +324,7 @@
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="whether_area_block"/></th>
 									
 									<th><spring:message code="antiddos_protocol"/></th>
@@ -383,7 +383,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									 <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> 
 									
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 8a7f9a980..693e6c40f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -377,7 +377,7 @@
 								    <th><spring:message code="behaviour_type"/></th>
 								   <th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -434,7 +434,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index f249645aa..851adad36 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -345,7 +345,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -391,7 +391,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index 3d248887e..278924e28 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -359,7 +359,7 @@
 								    <th class="sort-column a.action"><spring:message code="block_type"/></th>
 								    <th><spring:message code="is_audit"/></th>
 								    <th><spring:message code="do_log"/></th>
-								    <%-- <th><spring:message code="log_total"/></th> --%>
+								    <th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -405,7 +405,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									 <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index 89fc883a1..ef929dfbe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -360,7 +360,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -407,7 +407,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="35" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${indexCfg.isAudit}" functionId="35" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
index a5856584c..838eaed0d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
@@ -84,7 +84,7 @@
 				success:function(data,status){
 					var dataArr = data.candidate_ip;
 					var html = ""
-						html = "<div style='width:98%;overflow: auto;margin-top: 10px;height: 300px;margin-left: 1%;margin-right: 1%;'><br>"
+						html = "<div style='width:98%; overflow: auto; height: 300px; margin-left: 1%; margin-right: 1%;'><br>"
 						html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;'>";
 	      			   	html+="<tbody>";
 	      			   		if(dataArr.length == 0){
@@ -179,20 +179,13 @@
                                          	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="cfgId"><spring:message code="address_pool_id"></spring:message></form:option>
                                         		<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
-												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 										</div>
                                          
                                         <input id="intype" class="form-control input-medium" type="text" value="">
                                   		<div class="input-group-btn">
-	                                  		<form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
-												</c:forEach>
-											</form:select>
-											<form:select path="isValid" class="selectpicker select2 input-small" >
+	                                  		<form:select path="isValid" class="selectpicker select2 input-small" >
 												<form:option value=""><spring:message code="select"/></form:option>
 												<form:option value="1"><spring:message code="yes"/></form:option>
 												<form:option value="0"><spring:message code="no"/></form:option>
@@ -364,11 +357,11 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column r.compile_id"><spring:message code="address_pool_id"/></th>
-									<th><spring:message code="address_pool"/></th>
-									<th class="sort-column r.ipTotal"><spring:message code="ip_total"/></th>
-									<th class="sort-column r.available_ip_total"><spring:message code="available_ip_total"/></th>
+									<th class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
+									<th class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
+									<th><spring:message code="available_ip_total"/></th>
 									
-									<th><spring:message code="block_type"/></th>
+									<%-- <th><spring:message code="block_type"/></th> --%>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
@@ -376,7 +369,7 @@
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="operation"/></th>
+									<%-- <th><spring:message code="operation"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -391,21 +384,21 @@
 									<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}" addressPoolId="${cfg.cfgId }" ></td>
 									<td>${cfg.cfgId }</td>
 									<td>
-										<a href="javascript:;" data-original-title="${cfg.addrPoolName}"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+										<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.cfgId }"
+											data-original-title="${cfg.addrPoolName}" class="tooltips addrPool" data-flag="false" data-html="true" data-placement="top">
 											${fns:abbr(cfg.addrPoolName,20)}
 										</a>
 									</td>
 									<td>${cfg.ipTotal }</td>
 									<td audit="${cfg.isAudit}" addrPoolId="${cfg.cfgId }"><div class="loading-total"></div></td>
 									
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
@@ -485,11 +478,11 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
-									<td>
+									<%-- <td>
 										<!-- <a href="#">新增IP</a>
 										<a href="#">删除IP</a> -->
 										<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.cfgId }"><spring:message code="show_detail"/></a>
-									</td>
+									</td> --%>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
index df3a6faba..3e777d5a2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
@@ -67,30 +67,31 @@
 	      			  	/* html+="<th><spring:message code="incoming_broadcast_packets"/></th><th><spring:message code="incoming_broadcast_total_size"/></th>"; */
 	      			  	html+="</thead>";
 	      			   	html+="<tbody>";
-		      			   	for(i=0;i<data.length;i++){
+	      			   var user=data.user;
+		      			   	for(i=0;i<user.length;i++){
 		      			   		html+="<tr>";
 		      			   		if(i==0){
-		      			   		html+="<td class='taskStatus' rowspan='"+data.length+"'>"+userName;
+		      			   		html+="<td class='taskStatus' rowspan='"+(user.length-1)+"'>"+userName;
 		      					html+="</td>";
 		      			   		}
-		      					html+="<td class='taskStatus'>"+data[i].serverIp+"</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Create_on==null?"":data[i].Create_on);
+		      					html+="<td class='taskStatus'>"+user[i].serverIp+"</td>";
+		      					html+="<td class='taskStatus'>"+(user[i].Create_on==null?"":user[i].Create_on);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Updated_on==null?"":data[i].Updated_on);
+		      					html+="<td class='taskStatus'>"+(user[i].Updated_on==null?"":user[i].Updated_on);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Number_of_Logins==null?"":data[i].Number_of_Logins);
+		      					html+="<td class='taskStatus'>"+(user[i].Number_of_Logins==null?"":user[i].Number_of_Logins);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Unicast_Packets==null?"":data[i].Outgoing_Unicast_Packets);
+		      					html+="<td class='taskStatus'>"+(user[i].Outgoing_Unicast_Packets==null?"":user[i].Outgoing_Unicast_Packets);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Unicast_Total_Size==null?"":data[i].Outgoing_Unicast_Total_Size);
+		      					html+="<td class='taskStatus'>"+(user[i].Outgoing_Unicast_Total_Size==null?"":user[i].Outgoing_Unicast_Total_Size);
 		      					html+="</td>";
 		      					/* html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Packets==null?"":data[i].Outgoing_Broadcast_Packets);
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Total_Size==null?"":data[i].Outgoing_Broadcast_Total_Size);
 		      					html+="</td>"; */
-		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Unicast_Packets==null?"":data[i].Incoming_Unicast_Packets);
+		      					html+="<td class='taskStatus'>"+(user[i].Incoming_Unicast_Packets==null?"":user[i].Incoming_Unicast_Packets);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Unicast_Total_Size==null?"":data[i].Incoming_Unicast_Total_Size);
+		      					html+="<td class='taskStatus'>"+(user[i].Incoming_Unicast_Total_Size==null?"":user[i].Incoming_Unicast_Total_Size);
 		      					html+="</td>";
 		      					/* html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Packets==null?"":data[i].Incoming_Broadcast_Packets);
 		      					html+="</td>";
@@ -102,6 +103,10 @@
 		      			 	html+="</table>";  
 		      			 	html+="</div>";
 					top.$.jBox(html,{width: $(document).width()*0.6,height: 480,title:"<spring:message code="user_info"/>", buttons:{"<spring:message code="close"/>":true}});
+					if(data.message !=null && data.message !=""){
+						var mes="<spring:message code="user"/> "+userName+" "+data.message+" <spring:message code="vpn_ip"/> <spring:message code="info_failed"/>";
+						top.$.jBox.tip(mes);
+					}
 		 }
 	  });
 	} 
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
index 950d2617e..7249c070c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
@@ -87,7 +87,7 @@ $(function(){
 								    <!-- dolog begin-->
 									<!-- <div class="row doLog"> -->
 										<div class="col-md-6">
-											<div class="form-group">
+											<div class="form-group hidden">
 												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 													<c:choose>
@@ -108,6 +108,21 @@ $(function(){
 									<!-- </div> -->
 									<!-- dolog end-->
 								    
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="user"/></label>
+								            <div class="col-md-6">
+								            	<select name="userId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
+				               						<option value="" ><spring:message code="select"/></option>
+				               						<c:forEach items="${users }" var="user">
+														<option value="${user.id}" <c:if test="${_cfg.userId eq user.id }">selected</c:if>><spring:message code="${user.userName}"/></option>
+							              			</c:forEach>
+								                </select>
+								            </div>
+								            <div for="userId"></div>
+								        </div>
+								    </div>
+								    
 								    <c:if test="${fn:length(serviceList)>1}">
 									    <div class="col-md-6">
 									        <div class="form-group">
@@ -138,20 +153,6 @@ $(function(){
 								   </c:if>
 								</div>
 								<div class="row">
-									<div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="user"/></label>
-								            <div class="col-md-6">
-								            	<select name="userId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
-				               						<option value="" ><spring:message code="select"/></option>
-				               						<c:forEach items="${users }" var="user">
-														<option value="${user.id}" <c:if test="${_cfg.userId eq user.id }">selected</c:if>><spring:message code="${user.userName}"/></option>
-							              			</c:forEach>
-								                </select>
-								            </div>
-								            <div for="userId"></div>
-								        </div>
-								    </div>
 									<div class="col-md-6">
 										<div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="address_pool"/></label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 53ccd29ae..a5947b915 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -359,7 +359,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -405,7 +405,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
index 3ae9afac9..c94599f72 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -334,7 +334,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -446,7 +446,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index c0872cd72..f0742c74d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -567,7 +567,7 @@
 										<th><spring:message code="do_log"/></th>
 									</c:if>
 									<c:if test="${action ne 128}">
-										<%-- <th><spring:message code="log_total"/></th> --%>
+										 <th><spring:message code="log_total"/></th> 
 									</c:if>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -672,7 +672,7 @@
 										</td>
 									</c:if>
 									<c:if test="${action ne 128}">
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									 <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									</c:if>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index b35f688b3..c410fa20e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -358,7 +358,7 @@
 								    <th><spring:message code="policy_name"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -409,7 +409,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									 <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 4edaa6a67..0cee80f1d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -515,7 +515,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -561,7 +561,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									 <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 1962c915b..15367cb76 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -356,7 +356,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -402,7 +402,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 335abf99b..0cc8ed2b7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -337,7 +337,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="log_total"/></th> 
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -384,7 +384,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
+									 <td audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
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 75aedb004..1b173a304 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -340,7 +340,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 62f4e8206..4f6014cd7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -288,7 +288,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 ad29dd7e9..c6a07b6e2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -294,7 +294,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 6dbe6b528..3018d3940 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -310,7 +310,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 b11215813..648f0dda2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -347,7 +347,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 0655a6a03..c763fb555 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -318,7 +318,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 6da8e0b59..0ab724095 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
@@ -342,7 +342,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 91721170e..84d1cc2a7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -382,7 +382,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 716b67a39..ae2410bf1 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -290,7 +290,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 35f1c54bd..e61aa6a92 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -252,7 +252,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 f9d53a999..887d8b8cf 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -264,7 +264,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 fb1288442..70f549094 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -321,7 +321,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 d7901d132..13e866e93 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -293,7 +293,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 2fb534be0..5ebf15cc3 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -289,7 +289,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 1a7e59907..562a0bff4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -333,7 +333,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 3cdeb0e7a..0b55f24d2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -289,7 +289,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 5d3a93714..b39c8f184 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -288,7 +288,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 e291e0344..5dd5d10dc 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -290,7 +290,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 79574662a..0698c34a5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -332,7 +332,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 de827d158..7049fc3a3 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -392,7 +392,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 bc9fe5f65..9c177f962 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -332,7 +332,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 daf6f8fc1..1fbae5bc3 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -332,7 +332,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 7267767b3..2304b339f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -332,7 +332,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 6640c1565..13d0fd4cf 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -332,7 +332,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 8944e56e3..12b36509d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -333,7 +333,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 123fcca2e..3bcf1da8c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -335,7 +335,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 8a2904329..80a82b667 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -294,7 +294,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 3b1330fa5..cc269072e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -338,7 +338,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 20c4a0825..a929cc7f8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
@@ -300,7 +300,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 a85f07740..a700a0a9a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -265,7 +265,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 85b8aa578..fcf491901 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -298,7 +298,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 799e6a3eb..95997151f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -257,7 +257,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 66db839c8..cf93e3df1 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -264,7 +264,11 @@ $(document).ready(function(){
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 0d1daaded..28ec4e91b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -313,7 +313,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
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 95a43ccaf..b53cdc096 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -314,7 +314,11 @@
 											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-									<td>${log.linkId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LINK')}" var="link">
+											<c:if test="${link.itemCode eq log.linkId}"><spring:message code="${link.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENCAP_TYPE')}" var="encapType">
 											<c:if test="${encapType.itemCode eq log.encapType}"><spring:message code="${encapType.itemValue}"/></c:if>
diff --git a/src/main/webapp/online-help/proxy/cache_policy.html b/src/main/webapp/online-help/proxy/cache_policy.html
index c120732b8..57e840838 100644
--- a/src/main/webapp/online-help/proxy/cache_policy.html
+++ b/src/main/webapp/online-help/proxy/cache_policy.html
@@ -60,7 +60,7 @@ License: You must have a valid license purchased only from themeforest(the above
 						<div class="panel-heading">
 							<h4 class="panel-title">
 							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#accordion1_1">
-							1.功能简介</a>
+							1.Function Introduction</a>
 							</h4>
 						</div>
 						<div id="accordion1_1" class="panel-collapse collapse in">
@@ -95,7 +95,7 @@ License: You must have a valid license purchased only from themeforest(the above
 						<div class="panel-heading">
 							<h4 class="panel-title">
 							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#accordion1_2">
-							2.动作参数</a>
+							2.Action</a>
 							</h4>
 						</div>
 						<div id="accordion1_2" class="panel-collapse collapse">
diff --git a/src/main/webapp/online-help/proxy/control_policy.html b/src/main/webapp/online-help/proxy/control_policy.html
index 4785f3998..406bc1f95 100644
--- a/src/main/webapp/online-help/proxy/control_policy.html
+++ b/src/main/webapp/online-help/proxy/control_policy.html
@@ -60,7 +60,7 @@ License: You must have a valid license purchased only from themeforest(the above
 						<div class="panel-heading">
 							<h4 class="panel-title">
 							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#accordion1_1">
-							1.功能简介</a>
+							1.Function Introduction</a>
 							</h4>
 						</div>
 						<div id="accordion1_1" class="panel-collapse collapse in">
@@ -76,7 +76,7 @@ License: You must have a valid license purchased only from themeforest(the above
 						<div class="panel-heading">
 							<h4 class="panel-title">
 							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#accordion1_2">
-							2.执行动作 </a>
+							2.Action </a>
 							</h4>
 						</div>
 						<div id="accordion1_2" class="panel-collapse collapse">
@@ -110,7 +110,7 @@ License: You must have a valid license purchased only from themeforest(the above
 						<div class="panel-heading">
 							<h4 class="panel-title">
 							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#accordion1_3">
-							3.业务配置属性 </a>
+							3.Attibutes </a>
 							</h4>
 						</div>
 						<div id="accordion1_3" class="panel-collapse collapse">
diff --git a/src/main/webapp/online-help/proxy/intercept_policy.html b/src/main/webapp/online-help/proxy/intercept_policy.html
index 03f6184b0..084ee1f6a 100644
--- a/src/main/webapp/online-help/proxy/intercept_policy.html
+++ b/src/main/webapp/online-help/proxy/intercept_policy.html
@@ -60,7 +60,8 @@ License: You must have a valid license purchased only from themeforest(the above
 						<div class="panel-heading">
 							<h4 class="panel-title">
 							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#accordion1_1">
-							1.功能简介</a>
+							1.Function Introduction
+							</a>
 							</h4>
 						</div>
 						<div id="accordion1_1" class="panel-collapse collapse in">
@@ -73,7 +74,7 @@ License: You must have a valid license purchased only from themeforest(the above
 						<div class="panel-heading">
 							<h4 class="panel-title">
 							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#accordion1_2">
-							2.执行动作 </a>
+							2.Action </a>
 							</h4>
 						</div>
 						<div id="accordion1_2" class="panel-collapse collapse">
diff --git a/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js b/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js
index 50b3984eb..13365f04e 100644
--- a/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js
+++ b/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js
@@ -526,8 +526,7 @@
                         if (!cell.t) {
                             if (types.number.assert(cell.v)) cell.t = 'n';
                             else if (types.boolean.assert(cell.v)) cell.t = 'b';
-                            else if (types.date.assert(cell.v)) cell.t = 'd';
-                            else cell.t = 's';
+                            else  cell.t = 's';
                         }
 
                         if (cell.t === 'd') {
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 3d0b28091..79bab30a0 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -96,7 +96,7 @@ $(function(){
 		top.$.jBox(html,{height:450,width:600,title:"<i class='icon-book-open'></i> Log Info",showIcon:false,opacity:0.5});
 	});
 	//表格中的tooltips鼠标点击复制完整的内容
-	$("td>.tooltips").on("click",function(){
+	$("td>.tooltips").not(".addrPool").on("click",function(){
 		//$(this).attr("data-clipboard-action","copy");
 		$(this).attr("data-clipboard-text",$(this).attr("data-original-title"));
 		var clipboard = new ClipboardJS('td >.tooltips');