From 3652e9fecd656543c304fece15b791a522e693f0 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 19 Jun 2018 18:31:57 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"Ssl,Pptp,L2tp=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c9dcdedd877db8c231f49a903926f90ad32f8c51 --- .project | 4 +- .settings/org.eclipse.wst.common.component | 6 +- .../java/com/nis/domain/log/NtcL2tpLog.java | 30 --- .../java/com/nis/domain/log/NtcPptpLog.java | 23 -- .../java/com/nis/domain/log/NtcSslLog.java | 37 --- .../controller/log/ntc/L2tpLogController.java | 65 ----- .../controller/log/ntc/PptpLogController.java | 65 ----- .../controller/log/ntc/SslLogController.java | 68 ----- .../resources/messages/message_en.properties | 5 - .../resources/messages/message_ru.properties | 5 - .../messages/message_zh_CN.properties | 5 - .../WEB-INF/views/log/ntc/l2tpLogList.jsp | 242 ----------------- .../WEB-INF/views/log/ntc/pptpLogList.jsp | 240 ----------------- .../WEB-INF/views/log/ntc/sslLogList.jsp | 246 ------------------ src/main/webapp/static/pages/css/dictInfo.css | 3 +- 15 files changed, 8 insertions(+), 1036 deletions(-) delete mode 100644 src/main/java/com/nis/domain/log/NtcL2tpLog.java delete mode 100644 src/main/java/com/nis/domain/log/NtcPptpLog.java delete mode 100644 src/main/java/com/nis/domain/log/NtcSslLog.java delete mode 100644 src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java delete mode 100644 src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java delete mode 100644 src/main/java/com/nis/web/controller/log/ntc/SslLogController.java delete mode 100644 src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp delete mode 100644 src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp delete mode 100644 src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp diff --git a/.project b/.project index 42c861d43..fe32f5dbf 100644 --- a/.project +++ b/.project @@ -36,12 +36,12 @@ - com.genuitec.eclipse.springframework.springbuilder + org.eclipse.m2e.core.maven2Builder - org.eclipse.m2e.core.maven2Builder + com.genuitec.eclipse.springframework.springbuilder diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index ea880c42f..02aec5565 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,12 @@ - + - + + uses + diff --git a/src/main/java/com/nis/domain/log/NtcL2tpLog.java b/src/main/java/com/nis/domain/log/NtcL2tpLog.java deleted file mode 100644 index 46df0b17a..000000000 --- a/src/main/java/com/nis/domain/log/NtcL2tpLog.java +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index afdafc7d8..000000000 --- a/src/main/java/com/nis/domain/log/NtcPptpLog.java +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 16a2480ec..000000000 --- a/src/main/java/com/nis/domain/log/NtcSslLog.java +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 0bdcae572..000000000 --- a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 5cb90bb9e..000000000 --- a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 6354759b1..000000000 --- a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java +++ /dev/null @@ -1,68 +0,0 @@ -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 63dfd59b4..45878313f 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -653,9 +653,4 @@ 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 d3ee13875..f24c9122f 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -479,9 +479,4 @@ 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 bd22f4669..6a68d2472 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -680,9 +680,4 @@ 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 deleted file mode 100644 index 237e7458e..000000000 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ /dev/null @@ -1,242 +0,0 @@ -<%@ 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 deleted file mode 100644 index 1d2927015..000000000 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ /dev/null @@ -1,240 +0,0 @@ -<%@ 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 deleted file mode 100644 index 7100f59c6..000000000 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ /dev/null @@ -1,246 +0,0 @@ -<%@ 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 04ba069b7..3c4c1c6ac 100644 --- a/src/main/webapp/static/pages/css/dictInfo.css +++ b/src/main/webapp/static/pages/css/dictInfo.css @@ -1,6 +1,7 @@ /*** sysDict serviceDict -***/ +***/ +