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

批量下发功能增加，delRow.tag中暂时不打开此功能。

Browse Source 
app topic domain和app domain业务修改domain存储cfgkeyword属性。
摘要修改level属性存储为下发的最终数值。
同步的单域配置的增加时间和状态属性从entity中获取
This commit is contained in:
DuanDongmei
2018-12-05 17:56:41 +08:00
parent e5fa7cbca8
commit bb302e3f13
37 changed files with 2406 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -120,13 +120,23 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
if(validateAllNoAudit(checkboxes)){
top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
return;
}else{
}else{
doAll(checkboxes,url);
}
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
}else{
/* 批量下发待测试
if(url.indexOf("functionId") > -1){
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='approved_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
}else{ */
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
/* } */
}
}
//未通过
function noPassOpt(url){
@@ -184,8 +194,18 @@ function cancelPassOpt(url){
}
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
/* 批量下发待测试
if(url.indexOf("functionId") > -1){
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='cancle_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
}else{ */
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
/* } */
}
}
function doAll(checkboxes,url){

6
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -133,10 +133,10 @@ $(function(){
<spring:message code="domain" /></label>
<div class="col-md-6">
<input class="form-control required domainCheck" type="text"
name="domain"
value="${_cfg.domain}">
name="cfgKeywords"
value="${_cfg.cfgKeywords}">
</div>
<div for="domain"></div>
<div for="cfgKeywords"></div>
</div>
</div>
<div class="col-md-6 hidden">

8
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
View File

@@ -10,8 +10,8 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.domain}"){
$("#intype").val("${cfg.domain}");
}else if("${cfg.cfgKeywords}"){
$("#intype").val("${cfg.cfgKeywords}");
}else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}");
}else{
@@ -124,7 +124,7 @@
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="domain"><spring:message code="domain"></spring:message></form:option>
<form:option value="cfgKeywords"><spring:message code="domain"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
@@ -338,7 +338,7 @@
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.appName }</td>
<td title="${cfg.domain }">${fns:abbr(cfg.domain,20)}</td>
<td title="${cfg.cfgKeywords }">${fns:abbr(cfg.cfgKeywords,20)}</td>
<c:if test="${cfg.isHexbin==0 }">
<td><spring:message code="not_hex"/></td>
<td><spring:message code="case_insenstive"/></td>

18
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
View File

@@ -66,7 +66,7 @@ $(function(){
$("#domain").selectpicker("show");//显示选择框
}
}); */
if('${_cfg.domain}'){
if('${_cfg.cfgKeywords}'){
ajaxDomain($("#websiteServiceId").val(),$("#topicId").val());
}
//选择主题跟服务 查询域名
@@ -85,10 +85,10 @@ $(function(){
$("#selectDomain").on("change",function(){
var domain =$("#selectDomain").val();
if(domain!=null&&domain!=''){
$("input[name='domain']").val(domain);
$("input[name='cfgKeywords']").val(domain);
}
});
$("input[name='domain']").val('${_cfg.domain}');
$("input[name='cfgKeywords']").val('${_cfg.cfgKeywords}');
});
@@ -103,15 +103,15 @@ $(function(){
async:true,
success:function(data,textStatus){//处理返回结果
if(textStatus=="success"){
var html='<select name="domain" data-live-search="true" class="selectpicker form-control">'
var html='<select name="cfgKeywords" data-live-search="true" class="selectpicker form-control">'
+'<option value=""><spring:message code="select"/></option>';
if(data.length>0){
for(i=0;i<data.length;i++){
html+='<option value="'+data[i].domain+'"';
if('${_cfg.domain}'==data[i].domain){
html+='<option value="'+data[i].cfgKeywords+'"';
if('${_cfg.cfgKeywords}'==data[i].cfgKeywords){
html+=" selected";
}
html+='>'+data[i].domain+'</option>';
html+='>'+data[i].cfgKeywords+'</option>';
}
html+='</select>';
$("#selectDomain").html(html);
@@ -331,9 +331,9 @@ $(function(){
</select>
</div>
<div class="col-md-3">
<input id="domain" name="domain" class="form-control required domainCheck" type="text" value="">
<input id="domain" name="cfgKeywords" class="form-control required domainCheck" type="text" value="">
</div>
<div for="domain"></div>
<div for="cfgKeywords"></div>
</div>
<%-- <div class="col-md-5"><label class="col-md-4"></label><font style="papadding-left: 10px" color="red">*</font>
<select id="response" class="selectpicker select2 input-small pull-right">

8
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
View File

@@ -10,8 +10,8 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.domain}"){
$("#intype").val("${cfg.domain}");
}else if("${cfg.cfgKeywords}"){
$("#intype").val("${cfg.cfgKeywords}");
}else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}");
}else{
@@ -105,7 +105,7 @@
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="domain"><spring:message code="domain"></spring:message></form:option>
<form:option value="cfgKeywords"><spring:message code="domain"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
@@ -333,7 +333,7 @@
</c:if>
</c:forEach>
</td>
<td title="${cfg.domain }">${fns:abbr(cfg.domain,20)}</td>
<td title="${cfg.cfgKeywords }">${fns:abbr(cfg.cfgKeywords,20)}</td>
<c:if test="${cfg.isHexbin==0 }">
<td><spring:message code="not_hex"/></td>
<td><spring:message code="case_insenstive"/></td>

9
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
View File

@@ -417,7 +417,14 @@
</a>
</td>
<td>${indexCfg.rawLen }（B）</td>
<td>${indexCfg.cfdsLevel }</td>
<td>
<c:if test="${indexCfg.cfdsLevel > 1 && indexCfg.cfdsLevel <= 10}">
${(indexCfg.cfdsLevel*10)}
</c:if>
<c:if test="${indexCfg.cfdsLevel eq 1 || indexCfg.cfdsLevel > 10}">
${indexCfg.cfdsLevel }
</c:if>
</td>
<td>
<a href="${indexCfg.fileUrl }" target="_blank" data-original-title="${indexCfg.fileUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">