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 b13a97f79..b9cf59808 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java @@ -92,7 +92,7 @@ public class CheckComplexStringFormatThread implements Callable{ } String dirtrictP = regionDict.getConfigDistrict(); // 代理-操控业务hijack、insert - if(regionDict.getAction().equals(85) || regionDict.getAction().equals(90)) { + if("85".equals(regionDict.getAction()+"") || "90".equals(regionDict.getAction()+"")) { dirtrictP = "Content-Type"; } StringBuffer errTip = new StringBuffer(); @@ -131,7 +131,7 @@ public class CheckComplexStringFormatThread implements Callable{ } } // 代理HTTP(s)阻断 - if (regionDict.getFunctionId().equals(207) || regionDict.getAction().equals(16)) { + if (regionDict.getFunctionId().equals(207) || "16".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { baseStringCfg.setUserRegion1("404"); } @@ -157,7 +157,7 @@ public class CheckComplexStringFormatThread implements Callable{ } // 代理 HTTP(s)重定向 - if (regionDict.getFunctionId().equals(208) || regionDict.getAction().equals(48)) { + if (regionDict.getFunctionId().equals(208) || "48".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { baseStringCfg.setUserRegion1("302"); } @@ -192,7 +192,7 @@ public class CheckComplexStringFormatThread implements Callable{ } } // 代理HTTP(s)替换 - if (regionDict.getFunctionId().equals(209) || regionDict.getAction().equals(80)) { + if (regionDict.getFunctionId().equals(209) || "80".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { baseStringCfg.setUserRegion1("http_resp_body"); } 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 47ae967ae..09148f9ec 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -445,7 +445,7 @@ public class CheckIpFormatThread implements Callable{ } } // 代理HTTP(s)阻断 - if (regionDict.getFunctionId().equals(207) || regionDict.getAction().equals(16)) { + if (regionDict.getFunctionId().equals(207) || "16".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) { baseIpCfg.setUserRegion1("404"); } @@ -471,7 +471,7 @@ public class CheckIpFormatThread implements Callable{ } // 代理 HTTP(s)重定向 - if (regionDict.getFunctionId().equals(208) || regionDict.getAction().equals(48)) { + if (regionDict.getFunctionId().equals(208) || "48".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) { baseIpCfg.setUserRegion1("302"); } @@ -506,7 +506,7 @@ public class CheckIpFormatThread implements Callable{ } } // 代理HTTP(s)替换 - if (regionDict.getFunctionId().equals(209) || regionDict.getAction().equals(80)) { + if (regionDict.getFunctionId().equals(209) || "80".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) { baseIpCfg.setUserRegion1("http_resp_body"); } 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 fdbcdc222..2dde77e5d 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -196,7 +196,7 @@ public class CheckStringFormatThread implements Callable{ } // 代理HTTP(s)阻断 - if (regionDict.getFunctionId().equals(207) || regionDict.getAction().equals(16)) { + if (regionDict.getFunctionId().equals(207) || "16".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { baseStringCfg.setUserRegion1("404"); } @@ -222,7 +222,7 @@ public class CheckStringFormatThread implements Callable{ } // 代理 HTTP(s)重定向 - if (regionDict.getFunctionId().equals(208) || regionDict.getAction().equals(48)) { + if (regionDict.getFunctionId().equals(208) || "48".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { baseStringCfg.setUserRegion1("302"); } @@ -257,7 +257,7 @@ public class CheckStringFormatThread implements Callable{ } } // 代理HTTP(s)替换 - if (regionDict.getFunctionId().equals(209) || regionDict.getAction().equals(80)) { + if (regionDict.getFunctionId().equals(209) || "80".equals(regionDict.getAction()+"")) { if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) { baseStringCfg.setUserRegion1("http_resp_body"); } diff --git a/src/main/webapp/static/pages/scripts/importExcel.js b/src/main/webapp/static/pages/scripts/importExcel.js index 327bae8bc..f7a5b73af 100644 --- a/src/main/webapp/static/pages/scripts/importExcel.js +++ b/src/main/webapp/static/pages/scripts/importExcel.js @@ -174,7 +174,8 @@ var importCfg=function(){ } // 代理-操控业务Profile Info - if($("#functionId").val() == 215){ + var manipulateType = $("input[name='manipulatType']:checked").val(); + if(manipulateType == 85 || manipulateType == 90 || manipulateType == 16){ if($("#profileSelId").val() == "" || $("#profileSelId").val() == null){ $("span",$error).html($("#noneProfileTip").val()); $error.removeClass("hide");