Merge branch 'develop_no_common_group' of git@git.mesalab.cn:K18_NTCS_WEB/NTC.git into develop_no_common_group
This commit is contained in:
wangwei
@@ -137,13 +137,13 @@ public class PxyHttpManipulationLog extends BaseEntity<PxyHttpManipulationLog>{
|
||||
protected String san;
|
||||
@ExcelField(title="cn",sort=85)
|
||||
protected String cn;
|
||||
// @ExcelField(title="social_app",sort=86)
|
||||
protected String appId;//app
|
||||
@ExcelField(title="social_app",sort=86)
|
||||
protected String appId;//app
|
||||
// @ExcelField(title="social_app",sort=86)
|
||||
protected String appName;//app
|
||||
// @ExcelField(title="protocol",sort=87)
|
||||
protected String protocolId;//协议
|
||||
@ExcelField(title="protocol",sort=87)
|
||||
protected String protocolId;//协议
|
||||
// @ExcelField(title="protocol",sort=87)
|
||||
protected String protocolName;//协议
|
||||
@ExcelField(title="con_latency_ms",sort=88)
|
||||
protected Integer conLatencyMs;//握手延迟
|
||||
|
||||
@@ -53,8 +53,8 @@ public class PxyHttpManipulLogController extends BaseController{
|
||||
public String list(@ModelAttribute("log") PxyHttpManipulationLog log, Model model, HttpServletRequest request,
|
||||
HttpServletResponse response,Integer searchAction) {
|
||||
try {
|
||||
List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
|
||||
List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
|
||||
// List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
|
||||
// List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
|
||||
PageLog<PxyHttpManipulationLog> page = new PageLog<PxyHttpManipulationLog>(request, response);
|
||||
Map<String, Object> params = new HashMap<String, Object>();
|
||||
params.put("pageSize", page.getPageSize());
|
||||
@@ -79,18 +79,18 @@ public class PxyHttpManipulLogController extends BaseController{
|
||||
if(log.getCfgId()!=null && log.getPolicyId() ==null){
|
||||
log.setPolicyId(log.getCfgId());
|
||||
}
|
||||
if (StringUtils.isNotBlank(log.getAppId())) {
|
||||
params.put("searchAppId", log.getAppId());
|
||||
}
|
||||
if (StringUtils.isNotBlank(log.getProtocolId())) {
|
||||
params.put("searchProtocolId", log.getProtocolId());
|
||||
}
|
||||
// if (StringUtils.isNotBlank(log.getAppId())) {
|
||||
// params.put("searchAppId", log.getAppId());
|
||||
// }
|
||||
// if (StringUtils.isNotBlank(log.getProtocolId())) {
|
||||
// params.put("searchProtocolId", log.getProtocolId());
|
||||
// }
|
||||
initLogSearchValues(log, params);
|
||||
|
||||
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
|
||||
model.addAttribute("serviceList", serviceList);
|
||||
model.addAttribute("appList", appCodeList);
|
||||
model.addAttribute("protocolList", protocolCodeList);
|
||||
// model.addAttribute("appList", appCodeList);
|
||||
// model.addAttribute("protocolList", protocolCodeList);
|
||||
String url = Constants.LOG_BASE_URL + Constants.POLICY_EVENT;
|
||||
String recv = HttpClientUtil.getMsg(url, params, request);
|
||||
|
||||
@@ -111,7 +111,7 @@ public class PxyHttpManipulLogController extends BaseController{
|
||||
l.setStartTime(timeStamp2Date(l.getStartTime(),null));
|
||||
l.setEndTime(timeStamp2Date(l.getEndTime(),null));
|
||||
l.setRecvTime(timeStamp2Date(l.getRecvTime(),null));
|
||||
for (CodeResult code : appCodeList) {
|
||||
/*for (CodeResult code : appCodeList) {
|
||||
Integer value3 = Integer.valueOf(code.getCode());
|
||||
if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){
|
||||
l.setAppName(code.getItem());
|
||||
@@ -124,7 +124,7 @@ public class PxyHttpManipulLogController extends BaseController{
|
||||
l.setProtocolName(code.getItem());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,8 +148,8 @@ public class PxyHttpManipulLogController extends BaseController{
|
||||
Map<String, List> dataMap = new HashMap<String, List>();
|
||||
Map<String, String> noExportMap = new HashMap<String, String>();
|
||||
// ---------------------------
|
||||
List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
|
||||
List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
|
||||
// List<CodeResult> protocolCodeList = CodeDicUtils.getCodeList("protocolCode");
|
||||
// List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
|
||||
PageLog<PxyHttpManipulationLog> page = new PageLog<PxyHttpManipulationLog>(request, response);
|
||||
page.setPageNo(1);
|
||||
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
|
||||
@@ -171,12 +171,12 @@ public class PxyHttpManipulLogController extends BaseController{
|
||||
String domain = StringEscapeUtils.unescapeHtml(log.getDomain());
|
||||
params.put("searchDomain", domain);
|
||||
}
|
||||
if (StringUtils.isNotBlank(log.getAppId())) {
|
||||
params.put("searchAppId", log.getAppId());
|
||||
}
|
||||
if (StringUtils.isNotBlank(log.getProtocolId())) {
|
||||
params.put("searchProtocolId", log.getProtocolId());
|
||||
}
|
||||
// if (StringUtils.isNotBlank(log.getAppId())) {
|
||||
// params.put("searchAppId", log.getAppId());
|
||||
// }
|
||||
// if (StringUtils.isNotBlank(log.getProtocolId())) {
|
||||
// params.put("searchProtocolId", log.getProtocolId());
|
||||
// }
|
||||
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
|
||||
model.addAttribute("serviceList", serviceList);
|
||||
|
||||
@@ -199,20 +199,20 @@ public class PxyHttpManipulLogController extends BaseController{
|
||||
l.setStartTime(timeStamp2Date(l.getStartTime(),null));
|
||||
l.setEndTime(timeStamp2Date(l.getEndTime(),null));
|
||||
l.setRecvTime(timeStamp2Date(l.getRecvTime(),null));
|
||||
for (CodeResult code : appCodeList) {
|
||||
Integer value3 = Integer.valueOf(code.getCode());
|
||||
if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){
|
||||
l.setAppName(code.getItem());
|
||||
break;
|
||||
}
|
||||
}
|
||||
for (CodeResult code : protocolCodeList) {
|
||||
Integer value3 = Integer.valueOf(code.getCode());
|
||||
if(StringUtils.isNotBlank(l.getProtocolId()) && l.getProtocolId().equals(code.getCode())){
|
||||
l.setProtocolName(code.getItem());
|
||||
break;
|
||||
}
|
||||
}
|
||||
// for (CodeResult code : appCodeList) {
|
||||
// Integer value3 = Integer.valueOf(code.getCode());
|
||||
// if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){
|
||||
// l.setAppName(code.getItem());
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// for (CodeResult code : protocolCodeList) {
|
||||
// Integer value3 = Integer.valueOf(code.getCode());
|
||||
// if(StringUtils.isNotBlank(l.getProtocolId()) && l.getProtocolId().equals(code.getCode())){
|
||||
// l.setProtocolName(code.getItem());
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
}
|
||||
String title="";
|
||||
if(log.getAction().equals(1)){//监测
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
#修改日志检索->国家代理->HTTP(S)阻断 url
|
||||
UPDATE `sys_menu` SET `href`='/log/pxy/httpBlockLists?searchAction=16' WHERE code='http_block' and href='/log/pxy/httpBlockList?searchAction=16' and permission= '';
|
||||
#修改日志检索->国家代理->HTTP(S)监测 url
|
||||
UPDATE `sys_menu` SET `href`='/log/pxy/httpMonitLists?searchAction=1' WHERE code='http_monit' and href='/log/pxy/httpMonitogs' and permission= '';
|
||||
UPDATE `sys_menu` SET `href`='/log/pxy/httpMonitLists?searchAction=1' WHERE code='http_monit' and href='/log/pxy/httpMonitogs' and permission= '';
|
||||
|
||||
#实时报表->国家代理菜单和它下面的子菜单都置为失效
|
||||
UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_block';
|
||||
UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_redirect';
|
||||
UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_replace';
|
||||
UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_monit';
|
||||
UPDATE `sys_menu` SET `del_flag`='0' WHERE `code`='Proxy' and parent_id='780';
|
||||
@@ -21,7 +21,7 @@
|
||||
.attr("value",'');
|
||||
$("#searchForm")[0].reset();
|
||||
});
|
||||
returnBack();
|
||||
// returnBack();
|
||||
//筛选功能
|
||||
filterActionInit();
|
||||
//异步获取voip相关信息
|
||||
@@ -126,8 +126,8 @@
|
||||
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
||||
<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
|
||||
<input id="action" name="action" type="hidden" value="${log.action }"/>
|
||||
<input id="apps" type="hidden" value="${log.appId}"/>
|
||||
<input id="protos" type="hidden" value="${log.protocolId}"/>
|
||||
<%-- <input id="apps" type="hidden" value="${log.appId}"/>
|
||||
<input id="protos" type="hidden" value="${log.protocolId}"/> --%>
|
||||
<input id="jboxtCustomValue" type="hidden" value="true"/>
|
||||
<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
|
||||
<!-- 筛选按钮展开状态-->
|
||||
@@ -258,7 +258,7 @@
|
||||
<input name="action" type="text" class="form-control" value="48"/>
|
||||
</div>
|
||||
</div> --%>
|
||||
<div class="col-md-2">
|
||||
<%-- <div class="col-md-2">
|
||||
<div class="form-group">
|
||||
<label class="control-label"><spring:message code='application_layer_protocol'/>：</label>
|
||||
<select id="protoSelect" name="protocolId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
|
||||
@@ -268,10 +268,8 @@
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
</div> --%>
|
||||
<div class="col-md-2">
|
||||
<div class="form-group">
|
||||
<label><spring:message code='direction'/>：</label>
|
||||
<form:select path="direction" class="selectpicker form-control">
|
||||
@@ -282,6 +280,9 @@
|
||||
</form:select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-2">
|
||||
<div class="form-group">
|
||||
<label><spring:message code='addr_type'/>：</label>
|
||||
@@ -312,14 +313,15 @@
|
||||
<input name="clientLocation" type="text" class="form-control" value="${log.clientLocation }"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<div class="form-group">
|
||||
<label><spring:message code="host"></spring:message>：</label>
|
||||
<input name="host" type="text" class="form-control" value="${log.host }"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-2">
|
||||
<div class="form-group">
|
||||
<label><spring:message code="sni"></spring:message>：</label>
|
||||
@@ -349,7 +351,7 @@
|
||||
</form:select>
|
||||
</div>
|
||||
</div> --%>
|
||||
<div class="col-md-2">
|
||||
<%-- <div class="col-md-2">
|
||||
<div class="form-group">
|
||||
<label class="control-label"><spring:message code='social_app'/>：</label>
|
||||
<select id="appSelect" name="appId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
|
||||
@@ -359,7 +361,7 @@
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div> --%>
|
||||
</div>
|
||||
<%-- <div class="row">
|
||||
<div class="col-md-2">
|
||||
@@ -406,18 +408,18 @@
|
||||
|
||||
<th class="sort-column url" column="URL"> URL </th>
|
||||
<th class="sort-column host" column="host" ><spring:message code="host"/></th>
|
||||
<th class="sort-column domain" column="domain_name" ><spring:message code="domain_name"/></th>
|
||||
<th class="sort-column domain" isVisible="false" column="domain_name" ><spring:message code="domain_name"/></th>
|
||||
<th class="sort-column category" isVisible="false" column="category" ><spring:message code="category"/></th>
|
||||
<c:if test="${fns:getUser().isAdmin()}">
|
||||
<th class="sort-column req_line" column="req_line" ><spring:message code="req_line"/></th>
|
||||
<th class="sort-column res_line" column="res_line" ><spring:message code="res_line"/></th>
|
||||
<th class="sort-column req_line" isVisible="false" column="req_line" ><spring:message code="req_line"/></th>
|
||||
<th class="sort-column res_line" isVisible="false" column="res_line" ><spring:message code="res_line"/></th>
|
||||
</c:if>
|
||||
<th class="sort-column cookie" column="PXY_CACHE_HTTP_COOKIE" ><spring:message code="PXY_CACHE_HTTP_COOKIE"/></th>
|
||||
<th class="sort-column referer" column="referer" ><spring:message code="referer"/></th>
|
||||
<th class="sort-column user_agent" column="user_agent" ><spring:message code="user_agent"/></th>
|
||||
<th class="sort-column content_len" column="content_len" ><spring:message code="content_len"/></th>
|
||||
<th class="sort-column content_type" column="content_type" ><spring:message code="content_type"/></th>
|
||||
<th class="sort-column set_cookie" column="set_cookie" ><spring:message code="set_cookie"/></th>
|
||||
<th class="sort-column cookie" isVisible="false" column="PXY_CACHE_HTTP_COOKIE" ><spring:message code="PXY_CACHE_HTTP_COOKIE"/></th>
|
||||
<th class="sort-column referer" isVisible="false" column="referer" ><spring:message code="referer"/></th>
|
||||
<th class="sort-column user_agent" isVisible="false" column="user_agent" ><spring:message code="user_agent"/></th>
|
||||
<th class="sort-column content_len" isVisible="false" column="content_len" ><spring:message code="content_len"/></th>
|
||||
<th class="sort-column content_type" isVisible="false" column="content_type" ><spring:message code="content_type"/></th>
|
||||
<th class="sort-column set_cookie" isVisible="false" column="set_cookie" ><spring:message code="set_cookie"/></th>
|
||||
<%-- <th class="sort-column req_header" column="req_header" ><spring:message code="req_header"/></th>
|
||||
<th class="sort-column resp_header" column="resp_header" ><spring:message code="resp_header"/></th> --%>
|
||||
<%-- <th class="sort-column req_body"><spring:message code="req_body"/></th>
|
||||
@@ -427,22 +429,22 @@
|
||||
<th class="sort-column cap_ip" isVisible="false" column="clj_ip" ><spring:message code="clj_ip"/></th>
|
||||
<th class="sort-column trans_proto" column="transport_layer_protocol" ><spring:message code="transport_layer_protocol"/></th>
|
||||
<th class="sort-column app_proto" column="app_proto" ><spring:message code="app_proto"/></th>
|
||||
<th class="sort-column addr_type" column="addr_type" ><spring:message code='addr_type'/></th>
|
||||
<th class="sort-column addr_type" isVisible="false" column="addr_type" ><spring:message code='addr_type'/></th>
|
||||
<th class="sort-column server_ip" column="server_ip" ><spring:message code="server_ip"/></th>
|
||||
<th class="sort-column client_ip" column="client_ip" ><spring:message code="client_ip"/></th>
|
||||
<th class="sort-column server_port" column="server_port" ><spring:message code="server_port"/></th>
|
||||
<th class="sort-column client_port" column="client_port" ><spring:message code="client_port"/></th>
|
||||
<th class="sort-column device_id" isVisible="false" column="deviceid" ><spring:message code="deviceid"/></th>
|
||||
<th class="sort-column link_id" isVisible="false" column="link_id" ><spring:message code="link_id"/></th>
|
||||
<th class="sort-column encap_type" column="encap_type" ><spring:message code="encap_type"/></th>
|
||||
<th class="sort-column direction" column="direction" ><spring:message code="direction"/></th>
|
||||
<th class="sort-column encap_type" isVisible="false" column="encap_type" ><spring:message code="encap_type"/></th>
|
||||
<th class="sort-column direction" isVisible="false" column="direction" ><spring:message code="direction"/></th>
|
||||
<%-- <th class="sort-column inner_smac" column="inner_smac" ><spring:message code="inner_smac"/></th>
|
||||
<th class="sort-column inner_dmac" column="inner_dmac" ><spring:message code="inner_dmac"/></th> --%>
|
||||
<th class="sort-column stream_dir" column="stream_type" ><spring:message code="stream_type"/></th>
|
||||
<th class="sort-column stream_dir" isVisible="false" column="stream_type" ><spring:message code="stream_type"/></th>
|
||||
|
||||
<%-- <th class="sort-column addr_list" column="nest_addr_list" ><spring:message code="nest_addr_list"/></th> --%>
|
||||
<th class="sort-column server_location" column="server_locate" ><spring:message code='server_locate'/></th>
|
||||
<th class="sort-column client_location" column="client_locate" ><spring:message code='client_locate'/></th>
|
||||
<th class="sort-column server_location" isVisible="false" column="server_locate" ><spring:message code='server_locate'/></th>
|
||||
<th class="sort-column client_location" isVisible="false" column="client_locate" ><spring:message code='client_locate'/></th>
|
||||
<th class="sort-column server_asn" isVisible="false" column="s_asn" ><spring:message code='s_asn'/></th>
|
||||
<th class="sort-column server_asn" isVisible="false" column="d_asn" ><spring:message code='d_asn'/></th>
|
||||
<th class="sort-column subscribe_id" isVisible="false" column="s_subscribe_id" ><spring:message code='s_subscribe_id'/></th>
|
||||
@@ -468,7 +470,7 @@
|
||||
<th class="sort-column ssl_client_side_version" column="ssl_client_side_version" ><spring:message code='ssl_client_side_version'/></th>
|
||||
<th class="sort-column ssl_cert_verify" column="ssl_cert_verify" ><spring:message code='ssl_cert_verify'/></th>
|
||||
<th class="sort-column stream_trace_id" isVisible="false" column="stream_trace_id" ><spring:message code='stream_trace_id'/></th>
|
||||
<th class="sort-column ssl_error" column="ssl_error" ><spring:message code='ssl_error'/></th>
|
||||
<th class="sort-column ssl_error" isVisible="false" column="ssl_error" ><spring:message code='ssl_error'/></th>
|
||||
<th class="sort-column c2s_pkt_num" isVisible="false" column="c2s_pkt_num" ><spring:message code='c2s_pkt_num'/></th>
|
||||
<th class="sort-column s2c_pkt_num" isVisible="false" column="s2c_pkt_num" ><spring:message code='s2c_pkt_num'/></th>
|
||||
<th class="sort-column c2s_byte_num" isVisible="false" column="c2s_byte_num" ><spring:message code='c2s_byte_num'/></th>
|
||||
@@ -660,8 +662,8 @@
|
||||
<td>${log.sni }</td>
|
||||
<td>${log.san }</td>
|
||||
<td>${log.cn }</td>
|
||||
<td>${log.appName }</td>
|
||||
<td>${log.protocolName }</td>
|
||||
<td>${log.appId }</td>
|
||||
<td>${log.protocolId }</td>
|
||||
<td>${log.conLatencyMs }</td>
|
||||
<td>
|
||||
<c:set var="pinningsts">${log.pinningst }</c:set>
|
||||
|
||||
Reference in New Issue
Block a user