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

（1）调整拦截action 为2

Browse Source 
（2）修复导出bug
This commit is contained in:
wangxin
2019-05-23 19:12:37 +08:00
parent 672d76b046
commit 8261647a35
10 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/nis/domain/configuration/PxyInterceptCfg.java
View File

@@ -8,41 +8,41 @@ public class PxyInterceptCfg extends CfgIndexInfo {
* *
*/ */
private static final long serialVersionUID = 994229066993318362L; private static final long serialVersionUID = 994229066993318362L;
@ExcelField(title="pxy_intercept_monit_keyring",sort=7) @ExcelField(title="pxy_intercept_monit_keyring",sort=8)
private String keyring; private String keyring;
@ExcelField(title="exclusions_ev_cert",dictType="SYS_YES_NO",sort=8) @ExcelField(title="exclusions_ev_cert",dictType="SYS_YES_NO",sort=9)
private String evCert; private String evCert;
@ExcelField(title="exclusions_cert_transparency",dictType="SYS_YES_NO",sort=9) @ExcelField(title="exclusions_cert_transparency",dictType="SYS_YES_NO",sort=10)
private String certTransparency; private String certTransparency;
@ExcelField(title="exclusions_client_cert_req",dictType="SYS_YES_NO",sort=10) @ExcelField(title="exclusions_client_cert_req",dictType="SYS_YES_NO",sort=11)
private String clientCertReq; private String clientCertReq;
@ExcelField(title="exclusions_pinning",dictType="SYS_YES_NO",sort=11) @ExcelField(title="exclusions_pinning",dictType="SYS_YES_NO",sort=12)
private String pinning; private String pinning;
@ExcelField(title="cert_verify_approach_cn",dictType="SYS_YES_NO",sort=12) @ExcelField(title="cert_verify_approach_cn",dictType="SYS_YES_NO",sort=13)
private String cn; private String cn;
@ExcelField(title="cert_verify_approach_issuer",dictType="SYS_YES_NO",sort=13) @ExcelField(title="cert_verify_approach_issuer",dictType="SYS_YES_NO",sort=14)
private String issuer; private String issuer;
@ExcelField(title="cert_verify_approach_self_signed",dictType="SYS_YES_NO",sort=14) @ExcelField(title="cert_verify_approach_self_signed",dictType="SYS_YES_NO",sort=15)
private String selfSigned; private String selfSigned;
@ExcelField(title="cert_verify_approach_expiration",dictType="SYS_YES_NO",sort=15) @ExcelField(title="cert_verify_approach_expiration",dictType="SYS_YES_NO",sort=16)
private String expiration; private String expiration;
@ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",sort=16) @ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",sort=17)
private String failMethod; private String failMethod;
@ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",sort=17) @ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",sort=18)
private String min; private String min;
@ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",sort=18) @ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",sort=19)
private String max; private String max;
@ExcelField(title="ssl_ver_mirror_client",dictType="SYS_YES_NO",sort=19) @ExcelField(title="ssl_ver_mirror_client",dictType="SYS_YES_NO",sort=20)
private String mirrorClient; private String mirrorClient;
@ExcelField(title="decrypt_mirror_enable",dictType="SYS_YES_NO",sort=20) @ExcelField(title="decrypt_mirror_enable",dictType="SYS_YES_NO",sort=21)
private String enable; private String enable;
@ExcelField(title="decrypt_mirror_mirror_profile",sort=21) @ExcelField(title="decrypt_mirror_mirror_profile",sort=22)
private String mirrorProfile; private String mirrorProfile;
private String userRegion1; private String userRegion1;
private String userRegion2; private String userRegion2;
private String userRegion3; private String userRegion3;
private String userRegion4; private String userRegion4;
private String userRegion5; // private String userRegion5;
public String getKeyring() { public String getKeyring() {
return keyring; return keyring;
} }

4
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -2861,8 +2861,8 @@ public class ExportExcel {
/** /**
* 构造函数 * 构造函数
* @param msgProp 国际化配置 * @param msgProp 国际化配置
* @param title sheet名称 * @param titleList sheet名称
* @param cls 实体对象，通过annotation.ExportField获取标题 * @param clsMap 实体对象，通过annotation.ExportField获取标题
* @param type 导出类型（1:导出数据；2：导出模板） * @param type 导出类型（1:导出数据；2：导出模板）
* @param groups 导入分组 * @param groups 导入分组
* @return * @return

4
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -121,7 +121,7 @@ public class CheckIpFormatThread implements Callable<String>{
String direction = regionDict.getConfigDirection(); String direction = regionDict.getConfigDirection();
StringBuffer errTip = new StringBuffer(); StringBuffer errTip = new StringBuffer();
// 因IP拦截 监测 // 因IP拦截 监测
if(regionDict.getFunctionId().equals(200) && serviceDict.getAction().equals(1)){ if(regionDict.getFunctionId().equals(200) && serviceDict.getAction().equals(2)){
protocol="6"; protocol="6";
} }
List<SysDataDictionaryItem> sslversions = new ArrayList<>(); List<SysDataDictionaryItem> sslversions = new ArrayList<>();
@@ -150,7 +150,7 @@ public class CheckIpFormatThread implements Callable<String>{
} }
if(regionDict.getFunctionId().equals(200)) { if(regionDict.getFunctionId().equals(200)) {
if(!serviceDict.getAction().equals(1)) { if(!serviceDict.getAction().equals(2)) {
baseIpCfg.setDoLog(0); baseIpCfg.setDoLog(0);
} }
} }

6
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -124,7 +124,7 @@ public class CheckStringFormatThread implements Callable<String>{
} }
if(regionDict.getFunctionId().equals(200)) { if(regionDict.getFunctionId().equals(200)) {
if(!serviceDict.getAction().equals(1)) { if(!serviceDict.getAction().equals(2)) {
baseStringCfg.setDoLog(0); baseStringCfg.setDoLog(0);
} }
} }
@@ -151,7 +151,7 @@ public class CheckStringFormatThread implements Callable<String>{
} }
// 代理-域名拦截 // 代理-域名拦截
if (regionDict.getFunctionId().equals(200) && "intercept_domain".equals(regionDict.getConfigServiceType())) { if (regionDict.getFunctionId().equals(200) && "intercept_domain".equals(regionDict.getConfigServiceType())) {
if(serviceDict.getAction().equals(1)) { /*if(serviceDict.getAction().equals(1)) {
if(StringUtils.isBlank(baseStringCfg.getUserRegion5())) { if(StringUtils.isBlank(baseStringCfg.getUserRegion5())) {
baseStringCfg.setUserRegion5("1"); baseStringCfg.setUserRegion5("1");
} }
@@ -171,7 +171,7 @@ public class CheckStringFormatThread implements Callable<String>{
} }
} }
}else if(serviceDict.getAction().equals(64)) { }else*/ if(serviceDict.getAction().equals(64)) {
baseStringCfg.setUserRegion1("0");// limit_rate_type（限速方式默认值） baseStringCfg.setUserRegion1("0");// limit_rate_type（限速方式默认值）
if(StringUtils.isBlank(baseStringCfg.getUserRegion2())) { if(StringUtils.isBlank(baseStringCfg.getUserRegion2())) {
baseStringCfg.setUserRegion2("0.1"); baseStringCfg.setUserRegion2("0.1");

7
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -198,8 +198,7 @@ public class IpController extends BaseController{
* *
* @param model * @param model
* @param cfg * @param cfg
* @param auditType 审核类型 ：批量审核时使用，1批量生效，0批量失效 * @param isAudit 审核类型 ：批量审核时使用，1批量生效，0批量失效
* @param isAudit
* @param isValid * @param isValid
* @param ids * @param ids
* @param functionId * @param functionId
@@ -481,7 +480,7 @@ public class IpController extends BaseController{
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpRateLimitTemplate.class, 2); ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpRateLimitTemplate.class, 2);
excel.setDataList(pro,classList,null). excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose(); write(request,response, fileName).dispose();
}else if(serviceDict.getServiceId().equals(512)){ }else if(serviceDict.getAction().equals(2)){//forward
List<InterceptIpTemplate> classList=new ArrayList<InterceptIpTemplate>(); List<InterceptIpTemplate> classList=new ArrayList<InterceptIpTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, InterceptIpTemplate.class, 2); ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, InterceptIpTemplate.class, 2);
excel.setDataList(pro,classList,null). excel.setDataList(pro,classList,null).
@@ -528,7 +527,7 @@ public class IpController extends BaseController{
excel.setDataList(pro,classList,null). excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose(); write(request,response, fileName).dispose();
}else if(regionDict.getFunctionId().equals(200)){// 拦截策略（域名） }else if(regionDict.getFunctionId().equals(200)){// 拦截策略（域名）
if(serviceDict.getAction().equals(1)){// 监测 if(serviceDict.getAction().equals(2)){// forward
List<InterceptDomainTemplate> classList=new ArrayList<InterceptDomainTemplate>(); List<InterceptDomainTemplate> classList=new ArrayList<InterceptDomainTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, InterceptDomainTemplate.class, 2); ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, InterceptDomainTemplate.class, 2);
excel.setDataList(pro,classList,null). excel.setDataList(pro,classList,null).

38
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -122,7 +122,7 @@ public class InterceptController extends CommonController {
public String saveInterceptIpCfg(RedirectAttributes redirectAttributes, Model model, HttpServletRequest request, public String saveInterceptIpCfg(RedirectAttributes redirectAttributes, Model model, HttpServletRequest request,
HttpServletResponse response, String ids, CfgIndexInfo entity) { HttpServletResponse response, String ids, CfgIndexInfo entity) {
try { try {
if(!entity.getAction().equals(1)||!entity.getServiceId().equals(512)) { if(!entity.getAction().equals(2)||!entity.getServiceId().equals(512)) {
entity.setUserRegion(null); entity.setUserRegion(null);
}else { }else {
if(entity.getUserRegion()==null) { if(entity.getUserRegion()==null) {
@@ -476,6 +476,7 @@ public class InterceptController extends CommonController {
} }
// 获取证书信息 // 获取证书信息
List<PxyObjKeyring> certificateList = new ArrayList<PxyObjKeyring>(); List<PxyObjKeyring> certificateList = new ArrayList<PxyObjKeyring>();
//获取镜像相关信息
List<ProxyFileTrafficMirrorCfg> mirrorProfileList=new ArrayList<>(); List<ProxyFileTrafficMirrorCfg> mirrorProfileList=new ArrayList<>();
if (entity.getFunctionId().equals(200)) { if (entity.getFunctionId().equals(200)) {
certificateList = pxyObjKeyringService.findPxyObjKeyrings(null, 1, 1, "ip"); certificateList = pxyObjKeyringService.findPxyObjKeyrings(null, 1, 1, "ip");
@@ -494,7 +495,7 @@ public class InterceptController extends CommonController {
} }
str.setUserRegion(new HashMap<String,Object>()); str.setUserRegion(new HashMap<String,Object>());
if (certificateList != null) { if (certificateList != null) {
if (entity.getFunctionId() == 200 ) { if (entity.getFunctionId().equals(200) ) {
if (!StringUtil.isEmpty(str.getUserRegion1())&&str.getUserRegion1().startsWith("{")) { if (!StringUtil.isEmpty(str.getUserRegion1())&&str.getUserRegion1().startsWith("{")) {
Map<String,Object> userregion=BaseService.gsonFromJson(str.getUserRegion1(), Map.class); Map<String,Object> userregion=BaseService.gsonFromJson(str.getUserRegion1(), Map.class);
@@ -576,16 +577,16 @@ public class InterceptController extends CommonController {
String cfgIndexInfoNoExport = ""; String cfgIndexInfoNoExport = "";
String ipPortInfoNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" String ipPortInfoNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time" + ",config_time,editor,edit_time,auditor,audit_time"
+ ",letter,whether_area_block,classification,attribute,label" + ",letter,whether_area_block,classification,attribute,label,block_type,"
+ ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; + ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
String interceptNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" String interceptNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time" + ",config_time,editor,edit_time,auditor,audit_time"
+ ",letter,whether_area_block,classification,attribute,label" + ",letter,whether_area_block,classification,attribute,label,block_type,"
+ ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,"; + ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
String httpUrlCfgNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" String httpUrlCfgNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time" + ",config_time,editor,edit_time,auditor,audit_time"
+ ",letter,whether_area_block,classification,attribute,label" + ",letter,whether_area_block,classification,attribute,label"
+ ",userregion1,userregion2,userregion3,userregion4,userregion5,"; + ",userregion1,userregion2,userregion3,userregion4,userregion5,block_type,";
List<IpPortCfg> ipList = new ArrayList<IpPortCfg>(); List<IpPortCfg> ipList = new ArrayList<IpPortCfg>();
List<BaseStringCfg> httpUrlList = new ArrayList<BaseStringCfg>(); List<BaseStringCfg> httpUrlList = new ArrayList<BaseStringCfg>();
@@ -607,26 +608,31 @@ public class InterceptController extends CommonController {
pktBinList.addAll(maps.get("PXY_INTERCEPT_PKT_BIN")); pktBinList.addAll(maps.get("PXY_INTERCEPT_PKT_BIN"));
if (entity.getFunctionId() == 200){ if (entity.getFunctionId() == 200){
Properties msgProp = getMsgProp(); Properties msgProp = getMsgProp();
if(cfg.getAction().equals(1)) { if(cfg.getAction().equals(2)) {
cfg.setUserRegion5(msgProp.getProperty("intercept")); pxyInterceptCfgs.get(index).setUserRegion5(msgProp.getProperty("intercept"));
}else if(cfg.getAction().equals(48)) { }else if(cfg.getAction().equals(48)) {
cfg.setUserRegion5(msgProp.getProperty("action_spoofing")); pxyInterceptCfgs.get(index).setUserRegion5(msgProp.getProperty("action_spoofing"));
}else if(cfg.getAction().equals(128)) { }else if(cfg.getAction().equals(128)) {
cfg.setUserRegion5(msgProp.getProperty("bypass")); pxyInterceptCfgs.get(index).setUserRegion5(msgProp.getProperty("bypass"));
}else { }else {
cfg.setUserRegion5(msgProp.getProperty(DictUtils.getDictLabels("SERVICE_ACTION", cfg.getAction().toString(), cfg.getAction().toString()))); pxyInterceptCfgs.get(index).setUserRegion5(msgProp.getProperty(DictUtils.getDictLabels("SERVICE_ACTION", cfg.getAction().toString(), cfg.getAction().toString())));
}
}
if (214==entity.getFunctionId()) {
if (!StringUtil.isBlank(cfg.getUserRegion1())) {
cfg.setUserRegion1(DictUtils.getDictLabels("SPOOFING_IP_TYPE", cfg.getUserRegion1(),cfg.getUserRegion1()));
} }
} }
index++; index++;
} }
//为何多循环一次？？？
if (214==entity.getFunctionId()) { /*if (214==entity.getFunctionId()) {
for (CfgIndexInfo cfg : ipLists) { for (CfgIndexInfo cfg : ipLists) {
if (!StringUtil.isBlank(cfg.getUserRegion1())) { if (!StringUtil.isBlank(cfg.getUserRegion1())) {
cfg.setUserRegion1(DictUtils.getDictLabels("SPOOFING_IP_TYPE", cfg.getUserRegion1(),cfg.getUserRegion1())); cfg.setUserRegion1(DictUtils.getDictLabels("SPOOFING_IP_TYPE", cfg.getUserRegion1(),cfg.getUserRegion1()));
} }
} }
} }*/
pktBinList = BaseStringCfg.replaceBaseKeyList(pktBinList); pktBinList = BaseStringCfg.replaceBaseKeyList(pktBinList);
httpUrlList = BaseStringCfg.baseHexList(httpUrlList); httpUrlList = BaseStringCfg.baseHexList(httpUrlList);
@@ -647,11 +653,15 @@ public class InterceptController extends CommonController {
dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_IP", ipList);
dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList); dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList);
} else if (entity.getFunctionId() == 200) {// IP拦截 } else if (entity.getFunctionId() == 200) {// IP拦截
cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,block_type,&userregion1:intercept_file_strategy-userregion2:ratelimit-userregion5:block_type"; cfgIndexInfoNoExport = ",userRegion1,userRegion5,do_log,policy_name,group_name,userregion3,userregion4,block_type,&userregion2:ratelimit-userregion5:block_type";
titleList.add("PXY_INTERCEPT_IP"); titleList.add("PXY_INTERCEPT_IP");
classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class); classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class);
noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport); noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport);
dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_IP", ipList);
titleList.add("PXY_INTERCEPT_DOMAIN");
classMap.put("PXY_INTERCEPT_DOMAIN", HttpUrlCfg.class);
noExportMap.put("PXY_INTERCEPT_DOMAIN", httpUrlCfgNoExport);
dataMap.put("PXY_INTERCEPT_DOMAIN", httpUrlList);
} else if (entity.getFunctionId() == 201) {// 域名拦截 } else if (entity.getFunctionId() == 201) {// 域名拦截
cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,&userregion2:ratelimit-userregion1:intercept_file_strategy-userregion5:intercept_intensity-"; cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,&userregion2:ratelimit-userregion1:intercept_file_strategy-userregion5:intercept_intensity-";
titleList.add("NTC_HTTP_URL"); titleList.add("NTC_HTTP_URL");

1
src/main/resources/sql/20190521/intercept_policy.sql
View File

@@ -1,3 +1,4 @@
update function_service_dict set action=2,action_code='forward' where service_id=512 and is_valid=1;
#fail method字典 #fail method字典
INSERT INTO `sys_data_dictionary_name`(`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES (154, 'fail_method', 'FAIL_METHOD', '用于代理拦截策略', NULL, '2019-05-09 11:01:16', '2019-05-09 11:01:21', 1); INSERT INTO `sys_data_dictionary_name`(`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES (154, 'fail_method', 'FAIL_METHOD', '用于代理拦截策略', NULL, '2019-05-09 11:01:16', '2019-05-09 11:01:21', 1);
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4096, 'pass-through', 'Pass-Through', '默认', 1, 1, 1, 154); INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4096, 'pass-through', 'Pass-Through', '默认', 1, 1, 1, 154);

8
src/main/webapp/WEB-INF/include/excel/importModal.jsp
View File

@@ -1,9 +1,9 @@
<%@ page contentType="text/html;charset=UTF-8"%> <%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%> <%@ include file="/WEB-INF/include/taglib.jsp"%>
<style> <style>
.radio-inline{ .radio-inline{
margin-left: 10px; margin-left: 10px;
} }
</style> </style>
<script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script>
<div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true"> <div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
@@ -56,13 +56,13 @@
<c:if test="${dict.itemCode eq service.action }"> <c:if test="${dict.itemCode eq service.action }">
<!-- 拦截策略 --> <!-- 拦截策略 -->
<c:if test="${service.functionId eq 200 }"> <c:if test="${service.functionId eq 200 }">
<c:if test="${service.action eq 1 }"> <c:if test="${service.action eq 2 }">
<spring:message code="intercept"/> <spring:message code="intercept"/>
</c:if> </c:if>
<c:if test="${service.action eq 128 }"> <c:if test="${service.action eq 128 }">
<spring:message code="bypass"/> <spring:message code="bypass"/>
</c:if> </c:if>
<c:if test="${service.action ne 1 && service.action ne 128}"> <c:if test="${service.action ne 2 && service.action ne 128}">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:if> </c:if>

14
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -136,7 +136,7 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
}); });
$("input[name$='exprType']").attr("disabled",false); $("input[name$='exprType']").attr("disabled",false);
if(actionValue==1){ //监测 if(actionValue==2){ //转发
$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); $(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
@@ -375,8 +375,8 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
interceptReplacePktBin=serviceRegionTypeValue; interceptReplacePktBin=serviceRegionTypeValue;
} }
}); });
if(action==1){ if(action==2){
//监测 //转发
$(".monitAction").removeClass("hidden"); $(".monitAction").removeClass("hidden");
$(".ratelimitAction").addClass("hidden"); $(".ratelimitAction").addClass("hidden");
$(".replaceAction").addClass("hidden"); $(".replaceAction").addClass("hidden");
@@ -579,8 +579,8 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
value="${service.action }" class="required action" value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>> <c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action eq 1) }"> <c:if test="${(dict.itemCode eq service.action) && (service.action eq 2) }">
<spring:message code="forward"/> <spring:message code="intercept"/>
</c:if> </c:if>
<c:if test="${(dict.itemCode eq service.action) && (service.action eq 128) }"> <c:if test="${(dict.itemCode eq service.action) && (service.action eq 128) }">
<spring:message code="bypass"/> <spring:message code="bypass"/>
@@ -588,7 +588,7 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
<c:if test="${(dict.itemCode eq service.action) && (service.action eq 48) }"> <c:if test="${(dict.itemCode eq service.action) && (service.action eq 48) }">
<spring:message code="Spoofing"/> <spring:message code="Spoofing"/>
</c:if> </c:if>
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 1 && service.action ne 128 && service.action ne 48 ) }"> <c:if test="${(dict.itemCode eq service.action) && (service.action ne 2 && service.action ne 128 && service.action ne 48 ) }">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
@@ -625,7 +625,7 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
</div> </div>
<!-- dolog end--> <!-- dolog end-->
<%-- action 为1 监测时 可以选择证书--%> <%-- action 为2 转发时 可以选择证书--%>
<h4 class="form-section monitAction"> <h4 class="form-section monitAction">
<spring:message code="action_region" /> <spring:message code="action_region" />
<small></small> <small></small>

8
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -256,10 +256,10 @@
<form:select id="actionSelect" path="action" class="selectpicker select2 input-small" > <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option> <form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${serviceList}" var="service"> <c:forEach items="${serviceList}" var="service">
<c:if test="${service.action eq 1}"> <c:if test="${service.action eq 2}">
<form:option value="${service.action }"><spring:message code="intercept"/></form:option> <form:option value="${service.action }"><spring:message code="intercept"/></form:option>
</c:if> </c:if>
<c:if test="${service.action ne 1}"> <c:if test="${service.action ne 2}">
<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option> <form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
</c:if> </c:if>
</c:forEach> </c:forEach>
@@ -515,7 +515,7 @@
<td>${indexCfg.compileId }</td> <td>${indexCfg.compileId }</td>
<td>${indexCfg.cfgDesc }</td> <td>${indexCfg.cfgDesc }</td>
<td> <td>
<c:if test="${indexCfg.action eq 1}"> <c:if test="${indexCfg.action eq 2}">
<spring:message code="intercept"/> <spring:message code="intercept"/>
</c:if> </c:if>
<c:if test="${indexCfg.action eq 128}"> <c:if test="${indexCfg.action eq 128}">
@@ -524,7 +524,7 @@
<c:if test="${indexCfg.action eq 48}"> <c:if test="${indexCfg.action eq 48}">
<spring:message code="action_spoofing"/> <spring:message code="action_spoofing"/>
</c:if> </c:if>
<c:if test="${(indexCfg.action ne 1) && (indexCfg.action ne 128) && (indexCfg.action ne 48)}"> <c:if test="${(indexCfg.action ne 2) && (indexCfg.action ne 128) && (indexCfg.action ne 48)}">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.action }"> <c:if test="${dict.itemCode eq indexCfg.action }">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>