1、用户管理查看提示接口异常信息

2、业务配置界面展示log_total
3、修复实时报表导出部分字段转成日期型及来函信息展示is_valid为1或3的数据
4、日志界面link_id添加字典处理

src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java

@@ -10,6 +10,7 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.eclipse.jetty.util.ajax.JSON;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -301,20 +302,37 @@ public class UserManageController  extends BaseController{
 	
 	@ResponseBody
 	@RequestMapping(value = "userInfo")
-	public List<Map<String,String>> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){
+	public Map<String,Object> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){
 		String[] ipArray = serverIp.split(",");
 		List<Map<String,String>> userManageList=new ArrayList<Map<String,String>>();
+		String message="";
+		Map<String,Object> mess=new HashMap<String,Object>();
 		for(String ip :ipArray){
+			Map<String,String> map=new HashMap<String,String>();
 			UserManage  user=new UserManage();
 			IpReuseIpCfg  ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
 			//根据ip调用接口获取数据
-			Map<String,String> map=userManageService.getUser(ip,userName);
+			try{
-			if(ipReuseIpCfg!=null ){
+			String recv=userManageService.getUser(ip,userName);
-				map.put("serverIp", ipReuseIpCfg.getDestIpAddress());
+			if (StringUtils.isNotBlank(recv)) {
-				userManageList.add(map);
+				map=(Map<String,String>)JSON.parse(recv);
-			}
+				if(ipReuseIpCfg!=null ){
+					map.put("serverIp", ipReuseIpCfg.getDestIpAddress());
+					userManageList.add(map);
+				 }
+			   }
+		    } catch (Exception e) {
+		    	if(message==""){
+		    		message=ip;
+		    	}else{
+		    		message+=","+ip;
+		    	}
+			logger.error("查询失败", e);
+		   }
 		}
-		return userManageList;
+		mess.put("message", message);
+		mess.put("user", userManageList);
+		return mess;
 	}
 
 /*	@RequestMapping(value = "view")

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());

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();
 
 
 }

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>

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);

src/main/java/com/nis/web/service/configuration/UserManageService.java

@@ -194,22 +194,15 @@ public class UserManageService extends BaseService{
 	}
 	
 	//根据vpn服务器ip获取用户vpn服务器ip信息
-	public Map<String,String>  getUser(String serverIp,String userName){
+	public String  getUser(String serverIp,String userName){
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("cmd", Constants.NTC_IP_REUSE_USER_GET);
 		params.put("server_ip", serverIp);
 		params.put("user_name", userName);
 		Map<String,String> map=new HashMap<String,String>();
-		try{ 
+		String url =Constants.IP_REUSE_CALL_CGI_URL;
-			String url =Constants.IP_REUSE_CALL_CGI_URL;
+		String recv = ConfigServiceUtil.getCGI(url, params);
-			String recv = ConfigServiceUtil.getCGI(url, params);
+		return recv;
-				if (StringUtils.isNotBlank(recv)) {
-					map=(Map<String,String>)JSON.parse(recv);
-				}
-			} catch (Exception e) {
-				logger.error("查询失败", e);
-		}
-		return map;
 	}
 	
 

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
+config_sync=Configuration Synchronization
+info_failed=Information Acquisition Failure

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
+config_sync=\u914D\u7F6E\u540C\u6B65
+info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25

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}">

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>

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}">

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>

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}">

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>

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}">

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}">

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>

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}">

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}">

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}">

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

@@ -378,7 +378,7 @@
 									<th><spring:message code="ratelimit"/></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>
@@ -433,7 +433,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}">

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}">

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'>"+user[i].serverIp+"</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Create_on==null?"":data[i].Create_on);
+		      					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);
+					}
 		 }
 	  });
 	} 

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}">

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>

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>

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}">

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}">

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}">

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}">

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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') {