diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index 4097dfe72..b83460f6d 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -148,8 +148,9 @@ public class HttpClientUtil { if (status == HttpStatus.SC_OK) { result = EntityUtils.toString(response.getEntity()); logger.debug("获取消息成功，相应内容如下： " + result); + } else { - throw new MaatConvertException(requestContext.getMessage("request_service_failed") + ":" + status); + throw new MaatConvertException(status+""); } } catch (SocketTimeoutException e) { logger.error("获取消息失败 ", e); diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index dc18ac3f1..ab78fb03c 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -240,6 +240,22 @@ public class BaseController { } model.addAttribute("message", sb.toString()); } + /** + * 添加Model消息 日志用 + * @param message + */ + protected void addMessageLog(Model model, String status) { + //status 接口状态码 + String messages="search_error"; + if(null!=status){ + if("400".equals(status)){ + messages="data_format_error"; + }else if("500".equals(status)){ + messages="server_internal_error"; + } + } + model.addAttribute("message",messages); + } /** * 添加Flash消息 diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java index d00252141..eba500da8 100644 --- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java +++ b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java @@ -71,7 +71,7 @@ public class DkBehaviorLogController extends BaseController{ } } catch (Exception e) { logger.info("查询行为识别日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/manipulation/dkBehaviorList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java b/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java index 61eb410fa..240a4ca22 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java @@ -72,7 +72,7 @@ public class AppLogController extends BaseController{ } } catch (Exception e) { logger.info("查询App日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/appList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java index 273d30052..61cfeca8a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java @@ -87,7 +87,7 @@ public class DdosLogController extends BaseController{ } } catch (Exception e) { logger.info("查询Ddos日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/ddosList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java index 4e210b82a..78cbdceef 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java @@ -61,7 +61,7 @@ public class DnsLogController extends BaseController { } } catch (Exception e) { logger.error("查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/dnsList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java index f0d58a1df..673c2fcb0 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java @@ -74,7 +74,7 @@ public class FtpLogController extends BaseController{ } } catch (Exception e) { logger.info("查询Ftp日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/ftpList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java index 564ae00e3..fde832adc 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java @@ -60,7 +60,7 @@ public class HttpLogController extends BaseController { } } catch (Exception e) { logger.error("查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/httpList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java index 69ae01ce4..a48e850b0 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java @@ -63,7 +63,7 @@ public class IpLogController extends BaseController { } } catch (Exception e) { logger.error("查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/ipList"; @@ -96,7 +96,7 @@ public class IpLogController extends BaseController { } } catch (Exception e) { logger.error("查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/ipList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java index 6aea93390..6446eb7f6 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java @@ -72,7 +72,7 @@ public class IpsecLogController extends BaseController{ } } catch (Exception e) { logger.info("查询Ipsec日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/ipsecList"; } 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 index 4bcd7ff70..88ab1640e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java @@ -58,7 +58,7 @@ public class L2tpLogController extends BaseController { } } catch (Exception e) { logger.info("L2TP日志查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/l2tpLogList"; 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 index 774276ea0..3518bea06 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java @@ -57,7 +57,7 @@ public class MailLogController extends BaseController { } } catch (Exception e) { logger.error("查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mailList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java index 2dcece69a..6980acc71 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java @@ -72,7 +72,7 @@ public class MmAvIpLogController extends BaseController{ } } catch (Exception e) { logger.info("查询音视频IP日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmAvIpList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java index b91815b52..df0313a36 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java @@ -72,7 +72,7 @@ public class MmAvUrlLogController extends BaseController{ } } catch (Exception e) { logger.info("查询音视频url日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmAvUrlList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java index 6438ae830..997174f64 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java @@ -57,7 +57,7 @@ public class MmPicIpLogController extends BaseController { } } catch (Exception e) { logger.info("音视频图片IP日志查询失败！", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmPicIpList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java index 72e8b177d..433fa290c 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java @@ -57,7 +57,7 @@ public class MmPicUrlController extends BaseController{ } } catch (Exception e) { logger.info("音视频图片URL日志查询失败！", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmPicUrlList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java index 4eac13a5c..154088bb9 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java @@ -59,7 +59,7 @@ public class MmPornAvSampleController extends BaseController { } } catch (Exception e) { logger.info("查询音频色情样例日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmPornAudioSampleList"; } @@ -97,7 +97,7 @@ public class MmPornAvSampleController extends BaseController { } } catch (Exception e) { logger.info("查询视频色情样例日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmPornVideoSampleList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java index 4851a72e5..f805cdf44 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java @@ -57,7 +57,7 @@ public class MmSampleAudioController extends BaseController{ } } catch (Exception e) { logger.info("音频样例日志查询失败！", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmSampleAudioList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java index de0ef49b9..fcb6d58cb 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java @@ -57,7 +57,7 @@ public class MmSamplePicController extends BaseController{ } } catch (Exception e) { logger.info("图片样例日志查询失败！", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmSamplePicList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java index f7c929ca1..82c6b2fa4 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java @@ -57,7 +57,7 @@ public class MmSampleVideoController extends BaseController{ } } catch (Exception e) { logger.info("视频样例日志查询失败！", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmSampleVideoList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java index ee64d254a..ba144132a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java @@ -64,7 +64,7 @@ public class MmSampleVoipLogController extends BaseController { } } catch (Exception e) { logger.info("查询Voip日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmSampleVoipList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java index 2ad4de5f4..75126b45f 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java @@ -71,7 +71,7 @@ public class MmVoipAccountLogController extends BaseController{ } } catch (Exception e) { logger.info("查询mmVoipAccount日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmVoipAccountList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java index ac56131eb..a195a070a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java @@ -71,7 +71,7 @@ public class MmVoipIpLogController extends BaseController{ } } catch (Exception e) { logger.info("查询VoipIp日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmVoipIpList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java index e2c5ec0ea..afaf43574 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java @@ -71,7 +71,7 @@ public class MmVoipLogController extends BaseController{ } } catch (Exception e) { logger.info("查询Voip日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/mmVoipList"; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java index f2fe61f73..4a46cf389 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java @@ -73,7 +73,7 @@ public class OpenVpnLogController extends BaseController{ } } catch (Exception e) { logger.info("查询OpenVpn日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/openVpnList"; } 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 index 663c6989d..d7b22fc29 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java @@ -58,7 +58,7 @@ public class PptpLogController extends BaseController { } } catch (Exception e) { logger.info("PPTP日志查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/pptpLogList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java index 23ba125c8..ee1337027 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java @@ -73,7 +73,7 @@ public class SshLogController extends BaseController{ } } catch (Exception e) { logger.info("查询Ssh日志失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/sshList"; } 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 index 980e5fed9..267e7e562 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java @@ -61,7 +61,7 @@ public class SslLogController extends BaseController { } } catch (Exception e) { logger.info("SSL日志查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/ntc/sslLogList"; diff --git a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java index 6bf1c60be..163aed5d1 100644 --- a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java +++ b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java @@ -60,7 +60,7 @@ public class PxyHttpLogController extends BaseController { } catch (Exception e) { logger.error("查询失败", e); - addMessage(model, e.getMessage()); + addMessageLog(model, e.getMessage()); } return "/log/pxy/pxyHttpList"; diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 26f981a3e..2f2987225 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -759,6 +759,9 @@ refer=Refer black_block_list=Active Block Black List static_cfg_block=Static Cfg Block first_hit=First Hit +search_error=Search Error +data_format_error=Data Format Error +server_internal_error=Server Internal Error #===========log end ============= #=============about proxy========= intercept_policy=Intercept Policy diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index f8fdddc85..2cb47ee0a 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -761,6 +761,9 @@ refer=\u5165\u53E3\u9875\u9762 black_block_list=\u52A8\u6001\u9ED1\u540D\u5355\u5C01\u5835 static_cfg_block=\u9759\u6001\u914D\u7F6E\u5C01\u5835 first_hit=\u9996\u6B21\u5206\u6790\u547D\u4E2D +search_error=\u67E5\u8BE2\u9519\u8BEF +data_format_error=\u6570\u636E\u683C\u5F0F\u9519\u8BEF +server_internal_error=\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF #===========log end ============= #=============about proxy========= intercept_policy=\u62E6\u622A\u7B56\u7565