From 1eaf3fb4c6548e42c96549c2ce34d7b3df14755b Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Mon, 24 Jun 2019 10:36:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8DHTTP(s)=20Monitor/Block?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=87=BA=E6=97=A0=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E3=80=81=E5=93=8D=E5=BA=94=E5=A4=B4=E5=9F=9F?=
 =?UTF-8?q?BUG=202.=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E5=9F=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86Excel=E5=AF=BC=E5=85=A5GroupName=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/util/excel/thread/CheckIpFormatThread.java  |  8 +++++++-
 .../util/excel/thread/CheckStringFormatThread.java  |  6 ++++++
 .../proxy/HttpRedirectPolicyController.java         | 13 +++++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
index 40013317c..fb87581be 100644
--- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
+++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
@@ -152,7 +152,13 @@ public class CheckIpFormatThread implements Callable<String>{
 					errInfo.append(prop.getProperty("config_describe")+prop.getProperty("length_error")+" "+String.format(prop.getProperty("max_length")+":128") + ";");
 				} 
 			}
-
+			
+			if(regionDict.getFunctionId().equals(605)) {
+				if(StringUtils.isBlank(baseIpCfg.getGroupName())) {
+					errInfo.append(
+							String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name")) + ";");
+				}
+			}
 			if(regionDict.getFunctionId().equals(200)) {
 				if(!serviceDict.getAction().equals(2)) {
 					baseIpCfg.setDoLog(0);
diff --git a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
index 2db99faa9..e39119226 100644
--- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
+++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
@@ -125,6 +125,12 @@ public class CheckStringFormatThread implements Callable<String>{
 				errInfo.append(prop.getProperty("config_describe")+prop.getProperty("length_error")+" "+String.format(prop.getProperty("max_length")+":128") + ";");
 			}
 			
+			if(regionDict.getFunctionId().equals(606) || regionDict.getFunctionId().equals(607) || regionDict.getFunctionId().equals(608)) {
+				if(StringUtils.isBlank(baseStringCfg.getGroupName())) {
+					errInfo.append(
+							String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name")) + ";");
+				}
+			}
 			if(regionDict.getFunctionId().equals(200)) {
 				if(!serviceDict.getAction().equals(2)) {
 					baseStringCfg.setDoLog(0);
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
index d5e2d3a4e..15df8ae99 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
@@ -501,12 +501,7 @@ public class HttpRedirectPolicyController extends BaseController {
 			dataMap.put(entity.getMenuNameCode(), ipLists);
 			dataMap.put("NTC_HTTP_URL", httpUrlList);
 			dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList);
-			if (entity.getFunctionId() != 208 && entity.getFunctionId() != 211) {
-				titleList.add("NTC_HTTP_RES_BODY");
-				classMap.put("NTC_HTTP_RES_BODY", HttpBodyCfg.class);
-				noExportMap.put("NTC_HTTP_RES_BODY", httpResBodyCfgNoExport);
-				dataMap.put("NTC_HTTP_RES_BODY", httpResBodyList);
-			} else if (entity.getFunctionId() != 211) {
+			if (entity.getFunctionId() != 211) {
 				titleList.add("NTC_HTTP_RES_HDR");
 				titleList.add("NTC_HTTP_REQ_BODY");
 				classMap.put("NTC_HTTP_RES_HDR", HttpResHeadCfg.class);
@@ -515,6 +510,12 @@ public class HttpRedirectPolicyController extends BaseController {
 				noExportMap.put("NTC_HTTP_REQ_BODY", httpReqBodyCfgNoExport);
 				dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList);
 				dataMap.put("NTC_HTTP_REQ_BODY", httpReqBodyList);
+				if (entity.getFunctionId() != 208) {
+					titleList.add("NTC_HTTP_RES_BODY");
+					classMap.put("NTC_HTTP_RES_BODY", HttpBodyCfg.class);
+					noExportMap.put("NTC_HTTP_RES_BODY", httpResBodyCfgNoExport);
+					dataMap.put("NTC_HTTP_RES_BODY", httpResBodyList);
+				}
 			}
 			titleList.add("NTC_UNIVERSAL_IP");
 			titleList.add("NTC_SUBSCRIBE_ID");