Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
DuanDongmei
2018-11-22 09:23:46 +08:00
55 changed files with 323 additions and 133 deletions

View File

@@ -104,7 +104,7 @@
<form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code='asn_ip_group'/></form:option>
<c:forEach items="${policyGroups}" var="policyGroup">
<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
</c:forEach>
</form:select>
</div>

View File

@@ -151,7 +151,7 @@
<shiro:hasPermission name="app:domain:config">
<sys:delRow url="${ctx}/app/domainCfgForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/app/updateAppDomainCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/app/exportDomain?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/domainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/app/exportDomain?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/domainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="app:domain:confirm">
<div class="btn-group">

View File

@@ -152,7 +152,7 @@
<shiro:hasPermission name="app:http:config">
<sys:delRow url="${ctx}/app/httpCfgForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/app/updateAppHttpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/app/exportAppHttp?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/httpCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/app/exportAppHttp?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/httpCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="app:http:confirm">
<div class="btn-group">

View File

@@ -155,7 +155,7 @@
<shiro:hasPermission name="app:ip:config">
<sys:delRow url="${ctx}/app/ipCfgForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/app/updateAppIpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/app/exportAppIp?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/ipCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/app/exportAppIp?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/ipCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="app:ip:confirm">
<div class="btn-group">

View File

@@ -201,7 +201,7 @@
<shiro:hasPermission name="${configPermissionName }">
<sys:delRow url="${ctx}/app/feature/multiFeatureCfgForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/app/feature/updateAppFeatureCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/app/feature/exportFeature?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/feature/multiFeatureCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/app/feature/exportFeature?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/feature/multiFeatureCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="${confirmPermissionName }">
<div class="btn-group">

View File

@@ -215,7 +215,7 @@
<shiro:hasPermission name="app:policy:config">
<sys:delRow url="${ctx}/app/policyCfgForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/app/updateAppPolicyCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/app/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/policyCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/app/exportIpAddr?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/policyCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="app:policy:confirm">
<div class="btn-group">

View File

@@ -134,7 +134,7 @@
<shiro:hasPermission name="app:ssl:config">
<sys:delRow url="${ctx}/app/sslCfgForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/app/updateAppSslCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/app/exportAppSsl?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/sslCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/app/exportAppSsl?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/sslCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="app:ssl:confirm">
<div class="btn-group">

View File

@@ -132,7 +132,7 @@
<shiro:hasPermission name="app:topic:config">
<sys:delRow url="${ctx}/app/topicDomainCfgForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/app/updateAppTopicDomainCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/app/exportTop?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/app/topicDomainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/app/exportTop?functionId=${cfg.functionId }" searchUrl="${ctx}/app/topicDomainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="app:domain:confirm">
<div class="btn-group">

View File

@@ -213,7 +213,7 @@
<shiro:hasPermission name="avVoip:config">
<sys:delRow url="${ctx}/ntc/av/contUrlForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/updateAvContUrlValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/exportStream?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/av/contUrlList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/exportStream?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/contUrlList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
<shiro:hasPermission name="avVoip:confirm">

View File

@@ -5,16 +5,16 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function(){
var ifSubmit=true;
var sfd = $("#functionId").val();
var fileType=[];
if(sfd==28||sfd==630){
fileType=["mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","m4b","webm","ogv","wav","mp3"];
}
if(sfd==29||sfd==631){
if(sfd==29){
fileType=["mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","m4b","webm","ogv"];
}
if(sfd==30||sfd==632){
if(sfd==30||sfd==632||sfd==631){
fileType=["bmp","jpg","tiff","raw","gif"];
}
if(sfd==31){
@@ -45,9 +45,9 @@ $(function(){
$("#srcFile").trigger("click");
});
$("#srcFile").on('change',function(){
if(sampleFileValidate(fileType,$("#srcFile").val())){
if(sfd!=632&&sampleFileValidate(fileType,$("#srcFile").val())){
//样例文件类型正确进行后续处理
$("#srcFileInfo").val($("#srcFile").val());
var videoToPicture = $("#videoToPicture").val();
@@ -74,6 +74,65 @@ $(function(){
var url = "${ctx}/ntc/av/sample/selectVedioPicture?picFilePath="+encodeURIComponent(data.picFilePath);
//openPicWindow(url);
}else{
// alert(data.msg);
top.$.jBox.tip(data.msg, "<spring:message code='info'/>");
return;
}
},
error:function(jqXHR, textStatus, errorThrown){
top.$.jBox.closeTip();
//alert(jqXHR.responseText);
top.$.jBox(jqXHR.responseText,{
width: $(document).width()*0.9,
height:$(document).height()*0.8,
top: '10%',
draggable:false,
title: "Error Info", buttons:{ "close":true}
});
return false;
}
});
}
}
// 人脸识别
if(sfd==632){
var files = $(this)[0].files;
for(var i = 0;i < files.length;i ++) {
var file = files[i];
var faceName = file.name;
var vals=sampleFileValidate(fileType,faceName)
if (!vals){
ifSubmit=false;
return;
}else{
ifSubmit=true;
}
}
if(ifSubmit){
$("#srcFileInfo").val($("#srcFile").val());
var srcFacePath =$("#srcPath").val();
var fd = new FormData($('#cfgFrom')[0]);
$.ajax({
url: "${ctx}/ntc/av/sample/faceToPicture",
type: "POST",
processData: false,
contentType: false,
data: fd,
async: true,
cache: false,
beforeSend: function(){
loading('onloading...');
},
success: function(data) {
top.$.jBox.closeTip();
if(data.status==1){
$("#picPath").val(data.picFilePath);
$("#srcPath").val(data.srcPath);
$("#showPicture").removeClass("hidden");
var url = "${ctx}/ntc/av/sample/selectVedioPicture?picFilePath="+encodeURIComponent(data.picFilePath);
//openPicWindow(url);
}else{
alert(data.msg);
}
@@ -91,8 +150,8 @@ $(function(){
return false;
}
});
}
}
}
});
/* $("#uploadSample,#sampleFileInfo").on('click',function(){
$("#sampleFile").trigger("click");
@@ -127,8 +186,13 @@ $(function(){
var srcFile = $("#srcFile").val();
if(srcFile!=''){
if(!sampleFileValidate(fileType,srcFile)){
if(!ifSubmit){
$("#fileErrorNote").append("<label id='level-error' class='error'><spring:message code='file_in_wrong_format'/></label>");
return false;
}else{
if(!sampleFileValidate(fileType,srcFile)){
return false;
}
}
}
@@ -137,7 +201,7 @@ $(function(){
var srcPath = $("#srcPath").val();
//var sampleUrl = $("#sampleUrl").val();
var videoToPicture = $("#videoToPicture").val();
if(videoToPicture=="true"){
if(videoToPicture=="true"&&sfd!=632){
if((srcUrl==null||srcUrl=="") && (srcPath==null || srcPath=="")){//srcUrl判断修改时未重新上传文件srcPath判断修改时重新上传文件但未选择关键帧图片
$("div[for='srcFileInfo']").append("<label id='level-error' class='error' for='srcFile'><spring:message code='keyframe_pic_required'></spring:message></label>");
return false;
@@ -204,7 +268,6 @@ function hiddenlevel(){
// 校验文件后缀名
function sampleFileValidate(fileType,fileName){
var flag=false; //状态,检测文件后缀用
var arr=fileType;//使用是什么格式的后缀
var cFile=fileName;//文件的值
@@ -306,12 +369,14 @@ function sampleFileValidate(fileType,fileName){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_file"/></label>
<div class="col-md-6">
<%-- <input class="form-control required" type="text" name="srcUrl" value="${_cfg.srcUrl }"> --%>
<input id="srcFile" type="file" name="srcFile" style="width: 330px;display:none" />
<c:if test="${_cfg.functionId != 632}">
<input id="srcFile" type="file" name="srcFile" style="width: 330px;display:none" />
</c:if>
<c:set var="videoToPicture" value="${fns:getDictLabel('VIDEO_TO_PICTURE', _cfg.functionId, 'false')}" />
<input type="hidden" name="videoToPicture" id="videoToPicture" value="${videoToPicture }">
<c:choose>
<c:when test="${videoToPicture}">
<c:when test="${videoToPicture and _cfg.functionId != 632}">
<input id="srcPath" name="srcPath" type="hidden" style="width: 330px;" />
<div class="input-group">
<input id="srcFileInfo" name="srcFileInfo" readonly="readonly" data-msg-required=""
@@ -328,6 +393,26 @@ function sampleFileValidate(fileType,fileName){
<i class="fa btn-search"></i>
<spring:message code="show"></spring:message></button>
</c:when>
<c:when test="${_cfg.functionId eq 632}">
<input id="srcFile" type="file" name="srcFile" style="width: 330px;display:none" multiple/>
<input id="srcPath" name="srcPath" type="hidden" style="width: 330px;"/>
<div class="input-group">
<input id="srcFileInfo" name="srcFileInfo" readonly="readonly" data-msg-required=""
placeholder="<spring:message code="select_file"/>" class="required form-control" style=" background-color:transparent"
aria-required="true" type="text" value="${_cfg.srcUrl }">
<div class="input-group-btn">
<a id="uploadSrc" class="btn btn-default btn-search " href="javascript:" style=""><i class="fa fa-search"></i></a>
</div>
</div>
<input id="srcUrl" name="srcUrl" type="hidden" value="${_cfg.srcUrl }"/>
<button type="button" id="showPicture" class="btn btn-warning hidden ">
<i class="fa btn-search"></i>
<spring:message code="show"></spring:message></button>
</c:when>
<c:otherwise>
<div class="input-group">
<input id="srcFileInfo" name="srcFileInfo" readonly="readonly" data-msg-required=""

View File

@@ -137,7 +137,7 @@
<shiro:hasPermission name="avFileSample:config">
<sys:delRow url="${ctx}/ntc/av/sample/fileSampleForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/sample/updateAvFileSampleValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/ntc/av/exportYsp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<%-- <sys:delRow url="${ctx}/ntc/av/exportYsp?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
--%> </shiro:hasPermission>
<shiro:hasPermission name="avFileSample:confirm">
<div class="btn-group">

View File

@@ -205,7 +205,7 @@
<shiro:hasPermission name="avVoip:config">
<sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/exportVoip?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/av/voipList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/exportVoip?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/voipList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
<shiro:hasPermission name="avVoip:confirm">

View File

@@ -218,7 +218,7 @@
<shiro:hasPermission name="basicprotocol:config">
<sys:delRow url="${ctx}/basicprotocol/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/basicprotocol/updateValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/basicprotocol/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/basicprotocol/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/basicprotocol/exportIpAddr?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/basicprotocol/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="basicprotocol:confirm">
<div class="btn-group">

View File

@@ -197,7 +197,7 @@
<shiro:hasPermission name="${requiresPermissionPrefix.concat(':config')}">
<sys:delRow url="${ctx}${urlPrefix}/form?functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}${urlPrefix}/delete?functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}${urlPrefix}/export?functionId=${cfg.functionId}&audit=${audit}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
<sys:delRow url="${ctx}${urlPrefix}/export?functionId=${cfg.functionId}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="${requiresPermissionPrefix.concat(':confirm')}">
<div class="btn-group">

View File

@@ -55,14 +55,14 @@
<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="userRegion2" class="selectpicker show-tick form-control">
<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>
<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="userRegion2"></div>
<div for="userRegion1"></div>
</div>
</div>
</c:if>

View File

@@ -164,7 +164,7 @@
<shiro:hasPermission name="ddos:ip:config">
<sys:delRow url="${ctx}/manipulation/ddos/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ddos/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ddos/exportDdos?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/manipulation/ddos/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ddos/exportDdos?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ddos/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="ddos:ip:confirm">
<div class="btn-group">

View File

@@ -161,7 +161,7 @@
<shiro:hasPermission name="dns:fake:ip:config">
<sys:delRow url="${ctx}/cfg/dnsIp/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/cfg/dnsIp/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/cfg/dnsIp/exportDnsIp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/cfg/dnsIp/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/cfg/dnsIp/exportDnsIp?functionId=${cfg.functionId }" searchUrl="${ctx}/cfg/dnsIp/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="dns:fake:ip:confirm">
<div class="btn-group">

View File

@@ -215,7 +215,7 @@
<shiro:hasPermission name="encryptedtunnelbehav:config">
<sys:delRow url="${ctx}/encryptedtunnelbehav/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/encryptedtunnelbehav/updateValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/encryptedtunnelbehav/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/encryptedtunnelbehav/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/encryptedtunnelbehav/exportIpAddr?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/encryptedtunnelbehav/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="encryptedtunnelbehav:confirm">
<div class="btn-group">

View File

@@ -214,7 +214,7 @@
<shiro:hasPermission name="fileTransfer:fileDigest:config">
<sys:delRow url="${ctx}/ntc/fileTransfer/fileDigestForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/fileTransfer/updateFileDigestValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/ntc/fileTransfer/exportFile?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/fileTransfer/fileDigestList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<%-- <sys:delRow url="${ctx}/ntc/fileTransfer/exportFile?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/fileTransfer/fileDigestList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
--%> </shiro:hasPermission>
<shiro:hasPermission name="fileTransfer:fileDigest:confirm">
<div class="btn-group">

View File

@@ -186,7 +186,7 @@
<shiro:hasPermission name="fileTransfer:ftp:config">
<sys:delRow url="${ctx}/ntc/fileTransfer/ftpForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/fileTransfer/updateFtpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/fileTransfer/exportftp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/fileTransfer/ftpList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/fileTransfer/exportftp?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/fileTransfer/ftpList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="fileTransfer:ftp:confirm">
<div class="btn-group">

View File

@@ -200,7 +200,7 @@
<shiro:hasPermission name="fileTransfer:p2p:config">
<sys:delRow url="${ctx}/ntc/fileTransfer/p2pForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/fileTransfer/updateP2pCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/fileTransfer/exportP2p?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/fileTransfer/p2pList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/fileTransfer/exportP2p?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/fileTransfer/p2pList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="fileTransfer:p2p:confirm">
<div class="btn-group">

View File

@@ -112,7 +112,7 @@
<label><spring:message code='p2p_ip_config_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('P2P_IP_TYPE')}" var="ipType">
<c:if test="${_cfg.ipPortList[0].userRegion1==ipType.itemCode}"><spring:message code="${ipType.itemValue}"/></c:if>
<c:if test="${_cfg.userRegion2==ipType.itemCode}"><spring:message code="${ipType.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -139,7 +139,7 @@
<div class="form-group">
<label><spring:message code='p2p_hash_type' />:</label><label>
<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
<c:if test="${_cfg.p2pHashList[0].userRegion1==hashType.itemCode}"><spring:message code="${hashType.itemValue}"/></c:if>
<c:if test="${_cfg.userRegion1==hashType.itemCode}"><spring:message code="${hashType.itemValue}"/></c:if>
</c:forEach>
</label>
</div>

View File

@@ -123,7 +123,7 @@
<shiro:hasPermission name="proxy:intercept:config">
<sys:delRow url="${ctx}/proxy/intercept/strateagy/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/proxy/intercept/strateagy/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/proxy/intercept/strateagy/exportPxy?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/proxy/intercept/strateagy/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/proxy/intercept/strateagy/exportPxy?functionId=${cfg.functionId }" searchUrl="${ctx}/proxy/intercept/strateagy/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="proxy:intercept:confirm">
<div class="btn-group">

View File

@@ -38,14 +38,14 @@
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="p2p_ip_config_type"/></label>
<div class="col-md-6">
<select name=userRegion1 class="selectpicker show-tick form-control required">
<select name="userRegion2" class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('P2P_IP_TYPE')}" var="ipType">
<option value="${ipType.itemCode}" <c:if test="${_cfg.ipPortList[0].userRegion1==ipType.itemCode}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
<option value="${ipType.itemCode}" <c:if test="${_cfg.userRegion2==ipType.itemCode}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion1"></div>
<div for="userRegion2"></div>
</div>
</div>
</div>

View File

@@ -57,6 +57,13 @@
$("[class~='boxSolid'][class~='ipPortList']").find(".glyphicon-remove").click();
processAction(isAsn,$(".asn"));
}
//隐藏显示asn
if($("[name='action']:checked").val()==32||$("[name='action']:checked").val()==64){
console.log(111);
$("h4.form-section.asn").addClass("hidden");
}else{
$("h4.form-section.asn").removeClass("hidden");
}
$(".glyphicon-plus").on("click",function(){
if($(this).hasClass("ipPortList")){
isAsn=0;
@@ -137,6 +144,12 @@
}
} */
//隐藏显示asn
if($(this).val()==32||$(this).val()==64){
$("h4.form-section.asn").addClass("hidden");
}else{
$("h4.form-section.asn").removeClass("hidden");
}
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -663,7 +676,7 @@ var showHideIPSECProtocol=function(obj){
</c:if>
<c:if test="${region.regionType eq 7 }">
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
<h4 class="form-section">
<h4 class="form-section asn">
<spring:message code="${region.configRegionValue}" />
<small> <span
class="glyphicon glyphicon-plus asn ${tabName}Add"

View File

@@ -201,7 +201,7 @@
<shiro:hasPermission name="mail:config">
<sys:delRow url="${ctx}/ntc/mail/mailForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/mail/updateMailCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/mail/exportmail?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/mail/mailList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/mail/exportmail?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/mail/mailList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="mail:confirm">
<div class="btn-group">

View File

@@ -145,7 +145,7 @@
<shiro:hasPermission name="dns:res:strategy:config">
<sys:delRow url="${ctx}/maintenance/dnsResStrategy/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/dnsResStrategy/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/dnsResStrategy/exportDns?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/maintenance/dnsResStrategy/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/dnsResStrategy/exportDns?functionId=${cfg.functionId }" searchUrl="${ctx}/maintenance/dnsResStrategy/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="dns:res:strategy:confirm">
<div class="btn-group">

View File

@@ -129,7 +129,7 @@
<shiro:hasPermission name="ip:mulitiplex:pool:config">
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportDnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportDnat?functionId=${cfg.functionId }" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="ip:mulitiplex:pool:confirm">
<div class="btn-group">

View File

@@ -147,7 +147,7 @@
<shiro:hasPermission name="ip:mulitiplex:pool:config">
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snatform" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snatdelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportSnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/snatlist?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/snatlist?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="ip:mulitiplex:pool:confirm">
<div class="btn-group">

View File

@@ -129,7 +129,7 @@
<shiro:hasPermission name="dnat_policy:config">
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/dnatPolicyForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/dnatDelete?functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportDnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportDnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="dnat_policy:confirm">
<div class="btn-group">

View File

@@ -129,7 +129,7 @@
<shiro:hasPermission name="snat_policy:config">
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatPolicyForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatDelete?functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="snat_policy:confirm">
<div class="btn-group">

View File

@@ -200,7 +200,7 @@
<shiro:hasPermission name="other:bgp:config">
<sys:delRow url="${ctx}/ntc/other/bgpForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/other/updateBgpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/other/exportbgp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/other/bgpList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/other/exportbgp?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/other/bgpList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="other:bgp:confirm">
<div class="btn-group">

View File

@@ -180,7 +180,7 @@
<shiro:hasPermission name="${configPermissionName }">
<sys:delRow url="${ctx}/proxy/cache/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/proxy/cache/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/proxy/cache/exportHttp?functionId=${cfg.functionId }&audit=${audit}" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow>
<sys:delRow url="${ctx}/proxy/cache/exportHttp?functionId=${cfg.functionId }" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="${confirmPermissionName }">
<div class="btn-group">

View File

@@ -385,7 +385,7 @@
<shiro:hasPermission name="${configPermissionName }">
<sys:delRow url="${ctx}/proxy/control/httpRedirect/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/proxy/control/httpRedirect/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/proxy/control/httpRedirect/exportHttp?functionId=${cfg.functionId }&audit=${audit}" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow>
<sys:delRow url="${ctx}/proxy/control/httpRedirect/exportHttp?functionId=${cfg.functionId }" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="${confirmPermissionName }">
<div class="btn-group">

View File

@@ -198,7 +198,7 @@
<shiro:hasPermission name="website:dns:config">
<sys:delRow url="${ctx}/ntc/website/dnsForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/updateDnsCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/exportdns?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/website/dnsList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/exportdns?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/website/dnsList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="website:dns:confirm">
<div class="btn-group">

View File

@@ -356,7 +356,7 @@
<shiro:hasPermission name="website:http:config">
<sys:delRow url ="${ctx}/ntc/website/httpForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/updateHttpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/exportHttp?functionId=${cfg.functionId }&audit=${audit}" id="contentTable" searchUrl="${ctx}/ntc/website/httpList?functionId=${cfg.functionId}" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/exportHttp?functionId=${cfg.functionId }" id="contentTable" searchUrl="${ctx}/ntc/website/httpList?functionId=${cfg.functionId}" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="website:http:confirm">
<div class="btn-group">

View File

@@ -197,7 +197,7 @@
<shiro:hasPermission name="website:ssl:config">
<sys:delRow url="${ctx}/ntc/website/sslForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/updateSslCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/exportSsl?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/website/sslLists?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/website/exportSsl?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/website/sslLists?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="website:ssl:confirm">
<div class="btn-group">

View File

@@ -178,7 +178,7 @@
<shiro:hasPermission name="whitelist:domain:config">
<sys:delRow url="${ctx}/ntc/whitelist/domain/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/domain/updateValid?isValid=-1&functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/exportdomain?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/whitelist/domain/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/exportdomain?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/whitelist/domain/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="whitelist:domain:confirm">
<div class="btn-group">

View File

@@ -198,7 +198,7 @@
<shiro:hasPermission name="whitelist:ip:config">
<sys:delRow url="${ctx}/ntc/whitelist/ip/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/updateIpValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/whitelist/ip/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="export"></sys:delRow>
<sys:delRow url="${ctx}/ntc/whitelist/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/whitelist/ip/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="whitelist:ip:confirm">
<div class="btn-group">

View File

@@ -329,6 +329,9 @@ background:#3d3d3d;
<li>
<a href="javascript:refreshCache('functionRegionDict')">refresh function region</a>
</li>
<li>
<a href="javascript:refreshCache('asnNoCache')">refresh ASN no</a>
</li>
</ul>
</li>
</c:if>