From 65c06777ed0aaa9eff307e05690c22c13125a4d1 Mon Sep 17 00:00:00 2001 From: wangwei Date: Fri, 31 May 2019 13:08:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DHTTP(S)=20=E9=98=BB=E6=96=AD?= =?UTF-8?q?=20=E5=BC=95=E5=85=A5=E9=98=BB=E6=96=AD=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proxy/HttpRedirectPolicyController.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 01aa90285..077274645 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -25,6 +25,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; +import com.nis.domain.callback.ProxyFileResponsePageCfg; import com.nis.domain.callback.ProxyFileStrategyCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; @@ -63,8 +64,8 @@ public class HttpRedirectPolicyController extends BaseController { model.addAttribute("page", page); initPageCondition(model, cfg); // 获取所有的响应文件内容，阻断，或重定向时可以选择 - List allProxyFileStrategys = proxyFileStrategyService - .getProxyFileStrategyCfgList(new ProxyFileStrategyCfg()); + List allProxyFileStrategys = proxyFileResponsePageService + .getProxyFileResponsePageCfgList(new ProxyFileResponsePageCfg()); model.addAttribute("allProxyFileStrategys", allProxyFileStrategys); return "/cfg/proxy/control/httpRedirectList"; } @@ -174,8 +175,8 @@ public class HttpRedirectPolicyController extends BaseController { initFormCondition(model, entity); } // 获取所有的响应文件内容，阻断，或重定向时可以选择 - List allProxyFileStrategys = proxyFileStrategyService - .getProxyFileStrategyCfgList(new ProxyFileStrategyCfg()); + List allProxyFileStrategys = proxyFileResponsePageService + .getProxyFileResponsePageCfgList(new ProxyFileResponsePageCfg()); model.addAttribute("_cfg", entity); model.addAttribute("allProxyFileStrategys", allProxyFileStrategys); return "/cfg/proxy/control/httpRedirectForm"; @@ -365,12 +366,12 @@ public class HttpRedirectPolicyController extends BaseController { if (entity.getFunctionId() == 207 || entity.getFunctionId() == 208) { if (StringUtil.isEmpty(str.getUserRegion2())) { if (!StringUtil.isEmpty(str.getUserRegion3())) { - ProxyFileStrategyCfg file = new ProxyFileStrategyCfg(); + ProxyFileResponsePageCfg file = new ProxyFileResponsePageCfg(); file.setCompileId(Integer.valueOf(str.getUserRegion3())); - List allProxyFileStrategys = proxyFileStrategyService - .getProxyFileStrategyCfgList(file); - if (allProxyFileStrategys != null && allProxyFileStrategys.size() > 0) { - str.setUserRegion2(allProxyFileStrategys.get(0).getCfgDesc()); + List allProxyFileResponsePageCfg = proxyFileResponsePageService + .getProxyFileResponsePageCfgList(file); + if (allProxyFileResponsePageCfg != null && allProxyFileResponsePageCfg.size() > 0) { + str.setUserRegion2(allProxyFileResponsePageCfg.get(0).getCfgDesc()); } } }