1.业务配置-协议-HTTP-Advanced添加URL关键字查询条件 2.日志检索-国家代理模块导出列顺序修改

This commit is contained in:
shangguanyanfei
2019-01-13 11:18:51 +08:00
parent 3c48c80e76
commit 119fa7abad
3 changed files with 7 additions and 6 deletions

View File

@@ -24,15 +24,15 @@ public class PxyHttpLog extends BaseLogEntity<NtcIpLog> {
private String contentType; private String contentType;
@ExcelField(title="set_cookie",sort=16) @ExcelField(title="set_cookie",sort=16)
private String setCookie; private String setCookie;
// @ExcelField(title="req_header",sort=17) @ExcelField(title="req_header",sort=17)
private String reqHeader; private String reqHeader;
// @ExcelField(title="resp_header",sort=18) @ExcelField(title="resp_header",sort=18)
private String respHeader; private String respHeader;
@ExcelField(title="req_body",sort=17) @ExcelField(title="req_body",sort=78)
private String reqBody; private String reqBody;
@ExcelField(title="resp_body",sort=18) @ExcelField(title="resp_body",sort=79)
private String resBody; private String resBody;
@ExcelField(title="website",sort=19) @ExcelField(title="website",sort=8)
private String website; private String website;

View File

@@ -175,7 +175,7 @@ public class PxyHttpLogController extends BaseController {
} else { } else {
hColumns += ","; hColumns += ",";
} }
String cfgIndexInfoNoExport = ",inner_smac,inner_dmac,nest_addr_list," + hColumns; String cfgIndexInfoNoExport = ",req_header,resp_header,inner_smac,inner_dmac,nest_addr_list," + hColumns;
noExportMap.put(pxyName, cfgIndexInfoNoExport); noExportMap.put(pxyName, cfgIndexInfoNoExport);
dataMap.put(pxyName, list); dataMap.put(pxyName, list);
String timeRange= initLogMap(log,pxyName); String timeRange= initLogMap(log,pxyName);

View File

@@ -318,6 +318,7 @@
<c:if test="${cfg.functionId eq 8}"> <c:if test="${cfg.functionId eq 8}">
<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option> <form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option> <form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
<form:option value="httpUrl.cfgKeywords">URL&nbsp;<spring:message code="key_word"></spring:message></form:option>
<form:option value="httpReqHdr.cfgKeywords"><spring:message code="http_req_hdr_keywords"></spring:message></form:option> <form:option value="httpReqHdr.cfgKeywords"><spring:message code="http_req_hdr_keywords"></spring:message></form:option>
</c:if> </c:if>
<form:option value="httpReqBody.cfgKeywords"><spring:message code="http_req_body_keywords"></spring:message></form:option> <form:option value="httpReqBody.cfgKeywords"><spring:message code="http_req_body_keywords"></spring:message></form:option>