From 53a70a1cf8387d58cf1f060549a567f8704e2339 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Mon, 10 Dec 2018 15:17:17 +0800
Subject: [PATCH] =?UTF-8?q?1.HTTP=E6=8A=A5=E8=A1=A8=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=85=B3=E9=94=AE=E5=AD=97=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=20=202.=E9=85=8D=E7=BD=AE=E6=9F=A5=E8=AF=A2=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/report/NtcDestIpReportController.java | 5 +++++
 .../web/controller/report/NtcEntranceReportController.java   | 5 +++++
 .../nis/web/controller/report/NtcLwhhReportController.java   | 4 ++++
 .../controller/report/NtcSrcipDomesticReportController.java  | 5 +++++
 .../nis/web/controller/report/NtcTagReportController.java    | 4 ++++
 .../com/nis/web/controller/report/NtcXzReportController.java | 4 ++++
 .../jquery-validation/1.11.0/localization/messages_en.js     | 2 +-
 .../jquery-validation/1.11.0/localization/messages_zh.js     | 2 +-
 8 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
index eadd99357..803396dbe 100644
--- a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
@@ -39,6 +39,11 @@ public class NtcDestIpReportController extends BaseController {
 			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
+			// HTTP报表 +关键字业务
+			if(bean.getFunctionId() == 8){
+				serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+			}
+
 			for(int i=0;i<serviceList.size();i++){
 				if(i==0){
 					serviceId.append(serviceList.get(i).getServiceId().toString());
diff --git a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
index c197a2e2a..b80f003ee 100644
--- a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
@@ -38,6 +38,11 @@ public class NtcEntranceReportController extends BaseController {
 			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
+			// HTTP报表 +关键字业务
+			if(bean.getFunctionId() == 8){
+				serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+			}
+
 			for(int i=0;i<serviceList.size();i++){
 				if(i==0){
 					serviceId.append(serviceList.get(i).getServiceId().toString());
diff --git a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
index 6e834403f..20d1e69d3 100644
--- a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
@@ -40,6 +40,10 @@ public class NtcLwhhReportController extends BaseController {
 			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
+			// HTTP报表 +关键字业务
+			if(bean.getFunctionId() == 8){
+				serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+			}
 			for(int i=0;i<serviceList.size();i++){
 				if(i==0){
 					serviceId.append(serviceList.get(i).getServiceId().toString());
diff --git a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
index 433f917e6..44e4de428 100644
--- a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
@@ -38,6 +38,11 @@ public class NtcSrcipDomesticReportController extends BaseController {
 			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
+			// HTTP报表 +关键字业务
+			if(bean.getFunctionId() == 8){
+				serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+			}
+
 			for(int i=0;i<serviceList.size();i++){
 				if(i==0){
 					serviceId.append(serviceList.get(i).getServiceId().toString());
diff --git a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
index 6af37d2a9..dea59dea0 100644
--- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
@@ -40,6 +40,10 @@ public class NtcTagReportController extends BaseController {
 			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
+			// HTTP报表 +关键字业务
+			if(bean.getFunctionId() == 8){
+				serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+			}
 			for(int i=0;i<serviceList.size();i++){
 				if(i==0){
 					serviceId.append(serviceList.get(i).getServiceId().toString());
diff --git a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
index 5fc865c0f..3e26dc80d 100644
--- a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
@@ -41,6 +41,10 @@ public class NtcXzReportController extends BaseController {
 			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
+			// HTTP报表 +关键字业务
+			if(bean.getFunctionId() == 8){
+				serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+			}
 			for(int i=0;i<serviceList.size();i++){
 				if(i==0){
 					serviceId.append(serviceList.get(i).getServiceId().toString());
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
index 0dd053f91..9f863e35b 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -69,7 +69,7 @@
 		haveInvisibleChar:"The tags {0} have invisible character",
 		httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
 		failed:"Failed",
-		go_back:"Go Back Policies",
+		go_back:"Return",
 		log_5_minutes:"Log For The Last Five Minutes",
 		log_1_hour:"Log For The Last Hour",
 		input:"Please Enter  ",
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
index 5eefd79b3..b074395cc 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -69,7 +69,7 @@
 		haveInvisibleChar:"标签{0}包含不可见字符",
 		httpCheck:"请输入正确的url(http[s]://xxx.xx)",
 		failed:"获取失败",
-		go_back:"返回配置界面",
+		go_back:"返回",
 		log_5_minutes:"5分钟日志量",
 		log_1_hour:"1小时日志量",
 		input:"请输入 ",