diff --git a/.project b/.project index fe32f5dbf..42c861d43 100644 --- a/.project +++ b/.project @@ -36,12 +36,12 @@ - org.eclipse.m2e.core.maven2Builder + com.genuitec.eclipse.springframework.springbuilder - com.genuitec.eclipse.springframework.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 02aec5565..ea880c42f 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,12 +1,10 @@ - + + - - uses - diff --git a/src/main/java/com/nis/domain/log/NtcL2tpLog.java b/src/main/java/com/nis/domain/log/NtcL2tpLog.java new file mode 100644 index 000000000..46df0b17a --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcL2tpLog.java @@ -0,0 +1,30 @@ +package com.nis.domain.log; + +public class NtcL2tpLog extends BaseLogEntity { + + private static final long serialVersionUID = -3547128625966615793L; + + private Integer tunnelType;// 通道类型 + private Integer encryptMode;// 加密方式 + private String chapName; // 用户名称 + + public String getChapName() { + return chapName; + } + public void setChapName(String chapName) { + this.chapName = chapName; + } + public Integer getTunnelType() { + return tunnelType; + } + public void setTunnelType(Integer tunnelType) { + this.tunnelType = tunnelType; + } + public Integer getEncryptMode() { + return encryptMode; + } + public void setEncryptMode(Integer encryptMode) { + this.encryptMode = encryptMode; + } + +} diff --git a/src/main/java/com/nis/domain/log/NtcPptpLog.java b/src/main/java/com/nis/domain/log/NtcPptpLog.java new file mode 100644 index 000000000..afdafc7d8 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcPptpLog.java @@ -0,0 +1,23 @@ +package com.nis.domain.log; + +public class NtcPptpLog extends BaseLogEntity { + + private static final long serialVersionUID = 6527360739786343374L; + + private Integer tunnelType;// 通道类型 + private Integer encryptMode;// 加密方式 + + public Integer getTunnelType() { + return tunnelType; + } + public void setTunnelType(Integer tunnelType) { + this.tunnelType = tunnelType; + } + public Integer getEncryptMode() { + return encryptMode; + } + public void setEncryptMode(Integer encryptMode) { + this.encryptMode = encryptMode; + } + +} diff --git a/src/main/java/com/nis/domain/log/NtcSslLog.java b/src/main/java/com/nis/domain/log/NtcSslLog.java new file mode 100644 index 000000000..16a2480ec --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcSslLog.java @@ -0,0 +1,37 @@ +package com.nis.domain.log; + +public class NtcSslLog extends BaseLogEntity{ + + private static final long serialVersionUID = 533266057780162781L; + + private String version;// 版本号 + private String sni;// SNI + private String san;// SAN + private String ca;// CA + + public String getVersion() { + return version; + } + public void setVersion(String version) { + this.version = version; + } + public String getSni() { + return sni; + } + public void setSni(String sni) { + this.sni = sni; + } + public String getSan() { + return san; + } + public void setSan(String san) { + this.san = san; + } + public String getCa() { + return ca; + } + public void setCa(String ca) { + this.ca = ca; + } +} + diff --git a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java new file mode 100644 index 000000000..0bdcae572 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java @@ -0,0 +1,65 @@ +package com.nis.web.controller.log.ntc; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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.JsonSyntaxException; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.Page; +import com.nis.domain.log.NtcL2tpLog; +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("${adminPath}/log/ntc/l2tpLogs") +public class L2tpLogController extends BaseController { + + @RequestMapping(value = {"/list"}) + public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")NtcL2tpLog ntcL2tpLog) { + + Page page = new Page(request,response); + Map params = new HashMap(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + + // 请求参数判断 + initLogSearchValue(ntcL2tpLog, params); + + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_L2TP_LOG; + String resJson = HttpClientUtil.getMsg(url, params); + Gson gson = new GsonBuilder().create(); + LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); + if(fromJson.getStatus().intValue() == 200) { + Page fromPage = fromJson.getData(); + BeanUtils.copyProperties(fromPage, page); + List list = fromPage.getList(); + for (NtcL2tpLog log : list) { + log.setFunctionId(ntcL2tpLog.getFunctionId()); + setLogAction(log); + } + model.addAttribute("page", page); + } + } catch (JsonSyntaxException e) { + logger.info("L2TP日志查询失败"); + e.printStackTrace(); + } + + return "/log/ntc/l2tpLogList"; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java new file mode 100644 index 000000000..5cb90bb9e --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java @@ -0,0 +1,65 @@ +package com.nis.web.controller.log.ntc; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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.JsonSyntaxException; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.Page; +import com.nis.domain.log.NtcPptpLog; +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("${adminPath}/log/ntc/pptpLogs") +public class PptpLogController extends BaseController { + + @RequestMapping(value = {"/list"}) + public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")NtcPptpLog ntcPptpLog) { + + Page page = new Page(request,response); + Map params = new HashMap(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + + // 请求参数判断 + initLogSearchValue(ntcPptpLog, params); + + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_PPTP_LOG; + String resJson = HttpClientUtil.getMsg(url, params); + Gson gson = new GsonBuilder().create(); + LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); + if(fromJson.getStatus().intValue() == 200) { + Page fromPage = fromJson.getData(); + BeanUtils.copyProperties(fromPage, page); + List list = fromPage.getList(); + for (NtcPptpLog log : list) { + log.setFunctionId(ntcPptpLog.getFunctionId()); + setLogAction(log); + } + model.addAttribute("page", page); + } + } catch (JsonSyntaxException e) { + logger.info("PPTP日志查询失败"); + e.printStackTrace(); + } + + return "/log/ntc/pptpLogList"; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java new file mode 100644 index 000000000..6354759b1 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java @@ -0,0 +1,68 @@ +package com.nis.web.controller.log.ntc; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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.JsonSyntaxException; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.Page; +import com.nis.domain.log.NtcSslLog; +import com.nis.domain.maat.LogRecvData; +import com.nis.util.Constants; +import com.nis.util.StringUtils; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping("${adminPath}/log/ntc/sslLogs") +public class SslLogController extends BaseController { + + @RequestMapping(value = {"/list"}) + public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")NtcSslLog ntcSslLog) { + + Page page = new Page(request,response); + Map params = new HashMap(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + + // 请求参数判断 + initLogSearchValue(ntcSslLog, params); + if(StringUtils.isNotBlank(ntcSslLog.getSni())) { + params.put("SearchSni", ntcSslLog.getSni()); + } + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_LOG; + String resJson = HttpClientUtil.getMsg(url, params); + Gson gson = new GsonBuilder().create(); + LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); + if(fromJson.getStatus().intValue() == 200) { + Page fromPage = fromJson.getData(); + BeanUtils.copyProperties(fromPage, page); + List list = fromPage.getList(); + for (NtcSslLog log : list) { + log.setFunctionId(ntcSslLog.getFunctionId()); + setLogAction(log); + } + model.addAttribute("page", page); + } + } catch (JsonSyntaxException e) { + logger.info("SSL日志查询失败"); + e.printStackTrace(); + } + + return "/log/ntc/sslLogList"; + } +} diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 45878313f..63dfd59b4 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -653,4 +653,9 @@ dns_query=query dns_response=response entrance=entrance #dns_sub=DNS_SUB +contrl_tunnel=contrl tunnel +data_tunnel=data tunnel +contrl_message=contrl message +data_message=data message +user_name=user name #===========log end ============= \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index f24c9122f..d3ee13875 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -479,4 +479,9 @@ dns_query=query dns_response=response entrance=entrance #dns_sub=DNS_SUB +contrl_tunnel=contrl tunnel +data_tunnel=data tunnel +contrl_message=contrl message +data_message=data message +user_name=user name #===========log end ============= \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 6a68d2472..bd22f4669 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -680,4 +680,9 @@ dns_query=\u8BF7\u6C42 dns_response=\u5E94\u7B54 entrance=\u51FA\u5165\u53E3 #dns_sub=DNS_SUB +contrl_tunnel=\u63A7\u5236\u901A\u9053 +data_tunnel=\u6570\u636E\u901A\u9053 +contrl_message=\u63A7\u5236\u62A5\u6587 +data_message=\u6570\u636E\u62A5\u6587 +user_name=\u7528\u6237\u540D\u79F0 #===========log end ============= \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp new file mode 100644 index 000000000..237e7458e --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -0,0 +1,242 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + + + +
+

+ L2TP + +

+
+
+
+
+ +
+ +
+ + + + + + + + +
+
+ + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + +
+
+
+ + + +
+ +
+ + href="javascript:;"> + +
+
+ + + +
+
+
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${log.cfgId}${log.entranceId} + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + ${log.serverIp}${log.clientIp}${log.serverPort}${log.clientPort}${log.deviceId} + + + + ${log.cljIp}${log.nestAddrList}${log.userRegion} + + + + 其它 + IPSEC + 无 + ${log.chapName}
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp new file mode 100644 index 000000000..1d2927015 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -0,0 +1,240 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + + + +
+

+ PPTP + +

+
+
+
+
+ +
+ +
+ + + + + + + + +
+
+ + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + +
+
+
+ + + +
+ +
+ + href="javascript:;"> + +
+
+ + + +
+
+
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${log.cfgId}${log.entranceId} + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + ${log.serverIp}${log.clientIp}${log.serverPort}${log.clientPort}${log.deviceId} + + + + ${log.cljIp}${log.nestAddrList}${log.userRegion} + + + + MMPEIPSEC + PAPCHAP + MS-CHAP(v1/v2)EAP-TLS +
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp new file mode 100644 index 000000000..7100f59c6 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -0,0 +1,246 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + + + +
+

+ SSL + +

+
+
+
+
+ +
+ +
+ + + + + + + + +
+
+ + + + + +
+
+
+
+ SNI +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + +
+
+
+ + + +
+ +
+ + href="javascript:;"> + +
+
+ + + +
+
+
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SNISANCA
${log.cfgId}${log.entranceId} + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + ${log.serverIp}${log.clientIp}${log.serverPort}${log.clientPort}${log.deviceId} + + + + ${log.cljIp}${log.nestAddrList}${log.userRegion}${log.version}${log.sni}${log.san}${log.ca}
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/static/pages/css/dictInfo.css b/src/main/webapp/static/pages/css/dictInfo.css index 3c4c1c6ac..04ba069b7 100644 --- a/src/main/webapp/static/pages/css/dictInfo.css +++ b/src/main/webapp/static/pages/css/dictInfo.css @@ -1,7 +1,6 @@ /*** sysDict serviceDict -***/ - +***/