diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index b83460f6d..414651c79 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -13,8 +13,10 @@ import java.net.SocketTimeoutException; import java.net.URI; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import javax.servlet.http.HttpServletRequest; @@ -38,7 +40,9 @@ import org.apache.http.util.EntityUtils; import org.apache.log4j.Logger; import org.springframework.web.servlet.support.RequestContext; +import com.alibaba.fastjson.JSON; import com.nis.exceptions.MaatConvertException; +import com.nis.util.Encodes; /** * @ClassName: HttpClientBean.java @@ -147,6 +151,8 @@ public class HttpClientUtil { int status = response.getStatusLine().getStatusCode(); if (status == HttpStatus.SC_OK) { result = EntityUtils.toString(response.getEntity()); + //调用处理数据方法 + result = galaxyMessageFormat(result); logger.debug("获取消息成功，相应内容如下： " + result); } else { @@ -174,6 +180,50 @@ public class HttpClientUtil { } return result; } + + /** + * 将接口的日志数据格式化包括 “null”,日期为“0”,特殊字符转义 + * @param recv + * @return + */ + public static String galaxyMessageFormat(String recv){ + Map parse = JSON.parseObject(recv,Map.class); + Map map = (Map) parse.get("data"); + List reslist=new ArrayList(); + List> list= (List)map.get("list"); + if(list!=null&&list.size()>0){ + for (Map m : list) { + Map recvMap = new HashMap(); + Iterator> iterator = m.entrySet().iterator(); + while(iterator.hasNext()){ + Entry next = iterator.next(); + String key = next.getKey().toString(); + Object value = next.getValue(); + //处理字段为“null”情况 + if(value!=null&&"null".equals(value)){ + value=""; + } + //处理时间字段为“0”情况 + if("foundTime".equals(key)||"recvTime".equals(key)){ + if(null!=value&&"0".equals(value)){ + value=""; + } + } + //处理特殊字符转义问题 + if(null!=value){ + value = Encodes.escapeHtml(value.toString()); + } + recvMap.put(key, value); + } + reslist.add(recvMap); + } + map.put("list", reslist); + parse.put("data", map); + recv = JSON.toJSONString(parse); + } + return recv; +} + private static CloseableHttpClient httpClient = null; private static RequestConfig requestConfig; public static final int HTTP_SOCKET_TIMEOUT= 300000; diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 2cb47ee0a..469d3ce8c 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -730,7 +730,7 @@ attack_type=\u653B\u51FB\u7C7B\u578B attack_start_time=\u653B\u51FB\u8D77\u59CB\u65F6\u95F4 last_attack_time=\u6700\u540E\u4E00\u6B21\u653B\u51FB\u5305\u65F6\u95F4 attack_max_pps=\u653B\u51FB\u6700\u5927\u6D41\u91CF \u5305\u6570/\u79D2 -attack_max_bps=\u653B\u51FB\u6700\u5927\u6D41\u91CF bit\u6570/\u79D2 +attack_max_bps=\u653B\u51FB\u6700\u5927\u6D41\u91CF Bit\u6570/\u79D2 attack_total_pkt=\u653B\u51FB\u7D2F\u79EF\u5305\u6570 attack_total_byte=\u653B\u51FB\u7D2F\u79EF\u5B57\u8282\u6570 is_blcok=\u653B\u51FB\u6D41\u91CF\u662F\u5426\u88AB\u4E22\u5F03 @@ -741,18 +741,18 @@ c2s_pkt_num=c2s\u5305\u6570 s2c_pkt_num=s2c\u5305\u6570 c2s_byte_num=c2s\u5B57\u8282\u6570 s2c_byte_num=s2c\u5B57\u8282\u6570 -voip_recv_time=VOIP\u63A5\u6536\u65F6\u95F4 -voip_protocol=VOIP\u4F20\u8F93\u534F\u8BAE +voip_recv_time=VoIP\u63A5\u6536\u65F6\u95F4 +voip_protocol=VoIP\u4F20\u8F93\u534F\u8BAE av_protocol=\u97F3\u89C6\u9891\u4F20\u8F93\u534F\u8BAE -duation=VOIP\u901A\u8BDD\u65F6\u957F\uFF08\u79D2\uFF09 -calling_account=\u4E3B\u53EBVOIP\u8D26\u53F7 -called_account=\u88AB\u53EBVOIP\u8D26\u53F7 -calling_number=VOIP\u4E3B\u53EB\u7535\u4FE1\u53F7\u7801 -called_number=VOIP\u88AB\u53EB\u7535\u4FE1\u53F7\u7801 -from_to_store_ip=\u4E3B\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP -from_to_store_url=\u4E3B\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL -to_from_store_ip=\u88AB\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP -to_from_store_url=\u88AB\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL +duation=VoIP\u901A\u8BDD\u65F6\u957F\uFF08\u79D2\uFF09 +calling_account=\u4E3B\u53EBVoIP\u8D26\u53F7 +called_account=\u88AB\u53EBVoIP\u8D26\u53F7 +calling_number=VoIP\u4E3B\u53EB\u7535\u4FE1\u53F7\u7801 +called_number=VoIP\u88AB\u53EB\u7535\u4FE1\u53F7\u7801 +from_to_store_ip=\u4E3B\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP +from_to_store_url=\u4E3B\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL +to_from_store_ip=\u88AB\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP +to_from_store_url=\u88AB\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL pid=\u8282\u76EEID log_uri=\u5C01\u5835\u73B0\u573A\u7247\u6BB5\u8DEF\u5F84 fd_type=\u5C01\u5835\u7C7B\u578B diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 27250acdf..4a2ed7d31 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -52,7 +52,7 @@ work.notify.remind.interval=60000 #============================# #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e -productName=National Firewall System +productName=National Traffic Control System copyrightYear=2015 version=V1.0.0 diff --git a/src/main/resources/sql/字典修改记录.txt b/src/main/resources/sql/字典修改记录.txt index 5be3532a9..a8b991713 100644 --- a/src/main/resources/sql/字典修改记录.txt +++ b/src/main/resources/sql/字典修改记录.txt @@ -1,2 +1,5 @@ 2018-07-30 -޸ֵLOG_STREAM_TYPEʶ012Ϊ123 \ No newline at end of file +\u4FEE\u6539\u5B57\u5178LOG_STREAM_TYPE\uFF0C\u5C06\u6807\u8BC60\u30011\u30012\u6539\u4E3A1\u30012\u30013 + +2018-08-03 +\u589E\u52A0\u5B57\u5178ATTACK_TYPE\uFF0C\u4F9D\u636E\u534F\u8BAE\u7EDF\u8BA1\u5DF2\u6709\u7C7B\u578B \uFF1AUDP-Flood: 1069 \uFF0CSYN-Flood: 1070 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp index 76e97a4bc..0032e71d5 100644 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ b/src/main/webapp/WEB-INF/include/header.jsp @@ -33,6 +33,10 @@ + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index bffb47116..dee80271b 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -194,7 +194,7 @@ window.onresize=function(){