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

日志检索->流量日志->SSL泛收 移除界面展示配置ID和动作列,导出移除配置ID和动作

Browse Source
This commit is contained in:
李皓宸
2019-01-18 10:25:06 +08:00
parent bb688add0b
commit 82bbd7667a
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
View File

@@ -60,6 +60,7 @@ public class SslRecordLogController extends BaseController {
try { try {
// 请求接口 // 请求接口
String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_RECORD_LOG; String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_RECORD_LOG;
// String url="http://192.168.11.198:8080/galaxy-service/service/log/v1/ntcSslRecordLogs";
String resJson = HttpClientUtil.getMsg(url, params, request); String resJson = HttpClientUtil.getMsg(url, params, request);
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
LogRecvData<NtcSslRecordLog> fromJson = gson.fromJson(resJson, LogRecvData<NtcSslRecordLog> fromJson = gson.fromJson(resJson,
@@ -114,6 +115,7 @@ public class SslRecordLogController extends BaseController {
model.addAttribute("serviceList", serviceList); model.addAttribute("serviceList", serviceList);
String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_RECORD_LOG; String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_RECORD_LOG;
// String url="http://192.168.11.198:8080/galaxy-service/service/log/v1/ntcSslRecordLogs";
String recv = HttpClientUtil.getMsg(url, params, request); String recv = HttpClientUtil.getMsg(url, params, request);
if (StringUtils.isNotBlank(recv)) { if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
@@ -137,7 +139,7 @@ public class SslRecordLogController extends BaseController {
} else { } else {
hColumns += ","; hColumns += ",";
} }
String cfgIndexInfoNoExport = "," + hColumns; String cfgIndexInfoNoExport = ",action,cfg_id," + hColumns;
noExportMap.put("ssl_record", cfgIndexInfoNoExport); noExportMap.put("ssl_record", cfgIndexInfoNoExport);
dataMap.put("ssl_record", list); dataMap.put("ssl_record", list);
String timeRange = initLogMap(log, "ssl_record"); String timeRange = initLogMap(log, "ssl_record");

24
src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
View File

@@ -244,8 +244,8 @@
<thead> <thead>
<tr> <tr>
<th><spring:message code="log"/></th> <th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" column="cfg_id"><spring:message code="cfg_id"/></th> <%-- <th class="sort-column cfg_id " isVisible="false" column="cfg_id"><spring:message code="cfg_id"/></th> --%>
<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th> <%-- <th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th> --%>
<th class="sort-column found_time" column="found_time"><spring:message code="found_time"/></th> <th class="sort-column found_time" column="found_time"><spring:message code="found_time"/></th>
<th class="sort-column recv_time" isVisible="false" column="recv_time"><spring:message code="recv_time"/></th> <th class="sort-column recv_time" isVisible="false" column="recv_time"><spring:message code="recv_time"/></th>
<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th> <th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
@@ -290,16 +290,16 @@
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span> --%> <%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span> --%>
<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/website/ajaxSslSubList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a> <a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/website/ajaxSslSubList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
</td> </td>
<td>${log.cfgId }</td> <%-- <td>${log.cfgId }</td> --%>
<td> <!-- <td> -->
<c:set var="actions">${log.action }</c:set> <%-- <c:set var="actions">${log.action }</c:set> --%>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict"> <%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict"> --%>
<c:if test="${dict.itemCode eq log.action}"> <%-- <c:if test="${dict.itemCode eq log.action}"> --%>
<c:set var="actions">${dict.itemValue}</c:set> <%-- <c:set var="actions">${dict.itemValue}</c:set> --%>
</c:if> <%-- </c:if> --%>
</c:forEach> <%-- </c:forEach> --%>
<spring:message code="${actions}"/> <%-- <spring:message code="${actions}"/> --%>
</td> <!-- </td> -->
<td>${log.foundTime }</td> <td>${log.foundTime }</td>
<td>${log.recvTime }</td> <td>${log.recvTime }</td>