diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java index 7f70c4462..bbbdba844 100644 --- a/src/main/java/com/nis/domain/log/BaseLogEntity.java +++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java @@ -1,11 +1,6 @@ package com.nis.domain.log; -import java.text.ParseException; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; import com.nis.domain.BaseEntity; -import com.nis.util.DateUtils; public class BaseLogEntity extends BaseEntity { diff --git a/src/main/java/com/nis/domain/log/NtcMailLog.java b/src/main/java/com/nis/domain/log/NtcMailLog.java new file mode 100644 index 000000000..b867b3362 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcMailLog.java @@ -0,0 +1,44 @@ +package com.nis.domain.log; + +public class NtcMailLog extends BaseLogEntity { + + private static final long serialVersionUID = -2848016592975339617L; + + private String mailProto; //邮件协议类型，不可空 SMTP/POP3/IMAP4 + private String mailFrom; + private String mailTo; + private String subject; + private String emlFile; + + public String getMailProto() { + return mailProto; + } + public void setMailProto(String mailProto) { + this.mailProto = mailProto; + } + public String getMailFrom() { + return mailFrom; + } + public void setMailFrom(String mailFrom) { + this.mailFrom = mailFrom; + } + public String getMailTo() { + return mailTo; + } + public void setMailTo(String mailTo) { + this.mailTo = mailTo; + } + public String getSubject() { + return subject; + } + public void setSubject(String subject) { + this.subject = subject; + } + public String getEmlFile() { + return emlFile; + } + public void setEmlFile(String emlFile) { + this.emlFile = emlFile; + } + +} diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 31a31beb8..4b20e359b 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -299,6 +299,7 @@ public final class Constants { public static final String NTC_OPENVPN_LOG = Configurations.getStringProperty("ntcOpenvpnLog",""); public static final String NTC_IPSEC_LOG = Configurations.getStringProperty("ntcIpsecLog",""); public static final String NTC_SSH_LOG = Configurations.getStringProperty("ntcSshLog",""); + public static final String NTC_MAIL_LOG = Configurations.getStringProperty("ntcMailLog",""); //报表类型,1- 配置命中总量业务 public static final Integer BUSINESSTYPE_CONFIG=Configurations.getIntProperty("businesstype_config", 1); //报表类型,2- 配置报表业务 diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java new file mode 100644 index 000000000..2633684aa --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java @@ -0,0 +1,64 @@ +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.apache.commons.lang3.StringUtils; +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.NtcMailLog; +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/mail") +public class MailLogController extends BaseController { + + @RequestMapping("list") + public String list(@ModelAttribute("log") NtcMailLog log, Model model, HttpServletRequest request, HttpServletResponse response) { + try { + Page page = new Page(request, response); + Map params = new HashMap(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + initLogSearchValue(log, params); + + String url = Constants.LOG_BASE_URL + Constants.NTC_MAIL_LOG; + String recv = HttpClientUtil.getMsg(url, params, request); + + logger.info("查询结果:" + recv); + if (StringUtils.isNotBlank(recv)) { + Gson gson = new GsonBuilder().create(); + LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); + if (fromJson.getStatus().intValue() == 200) { + BeanUtils.copyProperties(fromJson.getData(), page); + List list = page.getList(); + for (NtcMailLog l : list) { + l.setFunctionId(log.getFunctionId()); + setLogAction(l); + } + model.addAttribute("page", page); + } + } + } catch (Exception e) { + logger.error("查询失败", e); + addMessage(model, e.getMessage()); + } + + return "/log/ntc/mailList"; + } +} diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index ac741db94..d0540c387 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -653,6 +653,11 @@ dns_query=query dns_response=response entrance=entrance #dns_sub=DNS_SUB +mail_proto=mail protocol +mail_from=sender +mail_to=receiver +subject=subject +eml_file=EML file contrl_tunnel=contrl tunnel data_tunnel=data tunnel contrl_message=contrl message diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 5a038eb3b..506e425bf 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -479,6 +479,11 @@ dns_query=query dns_response=response entrance=entrance #dns_sub=DNS_SUB +mail_proto=mail protocol +mail_from=sender +mail_to=receiver +subject=subject +eml_file=EML file contrl_tunnel=contrl tunnel data_tunnel=data tunnel contrl_message=contrl message diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 595cca3f3..e689d19e1 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -609,18 +609,13 @@ action_replace=\u66FF\u6362 <<<<<<< HEAD action_whitelist=\u767D\u540D\u5355 ======= -action_whitelist=\u767D\u540D\u5355 >>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git action_monit=\u76D1\u6D4B file_digest_control=\u6587\u4EF6\u6458\u8981\u7BA1\u63A7 bgp_control=BGP\u7BA1\u63A7 bgp_ip=bgp Ip xmpp_control=XMPP\u7BA1\u63A7 -<<<<<<< HEAD xmpp_ip=xmpp Ip -======= -xmpp_ip=xmpp Ip ->>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git #===============protocol IP Import start================= chooseFile=\u9009\u62E9\u6587\u4EF6 download=\u6A21\u677F\u4E0B\u8F7D @@ -688,6 +683,11 @@ dns_query=\u8BF7\u6C42 dns_response=\u5E94\u7B54 entrance=\u51FA\u5165\u53E3 #dns_sub=DNS_SUB +mail_proto=\u90AE\u4EF6\u534F\u8BAE +mail_from=\u53D1\u4EF6\u4EBA +mail_to=\u6536\u4EF6\u4EBA +subject=\u4E3B\u9898 +eml_file=EML\u6587\u4EF6 contrl_tunnel=\u63A7\u5236\u901A\u9053 data_tunnel=\u6570\u636E\u901A\u9053 contrl_message=\u63A7\u5236\u62A5\u6587 diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 83500b822..11b996246 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -225,7 +225,8 @@ fileUploadCfg=fileUploadSources callbackCfg=commonSources fileDigestCfg=fileDigestSources configIdSources=configPzIdSources -logBaseUrl=http://10.0.6.201:8090/galaxy/service/log/v1/ +#logBaseUrl=http://10.0.6.201:8090/galaxy/service/log/v1/ +logBaseUrl=http://10.0.6.104:8081/galaxy/service/log/v1/ ntcPzReport=ntcPzReport ntcIpLog=ntcIpLogs ntcHttpLog=ntcHttpLogs @@ -236,6 +237,7 @@ ntcL2tpLog=ntcL2tpLogs ntcOpenvpnLog=ntcOpenvpnLogs ntcIpsecLog=ntcIpsecLogs ntcSshLog=ntcSshLogs +ntcMailLog=ntcMailLogs client_connect_timeout=300000 client_read_timeout=300000 diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp new file mode 100644 index 000000000..487133e09 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -0,0 +1,246 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + MAIL<spring:message code="log"></spring:message> + + + + + +
+ +

+ MAIL + +

+
+
+
+
+
+ + + + + + + +
+
+ + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ + + +
+
+ href="javascript:;"> + + +
+
+ + + +
+
+
+
+ + + + + + + +
+
+ +
+
+ + + + + + + +
+
+ +
+
+ + + + + + + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+
+ + +
+
+ + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + +
ip
${_log.cfgId } + + ${ipType.itemValue} + + + + + ${_log.mailProto }${_log.mailFrom }${_log.mailTo }${_log.subject }${_log.emlFile }${_log.clientIp }${_log.clientPort }${_log.serverIp }${_log.serverPort } + + ${logProtocol.itemValue} + + + + + + + + + + ${_log.foundTime }${_log.recvTime } + + + + + + ${streamType.itemValue} + + ${_log.cljIp }${_log.nestAddrList }${_log.userRegion }
+
${page}
+
+
+
+
+
+ + \ No newline at end of file