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

1.修改国际化；

Browse Source 
2.修改app策略，基础协议，隧道行为配置的block动作描述；
3.提交app特征引用的表单jsp
This commit is contained in:
zhangwei
2019-01-14 20:38:49 +06:00
parent fa62e1a6b2
commit d34816b500
11 changed files with 553 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

490
src/main/webapp/WEB-INF/views/cfg/app/appCommonFeature.jsp Normal file
View File

@@ -0,0 +1,490 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title></title>
</head>
<%-- <c:forEach items="${regionList}" var="regionDistrict">
<c:if
test="${cfg.functionId eq regionDistrict.functionId
and regionDistrict.regionType eq 3
and regionValue eq regionDistrict.configRegionValue}"> --%>
<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configMultiKeywords }">
<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
<%-- </c:if>
</c:forEach> --%>
<div class="row">
<div class="pull-right">
<span class="glyphicon glyphicon-remove pull-right" title="remove"
onClick="delContent('${tabName}${status.index}','${tabName}Add');" />
</div>
</div>
<br>
<c:if test="${!empty region.configDistrict }">
<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="district" /></label>
<div class="col-md-6">
<select name="${cfgName}.district"
class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
<c:forEach items="${fn:split(region.configDistrict,',')}"
var="_district">
<option value="${_district }"
<c:if test="${cfg.district==_district}">selected</c:if>>${_district }</option>
</c:forEach>
</select>
<input type="hidden" name="${cfgName}.districtShowName" maxlength="64" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control invisibleChar" value="${cfg.district}"/>
</div>
<div for="${cfgName}.districtShowName"></div>
<div for="${cfgName}.district"></div>
</div>
</div>
</div>
</c:if>
<div class="row keywords">
<c:if test="${isP2pHashCfg}">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
<div class="col-md-6">
<select name="userRegion1" class="selectpicker show-tick form-control">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
<option value="${hashType.itemCode}" <c:if test="${_cfg.userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion1"></div>
</div>
</div>
</c:if>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<c:choose>
<c:when test="${fn:containsIgnoreCase(region.configServiceType,'domain') }">
<spring:message code="domain" />
</c:when>
<c:when test="${fn:containsIgnoreCase(region.configServiceType,'url') }">
<spring:message code="URL" />
</c:when>
<c:otherwise>
<spring:message code="keywords" />
</c:otherwise>
</c:choose>
</label>
<!-- 此配置的关键词可以输入多个关键词 -->
<c:if test="${region.configMultiKeywords eq 1}">
<div class="col-md-6">
<input class="form-control required tags" type="text" id="tags_${tabName}${status.index}"
name="${cfgName}.cfgKeywords"
value="${cfg.cfgKeywords}">
</div>
</c:if>
<!-- 此配置的关键词不允许输入多个关键词 -->
<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
<div class="col-md-6">
<input class="form-control required invisibleChar
<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
"
type="text"
name="${cfgName}.cfgKeywords"
value="${cfg.cfgKeywords}">
</div>
</c:if>
<div for="${cfgName}.cfgKeywords"></div>
</div>
</div>
<c:if test="${serviceId eq 1025}">
<div class="col-md-6 offsetFeature hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="offset" /></label>
<div class="col-md-6">
<input class="form-control required digest" type="text" max="1460"
name="${cfgName}.payloadOffset"
value="${cfg.payloadOffset}">
</div>
<div for="${cfgName}.payloadOffset"></div>
</div>
</div>
</c:if>
<!-- 域名拦截增加拦截强度 -->
<c:if test="${_cfg.functionId eq 200}">
<div class="col-md-6 hidden intensity">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="intercept_intensity" />
</label>
<div class="col-md-6">
<select name="userRegion5"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion5"></div>
</div>
</div>
</c:if>
</div>
<c:if test="${serviceId eq 1025}">
<%-- <div class="row col-md-6 offsetFeature hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="offset" /></label>
<div class="col-md-6">
<input class="form-control required digest" type="text" max="1460"
name="${cfgName}.payloadOffset"
value="${cfg.payloadOffset}">
</div>
<div for="${cfgName}.payloadOffset"></div>
</div>
</div> --%>
<%-- <div class="row offsetFeature hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="keywords" /></label>
<div class="col-md-6">
<input class="form-control required" type="text"
name="${cfgName}.cfgKeywords"
value="${cfg.cfgKeywords}">
</div>
<div for="${cfgName}.cfgKeywords"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="offset" /></label>
<div class="col-md-6">
<input class="form-control required digest" type="text" maxlength="1460"
name="${cfgName}.payloadOffset"
value="${cfg.payloadOffset}">
</div>
<div for="${cfgName}.payloadOffset"></div>
</div>
</div>
</div> --%>
<div class="l3_header_tips"></div>
<div class="row L3_header">
<input class="form-control headerType" type="hidden" name="${cfgName}.headerType" value="${cfg.headerType}">
</div>
<%-- <div class="row IP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="VER" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="4" type="text" name="${cfgName}.ver" value="${cfg.ver}">
</div>
<div for="${cfgName}.ver"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="IHL" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="4" type="text" name="${cfgName}.ihl" value="${cfg.ihl}">
</div>
<div for="${cfgName}.ihl"></div>
</div>
</div>
</div> --%>
<div class="row IP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="TOS" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="2" maxlength="2" type="text" name="${cfgName}.tos" value="${cfg.tos}">
</div>
<div for="${cfgName}.tos"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="Total Length" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="4" type="text" name="${cfgName}.totalLength" value="${cfg.totalLength}">
</div>
<div for="${cfgName}.totalLength"></div>
</div>
</div>
</div>
<div class="row IP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="Protocol" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="2" maxlength="2" type="text" name="${cfgName}.protocol" value="${cfg.protocol}">
</div>
<div for="${cfgName}.protocol"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="client_ip" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8" type="text" name="${cfgName}.fragmentOffset" value="${cfg.fragmentOffset}">
</div>
<div for="${cfgName}.fragmentOffset"></div>
</div>
</div>
</div>
<div class="row IP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="server_ip" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8" type="text" name="${cfgName}.flags" value="${cfg.flags}">
</div>
<div for="${cfgName}.flags"></div>
</div>
</div>
</div>
<div class="row ICMP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="ICMP type" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="2" maxlength="2" type="text" name="${cfgName}.icmpType" value="${cfg.icmpType}">
</div>
<div for="${cfgName}.icmpType"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="ICMP code" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="2" maxlength="2" type="text" name="${cfgName}.icmpCode" value="${cfg.icmpCode}">
</div>
<div for="${cfgName}.icmpCode"></div>
</div>
</div>
</div>
<div class="row ICMP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="ICMP identifier" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="32" type="text" name="${cfgName}.icmpIdentifier" value="${cfg.icmpIdentifier}">
</div>
<div for="${cfgName}.icmpIdentifier"></div>
</div>
</div>
</div>
</c:if>
<div class="row">
<div class="col-md-6 exprType">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="expression_type" /></label>
<div class="col-md-6">
<c:if test="${!empty region.configExprType}">
<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}" varStatus="stat" >
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC" >
<c:if test="${exprTypeC.itemCode eq exprType}">
<label class="radio-inline">
<input type="radio"
name="${cfgName}.exprType" value="${exprType }"
class="required"
<%-- <c:if test="${stat.index == 0 }"> checked </c:if> --%>
<c:if test="${cfg.exprType eq exprType || (empty cfg.exprType && exprType eq 0)}">
checked
</c:if>
>
<spring:message code="${exprTypeC.itemValue }" />
</label>
</c:if>
</c:forEach>
</c:forEach>
</c:if>
<c:if test="${empty region.configExprType}">
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq 0}">
<label class="radio-inline">
<input type="radio"
name="${cfgName}.exprType" value="${exprTypeC.itemCode }"
class="required" checked >
<spring:message code="${exprTypeC.itemValue }" />
</label>
</c:if>
</c:forEach>
</c:if>
</div>
<div for="${cfgName}.exprType"></div>
</div>
</div>
<div class="col-md-6 matchMethod">
<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="${cfgName}.matchMethod"
class="selectpicker select2 form-control required ">
<c:if test="${!empty region.configMatchMethod}">
<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq matchMethod}">
<option value="${matchMethodC.itemCode}"
<c:if test="${cfg.matchMethod eq matchMethod || (empty cfg.matchMethod && matchMethod eq 0)}">
selected
</c:if>
>
<spring:message code="${matchMethodC.itemValue}"/>
</option>
</c:if>
</c:forEach>
</c:forEach>
</c:if>
<c:if test="${empty region.configMatchMethod}">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq 0}">
<option value="${matchMethodC.itemCode}"
selected
>
<spring:message code="${matchMethodC.itemValue}"/>
</option>
</c:if>
</c:forEach>
</c:if>
</select>
</div>
<div for="${cfgName}.matchMethod"></div>
</div>
</div>
</div>
<div class="row <c:if test="${fn:length(fn:split(region.configHex,',')) ==1}">hidden</c:if>">
<c:if test="${!empty region.configHex}">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
<div class="col-md-6">
<!-- isP2pHashCfg: P2PHash配置只能是十六进制字符 -->
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="1" class="required"
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="0" class="required"
><spring:message code="not_hex"/>
</label>
</div>
<div for="${cfgName}.isHex"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="1" class="required"
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="${cfgName}.isCaseInsenstive"></div>
</div>
</div>
</c:if>
<c:if test="${empty region.configHex}">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="0" class="required" checked
><spring:message code="not_hex"/>
</label>
</div>
<div for="${cfgName}.isHex"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
checked
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="${cfgName}.isCaseInsenstive"></div>
</div>
</div>
</c:if>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="whether_hexbinary" /></label>
<div class="col-md-6">
<select name="${cfgName}.isHexbin"
class="selectpicker select2 form-control required">
<c:if test="${!empty region.configHex}">
<c:forEach var="isHexbin" items="${fn:split(region.configHex,',')}">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${isHexbinC.itemCode eq isHexbin}">
<option value="${isHexbinC.itemCode}"
<c:if test="${cfg.isHexbin eq isHexbin || (empty isHexbin && isHexbin eq 0)}">
selected
</c:if>
>
<spring:message code="${isHexbinC.itemValue}"/>
</option>
</c:if>
</c:forEach>
</c:forEach>
</c:if>
<c:if test="${empty region.configHex}">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${isHexbinC.itemCode eq 0}">
<option value="${isHexbinC.itemCode}" selected >
<spring:message code="${isHexbinC.itemValue}"/>
</option>
</c:if>
</c:forEach>
</c:if>
</select>
</div>
<div for="${cfgName}.isHexbin"></div>
</div>
</div>
</div>
</html>
<script type="text/javascript">
function changeDistrict(obj){
if("others"==obj.val()){
obj.parent().siblings(".otherValue").prop("type","text");
}else{
obj.parent().siblings(".otherValue").prop("type","hidden");
}
}
</script>

9
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -296,7 +296,14 @@ var delContent = function(contentClassName, addBtnClassName) {
<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:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
<c:choose>
<c:when test="${service.action eq 16}">
<spring:message code="block_drop"/>
</c:when>
<c:otherwise>
<spring:message code="${dict.itemValue }"/>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
</c:if>

9
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
View File

@@ -423,7 +423,14 @@
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">
<spring:message code="${dict.itemValue }"/>
<c:choose>
<c:when test="${cfg.action eq 16}">
<spring:message code="block_drop"/>
</c:when>
<c:otherwise>
<spring:message code="${dict.itemValue }"/>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
</td>

9
src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
View File

@@ -250,7 +250,14 @@ var switchRateLimitType=function(){
<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:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
<c:choose>
<c:when test="${service.action eq 16}">
<spring:message code="block_drop"/>
</c:when>
<c:otherwise>
<spring:message code="${dict.itemValue }"/>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
</c:if>

9
src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
View File

@@ -425,7 +425,14 @@
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">
<spring:message code="${dict.itemValue }"/>
<c:choose>
<c:when test="${cfg.action eq 16}">
<spring:message code="block_drop"/>
</c:when>
<c:otherwise>
<spring:message code="${dict.itemValue }"/>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
</td>

9
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
View File

@@ -278,7 +278,14 @@ var switchRateLimitType=function(){
<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:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
<c:choose>
<c:when test="${service.action eq 16}">
<spring:message code="block_drop"/>
</c:when>
<c:otherwise>
<spring:message code="${dict.itemValue }"/>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
</c:if>

9
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
View File

@@ -423,7 +423,14 @@
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">
<spring:message code="${dict.itemValue }"/>
<c:choose>
<c:when test="${cfg.action eq 16}">
<spring:message code="block_drop"/>
</c:when>
<c:otherwise>
<spring:message code="${dict.itemValue }"/>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
</td>

8
src/main/webapp/WEB-INF/views/help.jsp
View File

@@ -60,16 +60,12 @@ function showHelp(helpHref) {
<spring:message code="${online_help }"></spring:message>
</h3>
<div class="row">
<div class="portlet-body">
<div class="col-md-4">
<div class="col-md-2">
<div id="menuTree" class="ztree" style="margin-top:3px;float:left;"></div>
</div>
<div class="col-md-8 help">
<div class="col-md-10 help">
</div>
</div>
</div>
</div>
</body>