gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.操控配置去除Block Method 2.修改Block配置下发userRegion

Browse Source
This commit is contained in:
zhangwenqing
2019-05-27 18:17:40 +08:00
parent dd31466774
commit 84c10eac7d
8 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java
View File

@@ -357,13 +357,14 @@ public class ManipulatPolicyController extends BaseController {
if (!str.getUserRegion5().equals("85") && !str.getUserRegion5().equals("90")) {
String value = "";
if(str.getUserRegion5().equals("16")) {// Block
/*if(str.getUserRegion5().equals("16")) {// Block
value = blockDict.get(str.getUserRegion1());
str.setResponseCode(prop.getProperty(value));
str.setUserRegion1(str.getUserRegion2());
str.setUserRegion2(null);
}else if(str.getUserRegion5().equals("48")) {// Redirect
}else*/
if(str.getUserRegion5().equals("48")) {// Redirect
value = redirectDict.get(str.getUserRegion1());
str.setResponseCode(prop.getProperty(value));
str.setUserRegion1(null);
@@ -378,7 +379,7 @@ public class ManipulatPolicyController extends BaseController {
}
if (str.getUserRegion5().equals("16") || str.getUserRegion5().equals("48")) {
/*if (str.getUserRegion5().equals("16") || str.getUserRegion5().equals("48")) {
if (!StringUtil.isEmpty(str.getUserRegion3())) { // 是否存在文件策略
searchResponseFile.setCompileId(Integer.valueOf(str.getUserRegion3()));
List<ProxyFileResponsePageCfg> allProxyFileStrategys = proxyFileResponsePageService.getProxyFileResponsePageCfgList(searchResponseFile);
@@ -388,11 +389,11 @@ public class ManipulatPolicyController extends BaseController {
str.setUserRegion3(null);
}
}
}*/
}
if(str.getUserRegion5().equals("16") || str.getUserRegion5().equals("48") || str.getUserRegion5().equals("85") ||
if(str.getUserRegion5().equals("48") || str.getUserRegion5().equals("85") ||
str.getUserRegion5().equals("90")) {
if(str.getUserRegion5().equals("85")) {
Page<ProxyFileHijackCfg> page = proxyFileHijackService.findPage(new Page<ProxyFileHijackCfg>(request, response, "a"), searchHijackFile);
@@ -429,7 +430,7 @@ public class ManipulatPolicyController extends BaseController {
}
}
String cfgIndexInfoNoExport = ",policy_name,group_name,&method_export:method-responseCode:response_code-userregion1:response_content-userregion2:redirect_url-userregion3:replace_zone-userregion4:replaced_content-userregion5:replace_content-";
String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,&method_export:method-responseCode:response_code-userregion2:redirect_url-userregion3:replace_zone-userregion4:replaced_content-userregion5:replace_content-";
String httpUrlCfgNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time"