From 82bbd7667a7b05e84933de654dfc84fca9fd42b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Fri, 18 Jan 2019 10:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E6=97=A5=E5=BF=97->SSL=E6=B3=9B=E6=94=B6=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?ID=E5=92=8C=E5=8A=A8=E4=BD=9C=E5=88=97,=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=85=8D=E7=BD=AEID=E5=92=8C=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/ntc/SslRecordLogController.java       |  4 +++-
 .../views/log/ntc/sslRecordLogList.jsp        | 24 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
index f2b9d7b44..45340fb17 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
@@ -60,6 +60,7 @@ public class SslRecordLogController extends BaseController {
 		try {
 			// 请求接口
 			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);
 			Gson gson = new GsonBuilder().create();
 			LogRecvData<NtcSslRecordLog> fromJson = gson.fromJson(resJson,
@@ -114,6 +115,7 @@ public class SslRecordLogController extends BaseController {
 			model.addAttribute("serviceList", serviceList);
 
 			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);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
@@ -137,7 +139,7 @@ public class SslRecordLogController extends BaseController {
 			} else {
 				hColumns += ",";
 			}
-			String cfgIndexInfoNoExport = "," + hColumns;
+			String cfgIndexInfoNoExport = ",action,cfg_id," + hColumns;
 			noExportMap.put("ssl_record", cfgIndexInfoNoExport);
 			dataMap.put("ssl_record", list);
 			String timeRange = initLogMap(log, "ssl_record");
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
index c9d19e33b..90cdd01e4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
@@ -244,8 +244,8 @@
 						<thead>
 							<tr>
 								<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 service" isVisible="false" column="action"><spring:message code="action"/></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 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 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> --%>
 										<a href="javascript:void(0)" name="viewLogInfo"  url="${ctx}/ntc/website/ajaxSslSubList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
-									<td>${log.cfgId }</td>
-									<td>
-										<c:set var="actions">${log.action }</c:set>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
-												<c:set var="actions">${dict.itemValue}</c:set>
-											</c:if>
-										</c:forEach>
-										<spring:message code="${actions}"/>
-									</td>
+<%-- 									<td>${log.cfgId }</td> --%>
+<!-- 									<td> -->
+<%-- 										<c:set var="actions">${log.action }</c:set> --%>
+<%-- 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict"> --%>
+<%-- 											<c:if test="${dict.itemCode eq log.action}"> --%>
+<%-- 												<c:set var="actions">${dict.itemValue}</c:set> --%>
+<%-- 											</c:if> --%>
+<%-- 										</c:forEach> --%>
+<%-- 										<spring:message code="${actions}"/> --%>
+<!-- 									</td> -->
 
 									<td>${log.foundTime }</td>
 									<td>${log.recvTime }</td>