From 5e1095f2bb18c404473d0bdf8215effcc1ed5d3d Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Thu, 28 Mar 2019 17:29:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3HTTP(S)=E9=87=8D=E5=AE=9A?= =?UTF-8?q?=E5=90=91=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5=E5=BA=94=E7=AD=94?= =?UTF-8?q?=E7=A0=81=E9=BB=98=E8=AE=A4=E5=80=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/DomainInterceptMonitTemplate.java | 2 +- .../excel/thread/CheckComplexStringFormatThread.java | 2 +- .../nis/util/excel/thread/CheckIpFormatThread.java | 2 +- .../util/excel/thread/CheckStringFormatThread.java | 2 +- .../basics/InnerProtectionListController.java | 3 --- .../service/basics/InnerProtectionListService.java | 1 - .../WEB-INF/views/cfg/intercept/interceptSubList.jsp | 12 ++++++------ 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/template/DomainInterceptMonitTemplate.java b/src/main/java/com/nis/domain/configuration/template/DomainInterceptMonitTemplate.java index 5d75c9519..2a8e6f2ae 100644 --- a/src/main/java/com/nis/domain/configuration/template/DomainInterceptMonitTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/DomainInterceptMonitTemplate.java @@ -12,7 +12,7 @@ public class DomainInterceptMonitTemplate extends StringAllNotDoLogTemplate{ private String userRegion5; private String cfgKeywords; - @ExcelField(title="intercept_intensity",dictType="INTERCEPT_DOMAIN_INTENSITY",align=2,sort=2) + @ExcelField(title="intercept_intensity",dictType="INTERCEPT_DOMAIN_INTENSITY",align=2,sort=12) public String getUserRegion5() { return userRegion5; } diff --git a/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java index 1f8bb407a..14bb202f3 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java @@ -155,7 +155,7 @@ public class CheckComplexStringFormatThread implements Callable{ // 代理 HTTP(s)重定向 if (regionDict.getFunctionId().equals(208)) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { - baseStringCfg.setUserRegion1("301"); + baseStringCfg.setUserRegion1("302"); } String userRegion1 = baseStringCfg.getUserRegion1();// 重定向应答码 String userRegion2 = baseStringCfg.getUserRegion2();// 重定向URL 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 7bd398430..fb8888cf0 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -439,7 +439,7 @@ public class CheckIpFormatThread implements Callable{ // 代理 HTTP(s)重定向 if (regionDict.getFunctionId().equals(208)) { if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) { - baseIpCfg.setUserRegion1("301"); + baseIpCfg.setUserRegion1("302"); } String userRegion1 = baseIpCfg.getUserRegion1();// 重定向应答码 String userRegion2 = baseIpCfg.getUserRegion2();// 重定向URL 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 2be4d90a0..143a1cd2d 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -205,7 +205,7 @@ public class CheckStringFormatThread implements Callable{ // 代理 HTTP(s)重定向 if (regionDict.getFunctionId().equals(208)) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { - baseStringCfg.setUserRegion1("301"); + baseStringCfg.setUserRegion1("302"); } String userRegion1 = baseStringCfg.getUserRegion1();// 重定向应答码 String userRegion2 = baseStringCfg.getUserRegion2();// 重定向URL diff --git a/src/main/java/com/nis/web/controller/basics/InnerProtectionListController.java b/src/main/java/com/nis/web/controller/basics/InnerProtectionListController.java index a56a810d1..ae341bdf4 100644 --- a/src/main/java/com/nis/web/controller/basics/InnerProtectionListController.java +++ b/src/main/java/com/nis/web/controller/basics/InnerProtectionListController.java @@ -1,18 +1,15 @@ package com.nis.web.controller.basics; -import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.mvc.support.RedirectAttributes; diff --git a/src/main/java/com/nis/web/service/basics/InnerProtectionListService.java b/src/main/java/com/nis/web/service/basics/InnerProtectionListService.java index 10d05824e..1c8ef0a96 100644 --- a/src/main/java/com/nis/web/service/basics/InnerProtectionListService.java +++ b/src/main/java/com/nis/web/service/basics/InnerProtectionListService.java @@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.google.common.collect.Lists; import com.nis.domain.Page; import com.nis.domain.basics.ProtectionListInfo; import com.nis.exceptions.MaatConvertException; diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp index 98f4d66a4..24c35879e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp @@ -228,10 +228,10 @@
-
+
-
@@ -249,8 +249,8 @@
-
-
+
+
@@ -261,8 +261,8 @@
-
- +
+