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:
zhangwenqing
2019-05-23 18:28:04 +08:00
parent 00b3ea807f
commit 672d76b046
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java
View File

@@ -92,7 +92,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
}
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<String>{
}
}
// 代理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<String>{
}
// 代理 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<String>{
}
}
// 代理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");
}

6
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -445,7 +445,7 @@ public class CheckIpFormatThread implements Callable<String>{
}
}
// 代理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<String>{
}
// 代理 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<String>{
}
}
// 代理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");
}

6
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -196,7 +196,7 @@ public class CheckStringFormatThread implements Callable<String>{
}
// 代理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<String>{
}
// 代理 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<String>{
}
}
// 代理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");
}

3
src/main/webapp/static/pages/scripts/importExcel.js
View File

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