1.日志检索->国家代理->HTTP(S) 界面 原始请求体和原始应答体 列数据 增加点击下载功能
2.实时报表->流量统计->流量统计和协议统计 界面 "方向"查询条件增加"请选择"选项(默认)
(cherry picked from commit ee411339c8)
This commit is contained in:
@@ -271,7 +271,10 @@ public class TrafficStatisticsInfoController extends BaseController {
|
|||||||
try {
|
try {
|
||||||
url=urlAddDate(url,beginDate,endDate);
|
url=urlAddDate(url,beginDate,endDate);
|
||||||
url=url+"&searchQuotaType="+searchQuotaType;
|
url=url+"&searchQuotaType="+searchQuotaType;
|
||||||
url=url+"&searchDirection="+searchDirection;
|
|
||||||
|
if (!StringUtil.isEmpty(searchDirection)) {
|
||||||
|
url=url+"&searchDirection="+searchDirection;
|
||||||
|
}
|
||||||
String string = HttpClientUtil.get(url);
|
String string = HttpClientUtil.get(url);
|
||||||
Gson gson = new GsonBuilder().create();
|
Gson gson = new GsonBuilder().create();
|
||||||
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
|
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
|
||||||
@@ -321,7 +324,9 @@ public class TrafficStatisticsInfoController extends BaseController {
|
|||||||
if(entranceId!=null){
|
if(entranceId!=null){
|
||||||
url=url+"&entranceId="+entranceId;
|
url=url+"&entranceId="+entranceId;
|
||||||
}
|
}
|
||||||
url=url+"&searchDirection="+searchDirection;
|
if (!StringUtil.isEmpty(searchDirection)) {
|
||||||
|
url=url+"&searchDirection="+searchDirection;
|
||||||
|
}
|
||||||
String string = HttpClientUtil.get(url);
|
String string = HttpClientUtil.get(url);
|
||||||
Gson gson = new GsonBuilder().create();
|
Gson gson = new GsonBuilder().create();
|
||||||
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
|
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<%-- <label class="control-label"><spring:message code="direction"/>:</label> --%>
|
<%-- <label class="control-label"><spring:message code="direction"/>:</label> --%>
|
||||||
<select id="searchDirection" name="searchDirection" class="selectpicker select2 input-small">
|
<select id="searchDirection" name="searchDirection" class="selectpicker select2 input-small">
|
||||||
|
<option value=""><spring:message code="select"/></option>
|
||||||
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
|
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
|
||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${direction.itemCode == searchDirection}">
|
<c:when test="${direction.itemCode == searchDirection}">
|
||||||
|
|||||||
@@ -79,6 +79,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<%-- <label class="control-label"><spring:message code="direction"/>:</label> --%>
|
<%-- <label class="control-label"><spring:message code="direction"/>:</label> --%>
|
||||||
<select id="searchDirection" name="searchDirection" class="selectpicker select2 input-small">
|
<select id="searchDirection" name="searchDirection" class="selectpicker select2 input-small">
|
||||||
|
<option value=""><spring:message code="select"/></option>
|
||||||
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
|
<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
|
||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${direction.itemCode == searchDirection}">
|
<c:when test="${direction.itemCode == searchDirection}">
|
||||||
|
|||||||
@@ -408,8 +408,37 @@
|
|||||||
<td>${log.dSubscribeId}</td>
|
<td>${log.dSubscribeId}</td>
|
||||||
<%-- <td>${log.userRegion}</td> --%>
|
<%-- <td>${log.userRegion}</td> --%>
|
||||||
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
|
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
|
||||||
<td>${log.reqBody}</td>
|
<%-- <td><a href="C:/Users/A.Chen/Pictures/Saved Pictures/F3DEAE35-290A-4C7B-B306-2C7E495AE614.PNG" download="w3logo.jpg">${log.reqBody}</a></td> --%>
|
||||||
<td>${log.respBody}</td>
|
<%-- <td><a href="C:/Users/A.Chen/Pictures/Saved Pictures/F3DEAE35-290A-4C7B-B306-2C7E495AE614.PNG" download="w3logo.jpg">${log.respBody}</a></td> --%>
|
||||||
|
<td>
|
||||||
|
<c:if test="${fn:startsWith(log.reqBody, 'http')}">
|
||||||
|
<a href="${log.reqBody}" data-original-title="${log.reqBody}" target="_blank"
|
||||||
|
class="tooltips" data-flag="false" data-html="true" data-placement="top">
|
||||||
|
${fn:substring(log.reqBody,0,20) }
|
||||||
|
</a>
|
||||||
|
</c:if>
|
||||||
|
<c:if test="${!fn:startsWith(log.reqBody, 'http') and !empty log.reqBody}">
|
||||||
|
<a href="http://${log.reqBody}" data-original-title="http://${log.reqBody}" target="_blank"
|
||||||
|
class="tooltips" data-flag="false" data-html="true" data-placement="top">
|
||||||
|
http://${fn:substring(log.reqBody,0,20) }
|
||||||
|
</a>
|
||||||
|
</c:if>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<c:if test="${fn:startsWith(log.respBody, 'http')}">
|
||||||
|
<a href="${log.respBody}" data-original-title="${log.respBody}" target="_blank"
|
||||||
|
class="tooltips" data-flag="false" data-html="true" data-placement="top">
|
||||||
|
${fn:substring(log.respBody,0,20) }
|
||||||
|
</a>
|
||||||
|
</c:if>
|
||||||
|
<c:if test="${!fn:startsWith(log.respBody, 'http') and !empty log.respBody}">
|
||||||
|
<a href="http://${log.respBody}" data-original-title="http://${log.respBody}" target="_blank"
|
||||||
|
class="tooltips" data-flag="false" data-html="true" data-placement="top">
|
||||||
|
http://${fn:substring(log.respBody,0,20) }
|
||||||
|
</a>
|
||||||
|
</c:if>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
Reference in New Issue
Block a user