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

（1）BaseStringCfg 类修改为BaseStringCfg<T>,加入泛型。所有继承BaseStringCfg的类均已经修改泛型。

Browse Source 
（2）HttpUrlCfg新增ratelimit一列，用于域名限速。
（3）域名限速新增/修改增加限速比例一列，列表展示新增限速比例一列。
（4）审核自定义域域名拦截与域名限速进行调整。
（5）删除MultipleCfg以及相关的dao，service
（6StringCfgService重命名为DomainService,其不具备字符串配置都能调用的功能
This commit is contained in:
wangxin
2018-06-29 12:44:33 +08:00
parent 25bb850d47
commit b30e88c3b8
48 changed files with 715 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
View File

@@ -52,7 +52,11 @@
</script>
</head>
<body>
<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
<c:if test="${sfi.itemCode==_cfg.functionId}">
<c:set var="specialFunctionId" value="${sfi.itemValue}"/>
</c:if>
</c:forEach>
<div class="page-content">
<h3 class="page-title">
@@ -76,7 +80,7 @@
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form id="cfgFrom"
action="${ctx}/proxy/intercept/saveOrUpdate" method="post"
action="${ctx}${urlPrefix}/saveOrUpdate" method="post"
class="form-horizontal">
<input type="hidden" name="cfgName" value="${cfgName}">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
@@ -146,7 +150,7 @@
</div>
</c:if>
</div>
<div class="row">
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
@@ -190,7 +194,7 @@
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6">
<select name="matchMethod" class="selectpicker select2 form-control required" >
@@ -203,6 +207,19 @@
</div>
</div>
</div>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit">
</div>
<div for="ratelimit"></div>
</div>
</div>
</div>
</c:if>
</div>
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

16
src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
View File

@@ -49,7 +49,11 @@
</script>
</head>
<body>
<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
<c:if test="${sfi.itemCode==cfg.functionId}">
<c:set var="specialFunctionId" value="${sfi.itemValue}"/>
</c:if>
</c:forEach>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
@@ -205,6 +209,9 @@
<th><spring:message code="match_method"/></th>
<th><spring:message code="whether_hexbinary"/></th>
<th><spring:message code="whether_area_block"/></th>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
<th><spring:message code="ratelimit"/></th>
</c:if>
<th><spring:message code="letter"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="attribute"/></th>
@@ -238,7 +245,6 @@
</c:forEach>
</td>
<td>
${cfg.exprType}
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="expressionC">
<c:if test="${cfg.exprType eq expressionC.itemCode}"><spring:message code="${expressionC.itemValue }"/></c:if>
</c:forEach>
@@ -263,6 +269,12 @@
</c:if>
</c:forEach>
</td>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
<td>
<c:if test="${cfg.ratelimit eq null}">0%</c:if>
<c:if test="${cfg.ratelimit ne null}">${cfg.ratelimit}%</c:if>
</td>
</c:if>
<td>
${cfg.requestName }
</td>