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

修改日志ddos拆分为两个日志

Browse Source
This commit is contained in:
zhanghongqing
2018-10-15 11:12:00 +08:00
parent 6880363d9a
commit e75c540e74
7 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/domain/log/NtcDdosLog.java
View File

@@ -26,7 +26,7 @@ public class NtcDdosLog extends BaseLogEntity<NtcDdosLog> {
@ApiModelProperty(value = "攻击累积字节数", required = true) @ApiModelProperty(value = "攻击累积字节数", required = true)
protected String attackTotalByte; protected String attackTotalByte;
@ApiModelProperty(value = "攻击流量是否被丢弃", required = true) @ApiModelProperty(value = "攻击流量是否被丢弃", required = true)
protected Integer isBlcok; protected Integer isBlock;
public Integer getAttackType() { public Integer getAttackType() {
@@ -71,11 +71,11 @@ public class NtcDdosLog extends BaseLogEntity<NtcDdosLog> {
public void setAttackTotalByte(String attackTotalByte) { public void setAttackTotalByte(String attackTotalByte) {
this.attackTotalByte = attackTotalByte; this.attackTotalByte = attackTotalByte;
} }
public Integer getIsBlcok() { public Integer getIsBlock() {
return isBlcok; return isBlock;
} }
public void setIsBlcok(Integer isBlcok) { public void setIsBlock(Integer isBlock) {
this.isBlcok = isBlcok; this.isBlock = isBlock;
} }
} }

3
src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
View File

@@ -57,6 +57,9 @@ public class DdosLogController extends BaseController{
Map<String, Object> params=new HashMap<>(); Map<String, Object> params=new HashMap<>();
params.put("pageSize", page.getPageSize()); params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo()); params.put("pageNo", page.getPageNo());
if(entry!=null&&entry.getIsBlock()!=null) {
params.put("searchIsBlock", entry.getIsBlock());
}
//查询值判断 //查询值判断
initLogSearchValue(entry,params); initLogSearchValue(entry,params);

4
src/main/resources/messages/message_en.properties
View File

@@ -1237,4 +1237,6 @@ log_user=Operating User
log_submission=Submission log_submission=Submission
log_ip=Operator IP log_ip=Operator IP
log_exception_info=Exception Information log_exception_info=Exception Information
system_log=Log Management system_log=Log Management
protected_ddos=Protected DDOS
usual_ddos=Usual DDOS

4
src/main/resources/messages/message_ru.properties
View File

@@ -1216,7 +1216,7 @@ protocol_identify=Protocol Identify
NTC_ASN_IP=ASN NTC_ASN_IP=ASN
MM_FILE_DIGEST=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442\u0430 \u0424\u0430\u0439\u043b\u043e\u0432 MM_FILE_DIGEST=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442\u0430 \u0424\u0430\u0439\u043b\u043e\u0432
NTC_STREAMING_MEDIA_URL=Streaming Media URL NTC_STREAMING_MEDIA_URL=Streaming Media URL
NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442 NTC_VOIP_ACCOUNT=VoIP \u0410\u043a\u043a\u0430\u0443\u043d\u0442
export_failed=Export Failed export_failed=Export Failed
user_manage=Client Account Manage user_manage=Client Account Manage
ip_reuse_policy_object=IP Reuse Policy Object ip_reuse_policy_object=IP Reuse Policy Object
@@ -1249,3 +1249,5 @@ ip_addr=IP
area_id=Area area_id=Area
link_num=Link Number link_num=Link Number
stat_time=Statistical Time stat_time=Statistical Time
protected_ddos=Protected DDOS
usual_ddos=Usual DDOS

4
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1230,4 +1230,6 @@ log_exception=\u53EA\u67E5\u8BE2\u5F02\u5E38\u4FE1\u606F
log_user=\u64CD\u4F5C\u7528\u6237 log_user=\u64CD\u4F5C\u7528\u6237
log_submission=\u63D0\u4EA4\u65B9\u5F0F log_submission=\u63D0\u4EA4\u65B9\u5F0F
log_ip=\u64CD\u4F5C\u8005IP log_ip=\u64CD\u4F5C\u8005IP
log_exception_info=\u5F02\u5E38\u4FE1\u606F log_exception_info=\u5F02\u5E38\u4FE1\u606F
protected_ddos=\u4FDD\u62A4DDOS\u653B\u51FB
usual_ddos=\u5E38\u7528DDOS\u653B\u51FB

3
src/main/resources/sql/20181015/update_sys_menu.sql Normal file
View File

@@ -0,0 +1,3 @@
INSERT INTO `sys_menu` VALUES ('1138', '801', '0,1,152,801,', 'protected_ddos', '保护ddos攻击', '10', '/log/ntc/ntcDdosLogs/list?isBlock=1', '', '', '1', '', '1', '2018-09-17 16:38:57', '1', '2018-09-17 16:38:57', '', '0', null, '0', '0', '301');
INSERT INTO `sys_menu` VALUES ('1139', '801', '0,1,152,801,', 'usual_ddos', '常用ddos攻击', '20', '/log/ntc/ntcDdosLogs/list?isBlock=0', '', '', '1', '', '1', '2018-09-17 16:38:57', '1', '2018-09-17 16:38:57', '', '0', null, '0', '0', '305');
UPDATE sys_menu set href='',function_id=null where id=801;

36
src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
View File

@@ -31,7 +31,8 @@ $(document).ready(function(){
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
<spring:message code="target_ip_protect"/> <c:if test="${log.isBlock eq 1 }"><spring:message code="protected_ddos"/></c:if>
<c:if test="${log.isBlock eq 0 }"><spring:message code="usual_ddos"/></c:if>
</h3> </h3>
<h5 class="page-header"></h5> <h5 class="page-header"></h5>
@@ -44,6 +45,7 @@ $(document).ready(function(){
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/> <input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/> <input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
<input id="isBlock" name="isBlock" type="hidden" value="${log.isBlock}"/>
<!-- 筛选按钮展开状态--> <!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/> <input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
@@ -89,7 +91,7 @@ $(document).ready(function(){
<div class="row"> <div class="row">
<div class="col-md-2 hidden"> <div class="col-md-2 hidden">
<div class="form-group"> <div class="form-group">
<label><spring:message code="transport_layer_protocol"/>：</label> <label><spring:message code="protocol_type"/>：</label>
<c:set var="select"><spring:message code='select'/></c:set> <c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" > <form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option> <form:option value=""><spring:message code="select"/></form:option>
@@ -167,23 +169,23 @@ $(document).ready(function(){
<th><spring:message code='last_attack_time'/></th> <th><spring:message code='last_attack_time'/></th>
<th><spring:message code='attack_max_pps'/></th> <th><spring:message code='attack_max_pps'/></th>
<th><spring:message code='attack_max_bps'/></th> <th><spring:message code='attack_max_bps'/></th>
<th><spring:message code='attack_total_pkt'/></th> <%-- <th><spring:message code='attack_total_pkt'/></th> --%>
<th><spring:message code='attack_total_byte'/></th> <%-- <th><spring:message code='attack_total_byte'/></th> --%>
<th><spring:message code='is_blcok'/></th> <%-- <th><spring:message code='is_blcok'/></th> --%>
<th><spring:message code='clj_ip'/></th> <th><spring:message code='clj_ip'/></th>
<th><spring:message code='transport_layer_protocol'/></th> <th><spring:message code='protocol'/></th>
<th><spring:message code='addr_type'/></th> <th><spring:message code='addr_type'/></th>
<th><spring:message code='serverip'/></th> <th><spring:message code='serverip'/></th>
<th><spring:message code='clientip'/></th> <%-- <th><spring:message code='clientip'/></th> --%>
<th><spring:message code='serverport'/></th> <th><spring:message code='serverport'/></th>
<th><spring:message code='clientport'/></th> <%-- <th><spring:message code='clientport'/></th> --%>
<th><spring:message code='deviceid'/></th> <th><spring:message code='deviceid'/></th>
<th><spring:message code='direct'/></th> <th><spring:message code='direct'/></th>
<th><spring:message code='stream_type'/></th> <th><spring:message code='stream_type'/></th>
<%-- <th><spring:message code='nest_addr_list'/></th> --%> <%-- <th><spring:message code='nest_addr_list'/></th> --%>
<th><spring:message code='server_locate'/></th> <th><spring:message code='server_locate'/></th>
<th><spring:message code='client_locate'/></th> <%-- <th><spring:message code='client_locate'/></th> --%>
<th><spring:message code='s_asn'/></th> <th><spring:message code='s_asn'/></th>
<th><spring:message code='d_asn'/></th> <th><spring:message code='d_asn'/></th>
<th><spring:message code='s_subscribe_id'/></th> <th><spring:message code='s_subscribe_id'/></th>
@@ -222,13 +224,13 @@ $(document).ready(function(){
<td><fmt:formatDate value="${log.lastAttackTime}" pattern="yyyy-MM-dd HH:mm:ss" /></td> <td><fmt:formatDate value="${log.lastAttackTime}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
<td>${log.attackMaxPps}</td> <td>${log.attackMaxPps}</td>
<td>${log.attackMaxBps}</td> <td>${log.attackMaxBps}</td>
<td>${log.attackTotalPkt}</td> <%-- <td>${log.attackTotalPkt}</td> --%>
<td>${log.attackTotalByte}</td> <%-- <td>${log.attackTotalByte}</td> --%>
<td> <%-- <td>
<c:forEach items="${fns:getDictList('SYS_YES_NO')}" var="dic"> <c:forEach items="${fns:getDictList('SYS_YES_NO')}" var="dic">
<c:if test="${dic.itemCode eq log.isBlcok}"><spring:message code="${dic.itemValue}"/></c:if> <c:if test="${dic.itemCode eq log.isBlock}"><spring:message code="${dic.itemValue}"/></c:if>
</c:forEach> </c:forEach>
</td> </td> --%>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td> <td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td>${log.transProto}</td> <td>${log.transProto}</td>
<td> <td>
@@ -237,9 +239,9 @@ $(document).ready(function(){
</c:forEach> </c:forEach>
</td> </td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td> <td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <%-- <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> --%>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <%-- <td>${log.sPort}</td> --%>
<td> <td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="device"> <c:forEach items="${fns:getDictList('DEVICE')}" var="device">
<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if> <c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
@@ -259,7 +261,7 @@ $(document).ready(function(){
<%-- ${fns:stringFormat(log.addrList,30)} --%> <%-- ${fns:stringFormat(log.addrList,30)} --%>
<!-- </td> --> <!-- </td> -->
<td>${log.serverLocate}</td> <td>${log.serverLocate}</td>
<td>${log.clientLocate}</td> <%-- <td>${log.clientLocate}</td> --%>
<td>${log.sAsn}</td> <td>${log.sAsn}</td>
<td>${log.dAsn}</td> <td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td> <td>${log.sSubscribeId}</td>