代理操控业务部分功能提交配置、导入、导出

This commit is contained in:
zhangwenqing
2019-05-21 19:15:54 +08:00
parent 8657cfa142
commit ac52747686
22 changed files with 3402 additions and 30 deletions

View File

@@ -295,7 +295,7 @@ public class ExportExcel {
}
}
/*** HTTP(s)替换 搜索区域 ***/
if(("replace_zone".equals(headerStr)) && (region.getFunctionId().equals(209))){
if(("replace_zone".equals(headerStr)) && (region.getFunctionId().equals(209) || region.getAction().equals(80))){
commentStr="";
List<SysDataDictionaryItem> dict=DictUtils.getDictList("CONTROL_REPLACE_ZONE");
if(dict !=null && dict.size()>0){
@@ -1170,11 +1170,17 @@ public class ExportExcel {
headerStr="";
commentStr="";
}else{
for (String districtStr : region.getConfigDistrict().split(",")) {
commentStr=commentStr+districtStr+"\n";
if((region.getAction()!=null) && (region.getAction()==85 || region.getAction()==90)) {
commentStr=commentStr+"Content-Type"+"\n";
index++;
defaultValue="Content-Type";
}else {
for (String districtStr : region.getConfigDistrict().split(",")) {
commentStr=commentStr+districtStr+"\n";
index++;
}
defaultValue=region.getConfigDistrict().split(",")[0];
}
defaultValue=region.getConfigDistrict().split(",")[0];
}
if(StringUtil.isEmpty(commentStr)){
headerStr="";

View File

@@ -91,6 +91,10 @@ public class CheckComplexStringFormatThread implements Callable<String>{
throw new RuntimeException("Found String region,but mulityKeywords is Empty");
}
String dirtrictP = regionDict.getConfigDistrict();
// 代理-操控业务hijack、insert
if(regionDict.getAction().equals(85) || regionDict.getAction().equals(90)) {
dirtrictP = "Content-Type";
}
StringBuffer errTip = new StringBuffer();
Pattern pattern = Pattern.compile("\t|\r|\n|\b|\f");
for (int i = 0; i < list.size(); i++) {
@@ -127,7 +131,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
}
}
// 代理HTTP(s)阻断
if (regionDict.getFunctionId().equals(207)) {
if (regionDict.getFunctionId().equals(207) || regionDict.getAction().equals(16)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
baseStringCfg.setUserRegion1("404");
}
@@ -153,7 +157,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
}
// 代理 HTTP(s)重定向
if (regionDict.getFunctionId().equals(208)) {
if (regionDict.getFunctionId().equals(208) || regionDict.getAction().equals(48)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
baseStringCfg.setUserRegion1("302");
}
@@ -188,7 +192,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
}
}
// 代理HTTP(s)替换
if (regionDict.getFunctionId().equals(209)) {
if (regionDict.getFunctionId().equals(209) || regionDict.getAction().equals(80)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
baseStringCfg.setUserRegion1("http_resp_body");
}

View File

@@ -426,7 +426,7 @@ public class CheckIpFormatThread implements Callable<String>{
}
}
// 代理HTTP(s)阻断
if (regionDict.getFunctionId().equals(207)) {
if (regionDict.getFunctionId().equals(207) || regionDict.getAction().equals(16)) {
if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) {
baseIpCfg.setUserRegion1("404");
}
@@ -452,7 +452,7 @@ public class CheckIpFormatThread implements Callable<String>{
}
// 代理 HTTP(s)重定向
if (regionDict.getFunctionId().equals(208)) {
if (regionDict.getFunctionId().equals(208) || regionDict.getAction().equals(48)) {
if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) {
baseIpCfg.setUserRegion1("302");
}
@@ -487,7 +487,7 @@ public class CheckIpFormatThread implements Callable<String>{
}
}
// 代理HTTP(s)替换
if (regionDict.getFunctionId().equals(209)) {
if (regionDict.getFunctionId().equals(209) || regionDict.getAction().equals(80)) {
if(StringUtils.isBlank(baseIpCfg.getUserRegion1())) {
baseIpCfg.setUserRegion1("http_resp_body");
}

View File

@@ -177,7 +177,7 @@ public class CheckStringFormatThread implements Callable<String>{
}
// 代理HTTP(s)阻断
if (regionDict.getFunctionId().equals(207)) {
if (regionDict.getFunctionId().equals(207) || regionDict.getAction().equals(16)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
baseStringCfg.setUserRegion1("404");
}
@@ -203,7 +203,7 @@ public class CheckStringFormatThread implements Callable<String>{
}
// 代理 HTTP(s)重定向
if (regionDict.getFunctionId().equals(208)) {
if (regionDict.getFunctionId().equals(208) || regionDict.getAction().equals(48)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
baseStringCfg.setUserRegion1("302");
}
@@ -238,7 +238,7 @@ public class CheckStringFormatThread implements Callable<String>{
}
}
// 代理HTTP(s)替换
if (regionDict.getFunctionId().equals(209)) {
if (regionDict.getFunctionId().equals(209) || regionDict.getAction().equals(80)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
baseStringCfg.setUserRegion1("http_resp_body");
}