From 5b5b6d85844a50f300a1abaf6c27e75ad1cacee1 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Wed, 22 May 2019 18:49:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E6=93=8D=E6=8E=A7=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=85=8D=E7=BD=AE=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E3=80=81=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/util/SchedulerTaskUtil.java | 6 ++ .../nis/web/controller/BaseController.java | 6 ++ .../proxy/ManipulatPolicyController.java | 10 --- .../java/com/nis/web/service/BaseService.java | 32 +++++++ .../ConfigSynchronizationService.java | 5 ++ .../configuration/ManipulatPolicyService.java | 1 - src/main/webapp/WEB-INF/tags/sys/delRow.tag | 1 + .../control/manipulatPolicyActionForm.jsp | 85 ++----------------- 8 files changed, 57 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/nis/util/SchedulerTaskUtil.java b/src/main/java/com/nis/util/SchedulerTaskUtil.java index 8b3ba986e..317b85ffa 100644 --- a/src/main/java/com/nis/util/SchedulerTaskUtil.java +++ b/src/main/java/com/nis/util/SchedulerTaskUtil.java @@ -238,6 +238,12 @@ public class SchedulerTaskUtil { userRegion = userRegion.substring(0, userRegion.length()-1); } } + + // Proxy Manipulate + if(entity.getServiceId().equals(656)) { + userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion); + } + for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应 ip.setIsValid(entity.getIsValid()); diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 19c12206d..745aebba9 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -190,6 +190,7 @@ import com.nis.web.service.configuration.IpAddrPoolCfgService; import com.nis.web.service.configuration.IpCfgService; import com.nis.web.service.configuration.IpMultiplexPoolCfgService; import com.nis.web.service.configuration.MailCfgService; +import com.nis.web.service.configuration.ManipulatPolicyService; import com.nis.web.service.configuration.NumCfgService; import com.nis.web.service.configuration.ProxyFileHijackService; import com.nis.web.service.configuration.ProxyFileInsertScriptService; @@ -350,6 +351,9 @@ public class BaseController { @Autowired protected InnerProtectionListService innerProtectionListService; + @Autowired + protected ManipulatPolicyService manipulatPolicyService; + /** * 管理基础路径 */ @@ -3919,6 +3923,8 @@ public class BaseController { ||baseCfg.getFunctionId().equals(210) ||baseCfg.getFunctionId().equals(211)) { pageResult=httpRedirectCfgService.getHttpRedirectList(searchPage, searchCfg); + }else if(baseCfg.getFunctionId().equals(215)) { // Proxy Manipulate + pageResult = manipulatPolicyService.getPolicyList(searchPage, searchCfg); }else if(baseCfg.getFunctionId().equals(213)) {// cache pageResult=cachePolicyService.getCachePolicyList(searchPage, searchCfg); }else if(baseCfg.getFunctionId().equals(563) //app payload 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 2e9a916eb..3a2e9f9de 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 @@ -1,8 +1,5 @@ package com.nis.web.controller.configuration.proxy; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -17,7 +14,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -43,11 +39,8 @@ import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.LogUtils; import com.nis.util.StringUtil; -import com.nis.util.excel.ExcelField; import com.nis.web.controller.BaseController; -import com.nis.web.dao.configuration.ProxyFileHijackDao; import com.nis.web.security.UserUtils; -import com.nis.web.service.configuration.ManipulatPolicyService; import jersey.repackaged.com.google.common.collect.Lists; @@ -58,9 +51,6 @@ import jersey.repackaged.com.google.common.collect.Lists; @RequestMapping("${adminPath}/proxy/control/manipulatPolicy") public class ManipulatPolicyController extends BaseController { - @Autowired - protected ManipulatPolicyService manipulatPolicyService; - @RequestMapping("list") public String list(Model model, @ModelAttribute("cfg") CfgIndexInfo cfg, HttpServletRequest request, HttpServletResponse response) { Page searchPage = new Page(request, response, "a"); diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 77016d6e0..bb62d0a83 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -3246,5 +3246,37 @@ public abstract class BaseService { fileTemp.setOpTime(cfg.getAuditTime()); return fileTemp; } + + // Proxy Manipulate + public static String setUserRegionOfMantipulateCfg(CfgIndexInfo cfg, String userRegion) { + + ManipulatActionParam actionParam = new ManipulatActionParam(); + if(cfg.getUserRegion5().equals("48")) { + actionParam.setMethod("redirect"); + actionParam.setCode(Integer.valueOf(cfg.getUserRegion1())); + actionParam.setTo(cfg.getUserRegion2()); + }else if(cfg.getUserRegion5().equals("80")) { + List ReplaceCfgList = new ArrayList(); + ReplaceCfg replaceCfg = new ReplaceCfg(); + replaceCfg.setSearch_in(cfg.getUserRegion1()); + replaceCfg.setFind(cfg.getUserRegion2()); + replaceCfg.setReplace_with(cfg.getUserRegion3()); + 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(cfg.getUserRegion2()); + actionParam.setHtml_profile(Integer.valueOf(cfg.getUserRegion4())); + }else if(cfg.getUserRegion5().equals("85")) { + actionParam.setMethod("hijack"); + actionParam.setHijack_profile(Integer.valueOf(cfg.getUserRegion4())); + }else if(cfg.getUserRegion5().equals("90")) { + actionParam.setMethod("insert"); + actionParam.setInsert_profile(Integer.valueOf(cfg.getUserRegion4())); + } + return gsonToJson(actionParam); + } } diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index d9ad0701b..146fb35c4 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -461,6 +461,11 @@ public class ConfigSynchronizationService extends BaseService{ userRegion = userRegion.substring(0, userRegion.length()-1); } } + // Proxy Manipulation + if(entity.getServiceId().equals(656)) { + userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion); + } + for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应 ip.setIsValid(entity.getIsValid()); diff --git a/src/main/java/com/nis/web/service/configuration/ManipulatPolicyService.java b/src/main/java/com/nis/web/service/configuration/ManipulatPolicyService.java index 497b75de4..5629811be 100644 --- a/src/main/java/com/nis/web/service/configuration/ManipulatPolicyService.java +++ b/src/main/java/com/nis/web/service/configuration/ManipulatPolicyService.java @@ -45,7 +45,6 @@ import com.nis.web.dao.configuration.ProxyFileStrategyDao; import com.nis.web.dao.configuration.StringCfgDao; import com.nis.web.dao.configuration.WebsiteCfgDao; import com.nis.web.security.UserUtils; -import com.nis.web.service.BaseService; import com.nis.web.service.CrudService; /** diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index 5335e9779..736856645 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -123,6 +123,7 @@ function isBatch(url){ || url.indexOf("functionId=514&") > -1 //File Insert Script || url.indexOf("functionId=515&") > -1 //Traffic Mirror || url.indexOf("functionId=512&") > -1 //PXY OBJ FILE + || url.indexOf("functionId=215&") > -1 //Proxy Manipulate ){ flag = true; } 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 b500e6313..f1608de2b 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 @@ -103,57 +103,18 @@
- - + < >${file.fileDesc} - + --%>
-
-
+ @@ -291,49 +252,17 @@
- - + --%>
- -
-
+