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

修复HTTP(S) 阻断 引入阻断页面文件的查询

Browse Source
This commit is contained in:
wangwei
2019-05-31 13:08:31 +08:00
parent f917c7678a
commit 65c06777ed
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -25,6 +25,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict; import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.callback.ProxyFileResponsePageCfg;
import com.nis.domain.callback.ProxyFileStrategyCfg; import com.nis.domain.callback.ProxyFileStrategyCfg;
import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.CfgIndexInfo;
@@ -63,8 +64,8 @@ public class HttpRedirectPolicyController extends BaseController {
model.addAttribute("page", page); model.addAttribute("page", page);
initPageCondition(model, cfg); initPageCondition(model, cfg);
// 获取所有的响应文件内容，阻断，或重定向时可以选择 // 获取所有的响应文件内容，阻断，或重定向时可以选择
List<ProxyFileStrategyCfg> allProxyFileStrategys = proxyFileStrategyService List<ProxyFileResponsePageCfg> allProxyFileStrategys = proxyFileResponsePageService
.getProxyFileStrategyCfgList(new ProxyFileStrategyCfg()); .getProxyFileResponsePageCfgList(new ProxyFileResponsePageCfg());
model.addAttribute("allProxyFileStrategys", allProxyFileStrategys); model.addAttribute("allProxyFileStrategys", allProxyFileStrategys);
return "/cfg/proxy/control/httpRedirectList"; return "/cfg/proxy/control/httpRedirectList";
} }
@@ -174,8 +175,8 @@ public class HttpRedirectPolicyController extends BaseController {
initFormCondition(model, entity); initFormCondition(model, entity);
} }
// 获取所有的响应文件内容，阻断，或重定向时可以选择 // 获取所有的响应文件内容，阻断，或重定向时可以选择
List<ProxyFileStrategyCfg> allProxyFileStrategys = proxyFileStrategyService List<ProxyFileResponsePageCfg> allProxyFileStrategys = proxyFileResponsePageService
.getProxyFileStrategyCfgList(new ProxyFileStrategyCfg()); .getProxyFileResponsePageCfgList(new ProxyFileResponsePageCfg());
model.addAttribute("_cfg", entity); model.addAttribute("_cfg", entity);
model.addAttribute("allProxyFileStrategys", allProxyFileStrategys); model.addAttribute("allProxyFileStrategys", allProxyFileStrategys);
return "/cfg/proxy/control/httpRedirectForm"; return "/cfg/proxy/control/httpRedirectForm";
@@ -365,12 +366,12 @@ public class HttpRedirectPolicyController extends BaseController {
if (entity.getFunctionId() == 207 || entity.getFunctionId() == 208) { if (entity.getFunctionId() == 207 || entity.getFunctionId() == 208) {
if (StringUtil.isEmpty(str.getUserRegion2())) { if (StringUtil.isEmpty(str.getUserRegion2())) {
if (!StringUtil.isEmpty(str.getUserRegion3())) { if (!StringUtil.isEmpty(str.getUserRegion3())) {
ProxyFileStrategyCfg file = new ProxyFileStrategyCfg(); ProxyFileResponsePageCfg file = new ProxyFileResponsePageCfg();
file.setCompileId(Integer.valueOf(str.getUserRegion3())); file.setCompileId(Integer.valueOf(str.getUserRegion3()));
List<ProxyFileStrategyCfg> allProxyFileStrategys = proxyFileStrategyService List<ProxyFileResponsePageCfg> allProxyFileResponsePageCfg = proxyFileResponsePageService
.getProxyFileStrategyCfgList(file); .getProxyFileResponsePageCfgList(file);
if (allProxyFileStrategys != null && allProxyFileStrategys.size() > 0) { if (allProxyFileResponsePageCfg != null && allProxyFileResponsePageCfg.size() > 0) {
str.setUserRegion2(allProxyFileStrategys.get(0).getCfgDesc()); str.setUserRegion2(allProxyFileResponsePageCfg.get(0).getCfgDesc());
} }
} }
} }