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

增加ip payload日志，与ip spoofing日志调用相同接口

Browse Source
This commit is contained in:
zhangwei
2018-12-29 17:55:35 +06:00
parent 95185070c6
commit 2b82aa1fd4
8 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
View File

@@ -25,6 +25,7 @@ import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.SysUser;
import com.nis.domain.log.DkBehaviorLog;
import com.nis.domain.log.MmVoipLog;
import com.nis.domain.log.NtcCollectRadiusLog;
import com.nis.domain.log.NtcOpenVpnLog;
@@ -32,6 +33,7 @@ import com.nis.domain.log.NtcOpenVpnLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -56,14 +58,20 @@ public class OpenVpnLogController extends BaseController{
PageLog<NtcOpenVpnLog> page = new PageLog<NtcOpenVpnLog>(request, response);
Map<String, Object> params=new HashMap<>();
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
model.addAttribute("serviceList", serviceList);
if(StringUtil.isEmpty(entry.getAction())){
for(int i=0;i<serviceList.size();i++){
entry.setAction(serviceList.get(i).getAction());
break;
}
}
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
//查询值判断
initLogSearchValue(entry,params);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
model.addAttribute("serviceList", serviceList);
String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_OPENVPN_LOG;
//url = Constants.LOG_BASE_URL+Constants.NTC_IP_LOG;
@@ -104,6 +112,15 @@ public class OpenVpnLogController extends BaseController{
Map<String, String> noExportMap=new HashMap<String, String>();
//---------------------------
PageLog<NtcOpenVpnLog> page = new PageLog<NtcOpenVpnLog>(request, response);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
model.addAttribute("serviceList", serviceList);
if(StringUtil.isEmpty(log.getAction())){
for(int i=0;i<serviceList.size();i++){
log.setAction(serviceList.get(i).getAction());
break;
}
}
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Map<String, Object> params = new HashMap<String, Object>();
@@ -121,6 +138,10 @@ public class OpenVpnLogController extends BaseController{
Page<NtcOpenVpnLog> data = fromJson.getData();
list= data.getList();
}
for (NtcOpenVpnLog l : list) {
l.setFunctionId(log.getFunctionId());
setLogAction(l, serviceList);
}
}
titleList.add("spoofing_ip_policy");
classMap.put("spoofing_ip_policy", NtcOpenVpnLog.class);