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

修改日志openvpn页面搜索栏显示，增加日志ssh，ipsec列表展示

Browse Source
This commit is contained in:
zhanghongqing
2018-06-14 15:40:58 +08:00
parent 30c6d43130
commit 45fc0f8cf1
9 changed files with 1315 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/java/com/nis/web/controller/log/ntc/IpsecController.java Normal file
View File

@@ -0,0 +1,79 @@
package com.nis.web.controller.log.ntc;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.Page;
import com.nis.domain.log.NtcIpsecLog;
import com.nis.domain.log.NtcIpsecLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@Controller
@RequestMapping(value = "${adminPath}/log/ntc/ntcIpsecLogs")
public class IpsecController extends BaseController{
/**
* @param model
* @param entry
* @param request
* @param response
* @return
* @throws ClientProtocolException
* @throws Exception
*/
@RequestMapping(value={"list",""})
public String list(Model model,@ModelAttribute("log")NtcIpsecLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
try {
Page<NtcIpsecLog> page = new Page<NtcIpsecLog>(request, response);
Map<String, Object> params=new HashMap<>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
//查询值判断
initLogSearchValue(entry,params);
String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_IPSEC_LOG;
String jsonString = HttpClientUtil.getMsg(url,params);
Gson gson = new GsonBuilder().create();
//gson泛型支持
LogRecvData<NtcIpsecLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcIpsecLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
BeanUtils.copyProperties(fromJson.getData(), page);
List<NtcIpsecLog> list = page.getList();
for (NtcIpsecLog l : list) {
l.setFunctionId(entry.getFunctionId());
setLogAction(l);
}
model.addAttribute("page", page);
logger.info("查询Ipsec日志成功");
}
} catch (Exception e) {
logger.info("查询Ipsec日志失败");
e.printStackTrace();
}
return "/log/ntc/ipsecList";
}
}

23
src/main/java/com/nis/web/controller/log/ntc/OpenVpnController.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.controller.log.ntc;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -10,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,10 +20,9 @@ import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.Page;
import com.nis.domain.log.NtcOpenVpnLog;
import com.nis.domain.log.NtcOpenVpnLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -44,8 +43,6 @@ public class OpenVpnController extends BaseController{
public String list(Model model,@ModelAttribute("log")NtcOpenVpnLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
try {
//初始化action
initLogServiceType(model, entry);
Page<NtcOpenVpnLog> page = new Page<NtcOpenVpnLog>(request, response);
Map<String, Object> params=new HashMap<>();
@@ -62,12 +59,16 @@ public class OpenVpnController extends BaseController{
//gson泛型支持
LogRecvData<NtcOpenVpnLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcOpenVpnLog>>(){}.getType());
Page<NtcOpenVpnLog> data = fromJson.getData();
List<NtcOpenVpnLog> list = data.getList();
page.setList(list);
page.setCount(data.getCount());
model.addAttribute("page", page);
logger.info("查询OpenVpn日志成功");
if (fromJson.getStatus().intValue() == 200) {
BeanUtils.copyProperties(fromJson.getData(), page);
List<NtcOpenVpnLog> list = page.getList();
for (NtcOpenVpnLog l : list) {
l.setFunctionId(entry.getFunctionId());
setLogAction(l);
}
model.addAttribute("page", page);
logger.info("查询OpenVpn日志成功");
}
} catch (Exception e) {
logger.info("查询OpenVpn日志失败");
e.printStackTrace();

79
src/main/java/com/nis/web/controller/log/ntc/SshController.java Normal file
View File

@@ -0,0 +1,79 @@
package com.nis.web.controller.log.ntc;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.Page;
import com.nis.domain.log.NtcSshLog;
import com.nis.domain.log.NtcSshLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@Controller
@RequestMapping(value = "${adminPath}/log/ntc/ntcSshLogs")
public class SshController extends BaseController{
/**
* @param model
* @param entry
* @param request
* @param response
* @return
* @throws ClientProtocolException
* @throws Exception
*/
@RequestMapping(value={"list",""})
public String list(Model model,@ModelAttribute("log")NtcSshLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
try {
Page<NtcSshLog> page = new Page<NtcSshLog>(request, response);
Map<String, Object> params=new HashMap<>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
//查询值判断
initLogSearchValue(entry,params);
String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_SSH_LOG;
String jsonString = HttpClientUtil.getMsg(url,params);
Gson gson = new GsonBuilder().create();
//gson泛型支持
LogRecvData<NtcSshLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcSshLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
BeanUtils.copyProperties(fromJson.getData(), page);
List<NtcSshLog> list = page.getList();
for (NtcSshLog l : list) {
l.setFunctionId(entry.getFunctionId());
setLogAction(l);
}
model.addAttribute("page", page);
logger.info("查询Ssh日志成功");
}
} catch (Exception e) {
logger.info("查询Ssh日志失败");
e.printStackTrace();
}
return "/log/ntc/sshList";
}
}