diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java index d06b30f6d..a20c58d70 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java @@ -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 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 page = proxyFileHijackService.findPage(new Page(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" diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 478eb580a..5c249c7fb 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -3290,11 +3290,6 @@ public abstract class BaseService { ReplaceCfgList.add(replaceCfg); actionParam.setMethod("replace"); actionParam.setRules(ReplaceCfgList); - }else if(cfg.getUserRegion5().equals("16")) { - actionParam.setMethod("block"); - actionParam.setCode(Integer.valueOf(cfg.getUserRegion1())); - actionParam.setMessage(StringUtils.isNotBlank(cfg.getUserRegion2())?cfg.getUserRegion2():""); - actionParam.setHtml_profile(Integer.valueOf(StringUtils.isNotBlank(cfg.getUserRegion3())?cfg.getUserRegion3():"0")); }else if(cfg.getUserRegion5().equals("85")) { actionParam.setMethod("hijack"); actionParam.setHijack_profile(Integer.valueOf(cfg.getUserRegion4())); diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index 50bda8346..8de38acc4 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +23,7 @@ import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.domain.maat.MaatCfg; +import com.nis.domain.maat.ManipulatActionParam; import com.nis.domain.maat.MaatCfg.DigestCfg; import com.nis.domain.maat.MaatCfg.GroupCfg; import com.nis.domain.maat.MaatCfg.IpCfg; @@ -500,7 +502,7 @@ public class HttpRedirectCfgService extends CrudService resFileList = proxyFileDao.fingResPages(searchEntity); + //List resFileList = proxyFileDao.fingResPages(searchEntity); List hajackFilelist = proxyFileHijackDao.findHijackFiles(hijackSearch); List InsertFilelist = proxyFileInsertDao.findInsertFiles(insertSearch); - model.addAttribute("allResponseFiles", resFileList); + //model.addAttribute("allResponseFiles", resFileList); model.addAttribute("allHijackFiles", hajackFilelist); model.addAttribute("allInsertFiles", InsertFilelist); } diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp index 33a2b5c2b..8ad3de3ce 100644 --- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp +++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp @@ -98,11 +98,11 @@
- - + + > + checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyActionForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyActionForm.jsp index fefdc1fdc..25b522f98 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyActionForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyActionForm.jsp @@ -21,11 +21,11 @@
- - + + > + checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp index 7e6fa17ff..d5d6166d9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp @@ -211,7 +211,7 @@ --%> - + @@ -398,7 +398,7 @@ - + <%-- --%> @@ -447,7 +447,7 @@ - + <%-- @@ -471,7 +471,7 @@ - + --%> @@ -481,7 +481,6 @@ - title="${indexCfg.userRegion2 }"> ${fns:abbr(indexCfg.userRegion2,20)} <%-- @@ -499,7 +498,6 @@ - @@ -520,7 +518,6 @@ - diff --git a/src/main/webapp/static/pages/scripts/importExcel.js b/src/main/webapp/static/pages/scripts/importExcel.js index 9c35ffde0..f7a5b73af 100644 --- a/src/main/webapp/static/pages/scripts/importExcel.js +++ b/src/main/webapp/static/pages/scripts/importExcel.js @@ -247,7 +247,7 @@ function profileChange(val){ $("input[name='regionDictIds']:first").prop("checked",true); } - if(val == 48 || val == 80 || val == 16){ // 重定向和替换动作无Profile属性 + if(val == 48 || val == 80){ // 重定向和替换动作无Profile属性 $(".profileInfo").addClass("hidden"); }else{ $(".profileInfo").removeClass("hidden");