diff --git a/src/main/java/com/nis/domain/log/MmFileDigestLog.java b/src/main/java/com/nis/domain/log/MmFileDigestLog.java new file mode 100644 index 000000000..e9c896b73 --- /dev/null +++ b/src/main/java/com/nis/domain/log/MmFileDigestLog.java @@ -0,0 +1,70 @@ +package com.nis.domain.log; + +import com.wordnik.swagger.annotations.ApiModelProperty; + +/** + * @ClassName:MmFileDigestLog + * @author (wx) + * @date 2018年7月16日 下午2:54:23 + * @version V1.0 + */ +public class MmFileDigestLog extends BaseLogEntity { + + private static final long serialVersionUID = -6177790560553329386L; + @ApiModelProperty(value="节目ID", required=true) + protected String pid; + @ApiModelProperty(value="节目访问地址", required=true) + protected String url; + @ApiModelProperty(value="封堵现场片段路径", required=true) + protected String logUri; + @ApiModelProperty(value="入口页面", required=true) + protected String referer; + @ApiModelProperty(value="有害级别", required=true) + protected Integer level; + @ApiModelProperty(value="封堵类型", required=true) + protected Integer fdType; + @ApiModelProperty(value="协议", required=true) + protected String protocol; + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getLogUri() { + return logUri; + } + public void setLogUri(String logUri) { + this.logUri = logUri; + } + public String getReferer() { + return referer; + } + public void setReferer(String referer) { + this.referer = referer; + } + public Integer getLevel() { + return level; + } + public void setLevel(Integer level) { + this.level = level; + } + public Integer getFdType() { + return fdType; + } + public void setFdType(Integer fdType) { + this.fdType = fdType; + } + public String getProtocol() { + return protocol; + } + public void setProtocol(String protocol) { + this.protocol = protocol; + } +} diff --git a/src/main/java/com/nis/domain/log/NtcBGPLog.java b/src/main/java/com/nis/domain/log/NtcBGPLog.java new file mode 100644 index 000000000..785d76219 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcBGPLog.java @@ -0,0 +1,28 @@ +package com.nis.domain.log; + +public class NtcBGPLog extends BaseLogEntity { + + private static final long serialVersionUID = 4597407682545926823L; + private Integer type; + private String as; + private String route; + public Integer getType() { + return type; + } + public void setType(Integer type) { + this.type = type; + } + public String getAs() { + return as; + } + public void setAs(String as) { + this.as = as; + } + public String getRoute() { + return route; + } + public void setRoute(String route) { + this.route = route; + } + +} diff --git a/src/main/java/com/nis/domain/log/NtcIpLog.java b/src/main/java/com/nis/domain/log/NtcIpLog.java index a3eb3bfde..c8d5b8983 100644 --- a/src/main/java/com/nis/domain/log/NtcIpLog.java +++ b/src/main/java/com/nis/domain/log/NtcIpLog.java @@ -3,5 +3,4 @@ package com.nis.domain.log; public class NtcIpLog extends BaseLogEntity { private static final long serialVersionUID = 4597407682545926823L; - } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index b4cb584ec..0ed1cbe7d 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -415,6 +415,7 @@ public final class Constants { public static final String NTC_MMVOIP_LOG = Configurations.getStringProperty("mmVoipLog", ""); public static final String NTC_MMSAMPLE_VOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", ""); public static final String NTC_MMAVIP_LOG = Configurations.getStringProperty("mmAvIpLog", ""); + public static final String NTC_MMFILEDIGEST_LOG = Configurations.getStringProperty("mmFileDigestLog", ""); public static final String NTC_MMPORNAUDIOSAMPLE_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", ""); public static final String NTC_MMPORNVIDEOSAMPLE_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", ""); public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", ""); diff --git a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java index 0fb1daed2..b34fbab6e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java @@ -1,7 +1,5 @@ package com.nis.web.controller.log.ntc; -import java.io.File; -import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -10,23 +8,18 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.aspectj.util.FileUtil; -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 org.springframework.web.bind.annotation.ResponseBody; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; -import com.nis.domain.Page; import com.nis.domain.PageLog; -import com.nis.domain.log.NtcIpLog; +import com.nis.domain.log.NtcBGPLog; import com.nis.domain.maat.LogRecvData; -import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.httpclient.HttpClientUtil; @@ -37,9 +30,9 @@ import com.nis.web.controller.BaseController; public class BgpLogController extends BaseController { @RequestMapping(value = {"list", ""}) - public String list(@ModelAttribute("log") NtcIpLog log, Model model, HttpServletRequest request, HttpServletResponse response) { + public String list(@ModelAttribute("log") NtcBGPLog log, Model model, HttpServletRequest request, HttpServletResponse response) { try { - PageLog page = new PageLog(request, response); + PageLog page = new PageLog(request, response); Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); @@ -55,11 +48,11 @@ public class BgpLogController extends BaseController { logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); - LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); + LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { page.setList(fromJson.getData().getList()); - List list = page.getList(); - for (NtcIpLog l : list) { + List list = page.getList(); + for (NtcBGPLog l : list) { l.setFunctionId(log.getFunctionId()); setLogAction(l,serviceList); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java new file mode 100644 index 000000000..8f0152036 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java @@ -0,0 +1,85 @@ +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.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.FunctionServiceDict; +import com.nis.domain.Page; +import com.nis.domain.PageLog; +import com.nis.domain.log.MmFileDigestLog; +import com.nis.domain.maat.LogRecvData; +import com.nis.util.Constants; +import com.nis.util.DictUtils; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmFileDigestLogs") +public class MmFileDigestLogController extends BaseController{ + + /** + * 音视频url日志 + * @param model + * @param entry + * @param request + * @param response + * @return + * @throws ClientProtocolException + * @throws IOException + */ + @RequestMapping(value={"list",""}) + public String list(Model model,@ModelAttribute("log")MmFileDigestLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { + + try { + + PageLog page = new PageLog(request, response); + Map params=new HashMap<>(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + //查询值判断 + initLogSearchValue(entry,params); + + List serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); + model.addAttribute("serviceList", serviceList); + + String url = ""; + url = Constants.LOG_BASE_URL+Constants.NTC_MMFILEDIGEST_LOG; + String jsonString = HttpClientUtil.getMsg(url,params,request); + + Gson gson = new GsonBuilder().create(); + //gson泛型支持 + LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + + if (fromJson.getStatus().intValue() == 200) { + Page data = fromJson.getData(); + page.setList(data.getList()); + List list = page.getList(); + for (MmFileDigestLog l : list) { + l.setFunctionId(entry.getFunctionId()); + setLogAction(l,serviceList); + } + model.addAttribute("page", page); + logger.info("查询文件摘要日志成功"); + } + } catch (Exception e) { + logger.error("查询文件摘要日志失败", e); + addMessageLog(model, e.getMessage()); + } + return "/log/ntc/mmFileDigestList"; + } + +} diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 6138724c4..0f9cc8897 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1196,4 +1196,7 @@ snat_ip_complex_loop=SNAT Complex Loop snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop snat_policy=SNAT Reuse Policy -dnat_policy=DNAT Reuse Policy \ No newline at end of file +dnat_policy=DNAT Reuse Policy +message_type=Message Type +as=AS +route=Route \ 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 9b12d3b99..362b49b43 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1197,3 +1197,6 @@ dnat_ip_complex_loop=DNAT Complex Loop snat_ip_complex_loop=SNAT Complex Loop snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop +message_type=\u6D88\u606F\u7C7B\u578B +as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7 +route=\u8DEF\u7531\u4FE1\u606F \ 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 5a1669eb9..f4d0a485c 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1191,3 +1191,6 @@ dnat_complex_loop=DNAT IP\u590D\u7528\u56DE\u6D41 ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41 snat_policy=SNAT\u590D\u7528\u7B56\u7565 dnat_policy=DNAT\u590D\u7528\u7B56\u7565 +message_type=\u6D88\u606F\u7C7B\u578B +as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7 +route=\u8DEF\u7531\u4FE1\u606F \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 5c40f348d..734a94d30 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -219,14 +219,14 @@ clusterBStartTime=1503504000725 isCommit=true ############################################################################################################################################ ############################################################################################################################################ -httpUrl=http://10.0.6.242:8080/galaxy/service/cfg/v1/ +httpUrl=http://192.168.10.204:7777/galaxy/service/cfg/v1/ maatCfg=configSources fileUploadCfg=fileUploadSources callbackCfg=commonSources fileDigestCfg=fileDigestSources configIdSources=configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ -logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ +logBaseUrl=http://192.168.10.204:7777/galaxy/service/log/v1/ ntcPzReport=ntcPzReport ntcServiceReport=ntcServiceReport ntcTagReport=ntcTagReport @@ -270,7 +270,7 @@ mmLogoDetectionLog=mmLogoDetectionLogs mmFaceRecognizationLog=mmFaceRecognizationLogs ######################################## #\u5927\u5C4F\u56FE\u8868\u5C55\u793A\u670D\u52A1\u63A5\u53E3 -dashboardUrl=http://10.0.6.101:8080/galaxy/service/log/v1/ +dashboardUrl=http://192.168.10.204:7777/galaxy/service/log/v1/ trafficIpActive=trafficIpActive trafficProtocol=trafficProtocol trafficApp=trafficApp @@ -523,4 +523,5 @@ log_time_range=3600000 log_time_start=2018-08-01 00:00:00 log_time_end=2018-10-01 00:00:00 area_tag=location -isp_tag=isp \ No newline at end of file +isp_tag=isp +mmFileDigestLog=mmFileDigestLogs \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index 3a08da89e..9836888c7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -189,6 +189,9 @@ + + + @@ -245,7 +248,9 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.sceneFile} + ${log.type} + ${log.as} + ${log.route} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp new file mode 100644 index 000000000..b8f5cf02e --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -0,0 +1,304 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+ +

+ +

+
+
+
+
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ + <%--
+
+ + + + + + + +
+
--%> +
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ + +
+
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + +<%-- --%> +<%-- --%> + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + + <%-- + --%> + + <%-- --%> + + + + + + + + + + +
${log.cfgId } + + + + + + ${log.foundTime} + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + + + + + http://${fn:substring(log.logUri,0,20) } + + + + ${log.referer} + ${log.level} + + + + ${log.protocol}${fns:abbr(log.capIp, 42)}${log.transProto} + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort}${log.deviceId} + + + + + + + + + ${log.addrList} + ${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+
${page}
+
+
+
+
+
+ +