gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志查询错误时统一分类提示信息

Browse Source
This commit is contained in:
zhanghongqing
2018-08-03 10:59:20 +08:00
parent e70ca37255
commit 09d7ecfabc
31 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/util/httpclient/HttpClientUtil.java
View File

@@ -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);

16
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -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消息

2
src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/AppLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
View File

@@ -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";

4
src/main/java/com/nis/web/controller/log/ntc/IpLogController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java
View File

@@ -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";

4
src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/ntc/SshLogController.java
View File

@@ -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";
}

2
src/main/java/com/nis/web/controller/log/ntc/SslLogController.java
View File

@@ -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";

2
src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java
View File

@@ -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";

3
src/main/resources/messages/message_en.properties
View File

@@ -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

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -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