gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
Stream模块相关的日志查询修改查询接口为ntcAppLogs接口
This commit is contained in:
duandongmei
2018-10-10 17:54:17 +08:00
parent a763e92aaf 9f0f87b745
commit cdb48cebac
52 changed files with 427 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/domain/log/NtcBGPLog.java
View File

@@ -4,7 +4,7 @@ public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
private static final long serialVersionUID = 4597407682545926823L;
private Integer type;
private String as;
private String asNum;
private String route;
public Integer getType() {
return type;
@@ -12,11 +12,11 @@ public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
public void setType(Integer type) {
this.type = type;
}
public String getAs() {
return as;
public String getAsNum() {
return asNum;
}
public void setAs(String as) {
this.as = as;
public void setAsNum(String asNum) {
this.asNum = asNum;
}
public String getRoute() {
return route;

27
src/main/java/com/nis/domain/log/NtcStreamMediaLog.java Normal file
View File

@@ -0,0 +1,27 @@
package com.nis.domain.log;
/**
* @ClassName:NtcStreamMediaLog
* @Description:TODO(这里用一句话描述这个类的作用)
* @author (wx)
* @date 2018年7月16日 下午3:11:42
* @version V1.0
*/
public class NtcStreamMediaLog extends BaseLogEntity<NtcStreamMediaLog> {
private static final long serialVersionUID = 1446933545638550170L;
protected String url;
protected String protocol;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getProtocol() {
return protocol;
}
public void setProtocol(String protocol) {
this.protocol = protocol;
}
}

7
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -234,13 +234,16 @@ public class SysDictInfoController extends BaseController {
*/
@ResponseBody
@RequestMapping(value = "isItemCodeRepeat")
public boolean isItemCodeRepeat(String itemCode,String oldItemCode) {
public boolean isItemCodeRepeat(String itemCode,String oldItemCode,String itType) {
List<SysDictInfo> list = Lists.newArrayList();
if(oldItemCode!=null&&itemCode.trim().equals(oldItemCode.trim())){
return true;
}
if(!StringUtil.isEmpty(itemCode)){
list = sysDictInfoService.findByItemCode(itemCode);
SysDictInfo dict=new SysDictInfo();
dict.setItemCode(itemCode);
dict.setItemType(Integer.valueOf(itType));
list = sysDictInfoService.findByItemCode(dict);
}
if(list==null||list.size()==0){
return true;

16
src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
View File

@@ -20,7 +20,7 @@ import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.log.MmAvUrlLog;
import com.nis.domain.log.NtcStreamMediaLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
@@ -42,11 +42,11 @@ public class MmAvUrlLogController extends BaseController{
* @throws IOException
*/
@RequestMapping(value={"list",""})
public String list(Model model,@ModelAttribute("log")MmAvUrlLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
public String list(Model model,@ModelAttribute("log")NtcStreamMediaLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
try {
PageLog<MmAvUrlLog> page = new PageLog<MmAvUrlLog>(request, response);
PageLog<NtcStreamMediaLog> page = new PageLog<NtcStreamMediaLog>(request, response);
Map<String, Object> params=new HashMap<>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
@@ -62,13 +62,13 @@ public class MmAvUrlLogController extends BaseController{
Gson gson = new GsonBuilder().create();
//gson泛型支持
LogRecvData<MmAvUrlLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<MmAvUrlLog>>(){}.getType());
LogRecvData<NtcStreamMediaLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcStreamMediaLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<MmAvUrlLog> data = fromJson.getData();
Page<NtcStreamMediaLog> data = fromJson.getData();
page.setList(data.getList());
List<MmAvUrlLog> list = page.getList();
for (MmAvUrlLog l : list) {
List<NtcStreamMediaLog> list = page.getList();
for (NtcStreamMediaLog l : list) {
l.setFunctionId(entry.getFunctionId());
setLogAction(l,serviceList);
}
@@ -79,7 +79,7 @@ public class MmAvUrlLogController extends BaseController{
logger.error("查询音视频url日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmAvUrlList";
return "/log/ntc/ntcStreamMedia";
}
}

2
src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
View File

@@ -55,7 +55,7 @@ public interface SysDictInfoDao extends CrudDao<SysDictInfo> {
* @param itemCode
* @return
*/
List<SysDictInfo> findByItemCode(String itemCode);
List<SysDictInfo> findByItemCode(@Param("sysDictInfo")SysDictInfo sysDictInfo);
/**
* 根据上级id选出所有下级

10
src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
View File

@@ -232,10 +232,16 @@
<!-- 根据itemCode查询字典对象列表 -->
<select id="findByItemCode" resultType="com.nis.domain.basics.SysDictInfo">
<select id="findByItemCode" resultMap="dictResultMap">
select
<include refid="sysDictInfoColumns"/>
from sys_dict_info s where s.item_code = #{itemCode}
from sys_dict_info s where s.is_valid = 1
<if test="sysDictInfo.itemType != null and sysDictInfo.itemType != '' " >
AND s.item_type = ${sysDictInfo.itemType}
</if>
<if test="sysDictInfo.itemCode != null and sysDictInfo.itemCode != '' " >
AND s.item_code = ${sysDictInfo.itemCode}
</if>
</select>
<!-- 根据上级id选出所有下级 -->

4
src/main/java/com/nis/web/service/basics/SysDictInfoService.java
View File

@@ -206,8 +206,8 @@ public class SysDictInfoService extends BaseService{
* @param itemCode
* @return
*/
public List<SysDictInfo> findByItemCode(String itemCode) {
return sysDictInfoDao.findByItemCode(itemCode);
public List<SysDictInfo> findByItemCode(SysDictInfo sysDictInfo) {
return sysDictInfoDao.findByItemCode(sysDictInfo);
}
/**
* 根据上级id选出所有下级

4
src/main/resources/messages/message_en.properties
View File

@@ -1205,5 +1205,5 @@ transport_layer_protocol=TLS Protocol
av_voip_monit=VoIP Monit
av_voip_reject=VoIP Reject
label_proto_source=Protocol Source
label_behav_source=Behavior Source
label_app_source=APP Source
label_behav_source=Behavior Source
label_app_source=APP Source

4
src/main/resources/messages/message_ru.properties
View File

@@ -1207,5 +1207,5 @@ transport_layer_protocol=TLS Protocol
av_voip_monit=VoIP\u76D1\u6D4B
av_voip_reject=VoIP\u7BA1\u63A7
label_proto_source=Protocol Source
label_behav_source=Behavior Source
label_app_source=APP Source
label_behav_source=Behavior Source
label_app_source=APP Source

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1200,4 +1200,4 @@ av_voip_monit=VoIP\u76D1\u6D4B
av_voip_reject=VoIP\u7BA1\u63A7
label_proto_source=\u534F\u8BAE\u6765\u6E90
label_behav_source=\u884C\u4E3A\u6765\u6E90
label_app_source=\u5E94\u7528\u6765\u6E90
label_app_source=\u5E94\u7528\u6765\u6E90

2
src/main/resources/nis.properties
View File

@@ -250,7 +250,7 @@ ntcMailLog=ntcMailLogs
ntcFtpLog=ntcFtpLogs
ntcAppLog=ntcAppLogs
ntcDdosLog=ntcDdosLogs
dkBehaviorLog=dkBehaviorLogs
dkBehaviorLog=ntcAppLogs
mmVoipLog=mmVoipLogs
mmAvIpLog=mmAvIpLogs
mmAvUrlLog=mmAvUrlLogs

2
src/main/resources/sql/20181010/add_bgp_message_type.sql Normal file
View File

@@ -0,0 +1,2 @@
INSERT INTO sys_data_dictionary_name (`id`,`module_name`,`mark`,`remark`,`revision`,`create_time`,`modify_time`,`status`) VALUES(115,'BGP消息类型','BGP_MESSAGE_TYPE','','','2018-10-10 16:28:05','2018-10-10 16:28:05',1);
insert into sys_data_dictionary_item (`id`,`item_code`,`item_value`,`item_desc`,`item_sort`,`status`,`type`,`dictionary_id`) values (2602,1,'open','',0,1,1,115),(2603,2,'keepalive','',0,1,1,115),(2604,3,'update','',0,1,1,115),(2605,4,'notification','',0,1,1,115)

10
src/main/resources/sql/20181010/updateKeywords-district.sql Normal file
View File

@@ -0,0 +1,10 @@
ALTER TABLE ssl_keyword_cfg MODIFY cfg_keywords VARCHAR(2048),MODIFY district varchar(128);
ALTER TABLE app_ssl_cert_cfg MODIFY cfg_keywords VARCHAR(2048);
ALTER TABLE app_string_feature_cfg MODIFY cfg_keywords VARCHAR(2048);
ALTER TABLE byte_features_cfg MODIFY cfg_desc VARCHAR(128);
ALTER TABLE complex_keyword_cfg MODIFY district VARCHAR(128);
ALTER TABLE dns_domain_cfg MODIFY district VARCHAR(128);
ALTER TABLE http_req_head_cfg MODIFY district VARCHAR(128);
ALTER TABLE http_res_head_cfg MODIFY district VARCHAR(128);
ALTER TABLE intercept_pkt_bin MODIFY district VARCHAR(128);
ALTER TABLE mail_keyword_cfg MODIFY district VARCHAR(128),MODIFY cfg_keywords VARCHAR(2048);

2
src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
View File

@@ -61,7 +61,7 @@
validateForm = $("#inputForm").validate({
rules: {
'itemCode':{
remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}'
remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}&itType=${itType}'
},
'itemType':{
remote:'${ctx}/basics/sysDictInfo/ajaxChildrenType?parent=${sysDictInfo.sysDictId}'

8
src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
View File

@@ -10,7 +10,7 @@
<div class="page-content">
<div class="row">
<h3 class="page-title">
<spring:message code="special_task"/>
<spring:message code="special_tasks"/>
</h3>
<div class="col-md-12">
<div class="portlet box blue">
@@ -28,13 +28,13 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_name"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" name="taskName" value="${taskInfo.taskName}">
<input type="text" class="form-control required" name="taskName" maxlength="64" value="${taskInfo.taskName}">
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_org"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" name="taskOrg" value="${taskInfo.taskOrg}">
<input type="text" class="form-control required" name="taskOrg" maxlength="128" value="${taskInfo.taskOrg}">
</div>
</div>
<div class="form-group">
@@ -47,7 +47,7 @@
<div class="form-group last">
<label class="col-md-3 control-label"><th><spring:message code="desc"/>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="taskDesc" value="${taskInfo.taskDesc}">
<input type="text" class="form-control" maxlength="512" name="taskDesc" value="${taskInfo.taskDesc}">
</div>
</div>
</div>

2
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -19,7 +19,7 @@
</div>
</shiro:hasPermission>
<h3 class="page-title">
<spring:message code="special_task"></spring:message>
<spring:message code="special_tasks"></spring:message>
</h3>
<h5 class="page-header"></h5>

4
src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -174,7 +174,7 @@ $(document).ready(function(){
<th><spring:message code='found_time'/></th>
<th><spring:message code='entrance'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

12
src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
View File

@@ -97,7 +97,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='protocol_type'/>：</label>
<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
<form:select path="transProto" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -172,7 +172,7 @@
<th><spring:message code="found_time"/></th>
<th><spring:message code="entrance"/></th>
<th><spring:message code="clj_ip"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="transport_layer_protocol"/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="client_ip"/></th>
@@ -248,8 +248,12 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.type}</td>
<td>${log.as}</td>
<td>
<c:forEach items="${fns:getDictList('BGP_MESSAGE_TYPE')}" var="type">
<c:if test="${type.itemCode eq log.type}">${type.itemValue}</c:if>
</c:forEach>
</td>
<td>${log.asNum}</td>
<td>${log.route}</td>
</tr>
</c:forEach>

4
src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
View File

@@ -89,7 +89,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2 hidden">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -172,7 +172,7 @@ $(document).ready(function(){
<th><spring:message code='is_blcok'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
View File

@@ -99,7 +99,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='protocol_type'/>：</label>
<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
<form:select path="transProto" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -194,7 +194,7 @@
<th><spring:message code="dns_sub"/></th> --%>
<th><spring:message code="clj_ip"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="transport_layer_protocol"/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="client_ip"/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -179,7 +179,7 @@ $(document).ready(function(){
<th><spring:message code='ftp_content'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
View File

@@ -97,7 +97,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='protocol_type'/>：</label>
<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
<form:select path="transProto" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -192,7 +192,7 @@
<th><spring:message code="website"/></th>
<th><spring:message code="clj_ip"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="transport_layer_protocol"/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="client_ip"/></th>

12
src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
View File

@@ -52,11 +52,11 @@
<form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)}">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> --%>
<c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96)}">
<form:option value="${service.action}"><spring:message code="${service.serviceName}"/></form:option>
</c:if>
</c:forEach>
<%-- </c:forEach> --%>
</c:forEach>
</form:select>
</div>
@@ -97,7 +97,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='protocol_type'/>：</label>
<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
<form:select path="transProto" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -173,7 +173,7 @@
<th><spring:message code="found_time"/></th>
<th><spring:message code="entrance"/></th>
<th><spring:message code="clj_ip"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="transport_layer_protocol"/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="client_ip"/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
View File

@@ -88,7 +88,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -165,7 +165,7 @@ $(document).ready(function(){
<th><spring:message code='isakmp_mode'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol_type'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
View File

@@ -101,7 +101,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<form:select path="transProto" class="selectpicker form-control select2">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
@@ -177,7 +177,7 @@
<th><spring:message code="user_name"/></th>
<th><spring:message code="clj_ip" /></th>
<th><spring:message code="protocol_type" /></th>
<th><spring:message code="transport_layer_protocol" /></th>
<th><spring:message code="addr_type" /></th>
<th><spring:message code="serverip" /></th>
<th><spring:message code="clientip" /></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
View File

@@ -97,7 +97,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='protocol_type'/>：</label>
<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
<form:select path="transProto" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -180,7 +180,7 @@
<th><spring:message code="eml_key"/></th>
<th><spring:message code="clj_ip"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="transport_layer_protocol"/></th>
<th><spring:message code="addr_type" /></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="client_ip"/></th>

2
src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
View File

@@ -101,7 +101,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>

4
src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -181,7 +181,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol'/></th> --%>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
View File

@@ -101,7 +101,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -182,7 +182,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol'/></th> --%>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -181,7 +181,7 @@ $(document).ready(function(){
<%--<th><spring:message code='av_protocol'/></th> --%>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol_type'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
View File

@@ -99,7 +99,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -178,7 +178,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol'/></th> --%>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol_type'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -181,7 +181,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol'/></th> --%>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -181,7 +181,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol'/></th> --%>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
View File

@@ -135,7 +135,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type" />：</label>
<label><spring:message code="transport_layer_protocol" />：</label>
<c:set var="select">
<spring:message code='select' />
</c:set>
@@ -239,7 +239,7 @@
<%-- <th><spring:message code='av_protocol' /></th> --%>
<th><spring:message code='clj_ip' /></th>
<th><spring:message code='protocol_type' /></th>
<th><spring:message code='transport_layer_protocol' /></th>
<th><spring:message code='addr_type' /></th>
<th><spring:message code='serverip' /></th>
<th><spring:message code='clientip' /></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -181,7 +181,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol' /></th> --%>
<th><spring:message code='clj_ip' /></th>
<th><spring:message code='protocol_type' /></th>
<th><spring:message code='transport_layer_protocol' /></th>
<th><spring:message code='addr_type' /></th>
<th><spring:message code='serverip' /></th>
<th><spring:message code='clientip' /></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -181,7 +181,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol' /></th> --%>
<th><spring:message code='clj_ip' /></th>
<th><spring:message code='protocol_type' /></th>
<th><spring:message code='transport_layer_protocol' /></th>
<th><spring:message code='addr_type' /></th>
<th><spring:message code='serverip' /></th>
<th><spring:message code='clientip' /></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
View File

@@ -101,7 +101,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -180,7 +180,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol' /></th> --%>
<th><spring:message code='clj_ip' /></th>
<th><spring:message code='protocol_type' /></th>
<th><spring:message code='transport_layer_protocol' /></th>
<th><spring:message code='addr_type' /></th>
<th><spring:message code='serverip' /></th>
<th><spring:message code='clientip' /></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -181,7 +181,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol' /></th> --%>
<th><spring:message code='clj_ip' /></th>
<th><spring:message code='protocol_type' /></th>
<th><spring:message code='transport_layer_protocol' /></th>
<th><spring:message code='addr_type' /></th>
<th><spring:message code='serverip' /></th>
<th><spring:message code='clientip' /></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -181,7 +181,7 @@ $(document).ready(function(){
<%-- <th><spring:message code='av_protocol' /></th> --%>
<th><spring:message code='clj_ip' /></th>
<th><spring:message code='protocol_type' /></th>
<th><spring:message code='transport_layer_protocol' /></th>
<th><spring:message code='addr_type' /></th>
<th><spring:message code='serverip' /></th>
<th><spring:message code='clientip' /></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -188,7 +188,7 @@ $(document).ready(function(){
<th><spring:message code='fd_type'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -188,7 +188,7 @@ $(document).ready(function(){
<th><spring:message code='fd_type'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -188,7 +188,7 @@ $(document).ready(function(){
<th><spring:message code='fd_type'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

270
src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp Normal file
View File

@@ -0,0 +1,270 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script type="text/javascript">
$(document).ready(function(){
//筛选功能
filterActionInit();
//reset
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
$(this).selectpicker('val',$(this).find('option:first').val());
$(this).find("option").attr("selected",false);
$(this).find("option:first").attr("selected",true);
});
$(".Wdate").attr("value",'');
$(':input','#searchForm')
.not(':button,:submit,:reset,:hidden')
.attr("value",'');
$("#searchForm")[0].reset();
});
});
</script>
</head>
<body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
</div>
<h3 class="page-title">
<spring:message code="streaming_media"/>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmAvUrlLogs" method="post" class="form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) }">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:if>
</c:forEach>
</c:forEach>
</form:select>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
<i class="icon-wrench"></i>
</a>
</div>
</div>
<!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" >
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div>
</div>
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direct"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/>：</label>
<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="clj_ip"/>：</label>
<input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="clientip"/>：</label>
<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="serverip"/>：</label>
<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
</div>
</div>
<div class="col-md-2">
<label><spring:message code="cfg_id"></spring:message>：</label>
<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
</div>
</div>
</div>
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
<th><spring:message code="action"/></th>
<th><spring:message code='found_time'/></th>
<th><spring:message code='entrance'/></th>
<th><spring:message code='access_url'/></th>
<th><spring:message code='protocol'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>
<th><spring:message code='serverport'/></th>
<th><spring:message code='clientport'/></th>
<%-- <th><spring:message code='deviceid'/></th> --%>
<%-- <th><spring:message code='direct'/></th> --%>
<th><spring:message code='stream_type'/></th>
<%-- <th><spring:message code='nest_addr_list'/></th> --%>
<th><spring:message code='server_locate'/></th>
<th><spring:message code='client_locate'/></th>
<th><spring:message code='s_asn'/></th>
<th><spring:message code='d_asn'/></th>
<th><spring:message code='s_subscribe_id'/></th>
<th><spring:message code='d_subscribe_id'/></th>
<th><spring:message code='scene_file'/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
<tr>
<td>${log.cfgId } <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
<c:if test="${dict.itemCode eq log.entranceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${fn:startsWith(log.url, 'http://')}">
${fn:substring(log.url,7,-1)}
</c:if>
<c:if test="${!fn:startsWith(log.url, 'http://') and !empty log.url}">
${log.url}
</c:if>
</td>
<td>${log.protocol}</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td>${log.transProto}</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td>
<td>${log.sPort}</td>
<%-- <td>${log.deviceId}</td>
<td>
<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td> --%>
<td>
<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<%-- <td>
${log.addrList}
</td> --%>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
<td>${log.sAsn}</td>
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.sceneFile}</td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="page">${page}</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

4
src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -180,7 +180,7 @@ $(document).ready(function(){
<th><spring:message code='tunnel_type'/></th>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol_type'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
View File

@@ -114,7 +114,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='protocol_type'/>：</label>
<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
<form:select path="transProto" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -194,7 +194,7 @@
<th><spring:message code="p2p_keyword"/></th>
<th><spring:message code="clj_ip"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="transport_layer_protocol"/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="client_ip"/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
View File

@@ -101,7 +101,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<form:select path="transProto" class="selectpicker form-control select2">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
@@ -175,7 +175,7 @@
<th><spring:message code="encrypt_mode" /></th>
<th><spring:message code="clj_ip" /></th>
<th><spring:message code="protocol_type" /></th>
<th><spring:message code="transport_layer_protocol" /></th>
<th><spring:message code="addr_type" /></th>
<th><spring:message code="serverip" /></th>
<th><spring:message code="clientip" /></th>

4
src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
View File

@@ -102,7 +102,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>
@@ -182,7 +182,7 @@ $(document).ready(function(){
<th><spring:message code='tunnel_type'/></th> --%>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol_type'/></th>
<th><spring:message code='transport_layer_protocol'/></th>
<th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
View File

@@ -110,7 +110,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="protocol_type"/>：</label>
<label><spring:message code="transport_layer_protocol"/>：</label>
<form:select path="transProto" class="selectpicker form-control select2">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
@@ -186,7 +186,7 @@
<th>CN</th>
<th><spring:message code="clj_ip" /></th>
<th><spring:message code="protocol_type" /></th>
<th><spring:message code="transport_layer_protocol" /></th>
<th><spring:message code="addr_type" /></th>
<th><spring:message code="serverip" /></th>
<th><spring:message code="clientip" /></th>

4
src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
View File

@@ -84,7 +84,7 @@
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code='protocol_type'/>：</label>
<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
<form:select path="transProto" class="selectpicker form-control">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -159,7 +159,7 @@
<th><spring:message code="entrance"/></th>
<th> URL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
<th><spring:message code="clj_ip"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="transport_layer_protocol"/></th>
<th><spring:message code="server_ip"/></th>
<th><spring:message code="client_ip"/></th>
<th><spring:message code="server_port"/></th>

2
src/main/webapp/WEB-INF/views/report/lwhh.jsp
View File

@@ -17,7 +17,7 @@
trContent += "<tr>";
<c:forEach items="${requestInfos}" var="lwhh">
<c:if test="${lwhh.id eq data.key}">
trContent += "<td>${lwhh.requestTitle}</td>";
trContent += "<td title='${lwhh.requestTitle}'>${fns:abbr(lwhh.requestTitle,32)}</td>";
</c:if>
</c:forEach>
<c:forEach items="${data.value}" var="cloumn" varStatus="status">

2
src/main/webapp/WEB-INF/views/sys/dictList.jsp
View File

@@ -274,7 +274,7 @@
<sys:message content="${message}" />
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<table id="contentTable1" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th class="sort-column module_name" width="15%"><spring:message code="module_name"/></th>

3
src/main/webapp/static/global/scripts/common.js
View File

@@ -1,6 +1,7 @@
$(function(){
//增加描述新增时的文字长度限制
$("form input[name='cfgDesc']").attr("maxlength","128")
$("form input[name='cfgDesc']").attr("maxlength","128");
$("form input[name$='cfgKeywords']").attr("maxlength","2048");
//截取过长的文字 使用id选择器;例如:tab对象->tr->td对象. 排除日志table .logTb
$("#contentTable").not(".logTb").find("td").each(function(i){
//获取td当前对象的文本,如果长度大于25;