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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

Browse Source 
into develop

Conflicts:
	src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
	src/main/resources/nis.properties
	src/main/webapp/WEB-INF/tags/sys/delRow.tag
	
	asn相关功能更改：
	IP ADDR：增加asn域
	1、新增IP
ADDR可选asn，如果asn未下发过（is_used=0），下发时asn的group需要标记为commonGroup（groupId为asn组织的groupId，regionId为asn的regionId）。
	2、如果所选的asn组(asn组织的groupId)已经下发过（is_used=1），则下发maat时，asn域不需要下发。
	3、策略取消时，如果有需要保留的公共组（commongRroupIds），需要将公共组的组号下发。
	ASN GROUP:
	1、新增asn，如果此asn的组织groupId已下发过（is_used=1），且此组织的groupId已被策略标记过全选（is_audit_all=1），则需要调用公共组域新增的接口，将新增的asn关键字下发。
	2、修改asn，如果此asn的组织groupId已下发过（is_used=1），则需要调用公共组域修改的接口，修改已经下发的asn关键字域。
	3、删除asn，如果此asn的组织groupId已下发过（is_used=1），则需要调用公共组域删除的接口，删除已经下发的asn关键字域。
	ASN IP CFG:
	1、新增asn ip，所选asn no的组首次下发（is_valid=0），需要将asn no的groupId标记为公共组；如果asn
no非首次下发（is_valid=1），直接调用公共组新增域的接口。
	2、修改
		生效状态asn ip修改，调用公共组修改域接口直接修改
	3、失效
		直接调用公共组删除域接口，失效asn ip域
This commit is contained in:
duandongmei
2019-01-16 14:33:29 +06:00
parent db9dd66ab2 e62b5d24be
commit cb9aa36954
174 changed files with 7535 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/static/global/css/page.css
View File

@@ -94,4 +94,8 @@ margin-top: 20px;
/* <20><><EFBFBD><EFBFBD>ʵʱ<CAB5><CAB1><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3>,<2C><>ӡ<EFBFBD><D3A1>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʾ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
.css-print{
display: none;
}
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӵ<EFBFBD> */
.print-title{
font-weight:bold;
}

1116
src/main/webapp/static/global/plugins/highcharts/js/sunburst.js
View File

File diff suppressed because it is too large Load Diff

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -85,6 +85,7 @@
ipMaskSole:"IP already exists.",
noStrategyCheck:"No effective spoofing IP configuration",
keywordLength:"Please enter a value between 4 and 1024 characters long.",
arbitrary:"Arbitrarily"
arbitrary:"Arbitrarily",
log_trend:"Log Trend"
});
}(jQuery));

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
View File

@@ -85,6 +85,7 @@
ipMaskSole:"IP уже существует.",
noStrategyCheck:"No effective spoofing IP configuration",
keywordLength:"Введите между 4 и 1024 символов длинной.",
arbitrary:"Любой"
arbitrary:"Любой",
log_trend:"Журнал Тенденция"
});
}(jQuery));

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
View File

@@ -85,6 +85,7 @@
ipMaskSole:"IP已存在",
noStrategyCheck:"策略组下无有效的欺骗IP配置",
keywordLength:"请输入一个长度介于4 和1024 之间的字符串",
arbitrary:"任意"
arbitrary:"任意",
log_trend:"日志趋势"
});
}(jQuery));

90
src/main/webapp/static/global/scripts/asnRegion.js Normal file
View File

@@ -0,0 +1,90 @@
$(function(){
$('.asnNo').selectpicker({
deselectAllText: $("#deselectAll").text(),
selectAllText: $("#selectAll").text()
});
initAsnOrganazation();
$(".organization").on("change",function(){
getASNNo(this,$(this).val(),$(this).find("option:selected").text().trim());
});
$(".organization").each(function(){
$(this).change();
});
});
/**
* 异步获取ASN组织
*/
var initAsnOrganazation=function(){
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'post',
url:pathName+'/basics/asnGroup/ajaxGetAsnOrg',
data:{"groupType":4},
dataType:'json',
async:false,
success:function (data,textStatus){
if(textStatus=="success"){
$(".organization").each(function(){
$(this).find("option[value!='']").remove();
for(var i in data) {
$(this).append("<option value='"+data[i].groupId+"'>"+data[i].groupName+"</option>");
}
$(this).selectpicker('refresh');
});
}
}
});
/***设定数据库值***/
$(".organization").each(function(){
if($(this).attr("name") != null && $(this).attr("name") != 'undefined'){
var asnObjName = ($(this).attr("name")).split("userRegion1")[0]+"organizationGroupId";
$(this).selectpicker('val',$("input[name='"+asnObjName+"']").val());
$(this).change();
}
});
}
/**
* ASN组织级联获取ASN NO
*/
var getASNNo=function(obj,orgGroupId,orgName){
if($(obj).attr("name") != null && $(obj).attr("name") != 'undefined'){
var asnObjName = ($(obj).attr("name")).split("userRegion1")[0]+"cfgKeywords";
$("select[name='"+asnObjName+"']").find("option").remove();
$("select[name='"+asnObjName+"']").selectpicker('refresh');
if(orgGroupId != ''){
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'post',
url:pathName+'/basics/asnGroup/ajaxGetAsnNo',
data:{"organization":orgName},
dataType:'json',
async:false,
success:function (data,textStatus){
if(textStatus=="success"){
for(var i in data) {
$("select[name='"+asnObjName+"']").append("<option value='"+data[i].asnId+"'>"+data[i].asnId+"</option>");
}
}
}
});
}
/***设定数据库值***/
$("select[name='"+asnObjName+"']").selectpicker('refresh');
var asnNoObjName = ($(obj).attr("name")).split("userRegion1")[0]+"asnNo";
if($("input[name='"+asnNoObjName+"']").val() == ''
|| $("input[name='"+asnNoObjName+"']").val() == null ){
$("select[name='"+asnObjName+"']").selectpicker('selectAll');
}else{
if($("input[name='"+asnNoObjName+"']").attr("used") == 'false' ){
$("select[name='"+asnObjName+"']").selectpicker('val',($("input[name='"+asnNoObjName+"']").val()).split(","));
}else{
$("select[name='"+asnObjName+"']").selectpicker('selectAll');
}
$("input[name='"+asnNoObjName+"']").attr("used",true);
}
}
}

31
src/main/webapp/static/global/scripts/common.js
View File

@@ -399,7 +399,9 @@ $(function(){
options = $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]");
}
//表单中如果有关键字内容可能输入多个关键字的情况，根据输入关键字个数确定表达式选中情况，不允许手动选中
$("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true);
if($("select[name='"+objNamePrefix+"district']").val()!="Payload"){//如果是app 的payload特征，可选择表达式
$("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true);
}
tagsInputSettings = tagsInputSettings+",#"+tagsId;
}
@@ -412,9 +414,9 @@ $(function(){
onAddTag:function(tag,size){
var reg = new RegExp(/\t|\r|\n/);
if (tag.match(reg)) {
$(this).parents(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}","'"+tag+"'")+"</label>");
$(this).parent(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}","'"+tag+"'")+"</label>");
}else{
$(this).parents(".col-md-6").next("div").html("");
$(this).parent(".col-md-6").next("div").html("");
}
//var keywordValue = "";
var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
@@ -425,7 +427,7 @@ $(function(){
exprTypeChecked(objNamePrefix,size,options);
},
onRemoveTag:function(tag,size){
$(this).parents(".col-md-6").next("div").html("");
$(this).parent(".col-md-6").next("div").html("");
//var keywordValue = "";
var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
/*$("span[class='tag']").each(function(){
@@ -1679,4 +1681,23 @@ function heightDiv(type){
}
}
window.onresize=heightDiv;
/* 打印时,为列表的某一行或者某一列添加CSS样式
* 例子：如果不用添加样式，就把行数和列数设置为0；
* var rowValue=3; 行数
* var cellValue=2; 列数
* var tableIdValue="printTable"; table的ID的值
* var cssName="print-title print-background-color"; 要添加的class样式的名字
* */
function addPrintTableCss(rowValue,cellValue,tableIdValue,cssName){
var rows=document.getElementById(""+tableIdValue).rows;
for (var i = 0; i < rows.length; i++) {
for (var k = 0; k <rows[i].cells.length ; k++) {
if (rowValue >0 && rowValue <rows.length && rowValue== i) {
rows[i].cells[k].className=cssName;
}
if (cellValue>0 && cellValue<=rows[0].cells.length&& (cellValue-1)==k && i !=0) {
rows[i].cells[k].className=cssName;
}
}
}
}

30
src/main/webapp/static/global/scripts/pzLog.js
View File

@@ -112,11 +112,15 @@ var getTotalLog=function(){
data.compileIds=[];
data.serviceIds=[];
data.objs=[];
// data.url=null;
$("td[compileId]").each(function(){
var audit=$(this).attr("audit");
var compileId=$(this).attr("compileId");
var serviceId=$(this).attr("serviceId");
var functionId=$(this).attr("functionId");
/* if(data.url==null){
data.url=$(this).attr("url");
}*/
if(audit&&compileId&&functionId&&serviceId){
if(audit != 0){
var has=false;
@@ -168,8 +172,10 @@ var GetLogTotal=function(_data){
var hasLog=false;
for(var i=0;i<data.length;i++){
if($(this).attr("compileId")==data[i].compileId){
var serviceId= $(this).attr("serviceId");
$(this).attr("id",i+"logTotal");
$(this).html(data[i].sum);
//$(this).html(data[i].sum);
$(this).html("<a href='javascript:;' onclick='logSearch(\""+data[i].compileId+"\",\""+serviceId+"\")'>"+data[i].sum+"<a>");
$(this).parent("tr").find("td:eq(1)").html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].compileId+"<a>");
hasLog=true;
}
@@ -519,8 +525,8 @@ function setEndTimeByFormat(startTimeSelector,endTimeSelector,granule,unit,forma
}
var startTimeVal=$(startTimeSelector).val();
var endTimeVal=$(endTimeSelector).val();
alert(startTimeVal);
alert(endTimeVal);
//alert(startTimeVal);
//alert(endTimeVal);
//alert(startTimeVal.substr(0,formatParm.length-1);
var startTime;
var endTime;
@@ -646,4 +652,22 @@ function setStartTimeByFormat(startTimeSelector,endTimeSelector,granule,unit,for
$(startTimeSelector).val(dateFtt(formatParm,startTime)+endStr);
$(endTimeSelector).val(dateFtt(formatParm,endTime)+endStr);
}
function logSearch(cfgId,serviceId){
var title=$.validator.messages.log_trend;
var url=$("#jbox_cfg_url",parent.document).val();
url=url+"?cfgId="+cfgId+"&serviceId="+serviceId;
top.$.jBox("iframe:"+url, {
title: title,
width: $(document).width()*0.8,
height: $(document).height()*0.8,
buttons: { close : true },
loaded : function(h) { //隐藏滚动条
$(".jbox-content", top.document).css( "overflow-y", "hidden");
}
});
//alert(cfgId+'======'+url);
}
/*======================新增按照需求指定时间范围，如取到天、小时等end=====================================*/

95
src/main/webapp/static/pages/scripts/echart.js
View File

@@ -1327,7 +1327,8 @@ function echart_topic_domain(rs){
var data=[{
'id': '0.0',
// 'parent': '',
'name': 'Service'
'name': 'Service',
color:'#265197'
}];
var unit="bytes";
$(rs).each(function(i,d){
@@ -1342,6 +1343,7 @@ function echart_topic_domain(rs){
if(inoctetsNum>0){
/****主题中的子域名*******/
var topicData=0;
$(d.domainData).each(function(j,t){
var domainNum=t.byteCount;
var domainNumK=domainNum/1024;
@@ -1373,14 +1375,13 @@ function echart_topic_domain(rs){
plotBorderWidth:null,
plotShadow:false,
marginTop:50,
marginBottom:10,
marginBottom:10
},
/* navigation: {
buttonOptions: {
x:-5,
y:15,
}
},*/
noData:{
style: {//设置字体颜色
color: '#fff',
},
},
exporting: {
allowHTML:true,
filename:'Service'+addDateName(),
@@ -1399,18 +1400,9 @@ function echart_topic_domain(rs){
},
buttons: exportingButton('#6e6379')
},
//colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6','#0099cc','#cc0033','#ff6633','#99cccc','#d9f9d0'],
// colors:['#003078','#004bbc', '#015bb1', '#2f74b5', '#4186c1', '#0058e1','#066aff', '#5597cd', '#5c9dff', '#67a7de', '#77b5dc', '#98cde7','#89b9ff','#78adff'],
// colors:['#008ef9','#0594ff', '#002540', '#004679', '#025ba1', '#026fc0','#0279d5'],
// colors:['#002540','#004679','#025ba1', '#026fc0', '#0279d5', '#0086e9', '#008ef9','#0594ff', '#25a2ff', '#63bbff', '#88cbff'],
colors:[ '#1C4573','#275A9C', '#306EB9', '#3579CE', '#3C85E1', '#3E8EF1','#4294F7', '#4294F7', '#98CBFA'],
// colors:colors,
noData:{
style: {//设置字体颜色
color: '#fff',
},
},
title: {
// colors:[ '#1C4573','#275A9C', '#306EB9', '#3579CE', '#3C85E1', '#3E8EF1','#4294F7', '#4294F7', '#98CBFA'],
colors:['#013fa2', '#014ecb', '#015ef4', '#01378e', '#014abd','#0156df','#0b68fe'],
title: {
text: null
},
credits:{//是否有highcharts水印
@@ -1421,19 +1413,19 @@ function echart_topic_domain(rs){
data: data,
allowDrillToNode: true,
cursor: 'pointer',
colorByPoint: true,
//colorByPoint: true,
dataLabels: {
//format: '{point.name}',
/*formatter: function(){
formatter: function(){
this.point.value = this.point.value.toFixed(2);
this.series.name = this.point.name;
console.info(this);
},*/
filter: {
},
filter: {
property: 'innerArcLength',
operator: '>',
value: 16
}
}
},
levels: [{
level: 1,
@@ -1470,7 +1462,8 @@ function echart_topic_domain(rs){
}],
plotOptions: {
sunburst: {
borderColor: "",
borderColor: "#ffffff",
borderWidth:0.2,
dataLabels: {
enabled: true,
style: {//设置字体颜色
@@ -1480,7 +1473,7 @@ function echart_topic_domain(rs){
textOutline:'none',
fontWeight:'normal'
},
format: '{point.name}',
format: '{point.name}'
}
}
},
@@ -1488,7 +1481,53 @@ function echart_topic_domain(rs){
headerFormat: "",
pointFormat: '<b>{point.name}</b> : <b>{point.value:.2f}<b> ' +unit
}
});
}/*{
chart: {
backgroundColor: 'rgba(255, 255, 255, 0)',
plotBackgroundColor:null,
plotBorderWidth:null,
plotShadow:false,
marginTop:50,
marginBottom:10
},
title: {
text: '2017 世界人口分布'
},
subtitle: {
text: '数据来源： <href="https://en.wikipedia.org/wiki/List_of_countries_by_population_(United_Nations)">Wikipedia</a>'
},
series: [{
type: "sunburst",
data: data,
allowDrillToNode: true,
cursor: 'pointer',
dataLabels: {
*//**
* A custom formatter that returns the name only if the inner arc
* is longer than a certain pixel size, so the shape has place for
* the label.
*//*
},
levels: [{
level: 2,
colorByPoint: true,
dataLabels: {
rotationMode: 'parallel'
}
},
{
level: 3,
colorVariation: {
key: 'brightness',
to: -0.5
}
}]
}],
tooltip: {
headerFormat: "",
pointFormat: '<b>{point.name}</b>的人口数量是：<b>{point.value}</b>'
}
}*/);
}
function exportingButton(color) {

3
src/main/webapp/static/pages/scripts/home.js
View File

@@ -16,7 +16,7 @@ var home = function () {
//顶部导航顶级菜单事件
$(".mega-menu li a").click(function(e){
top.$.jBox.close(true);
var $this = $(this);
var next_ul = $this.next("ul");
var prev_ul = $this.parents("ul");
@@ -72,7 +72,6 @@ var home = function () {
}*/
})

2
src/main/webapp/static/pages/scripts/jquery.pagination.js
View File

@@ -95,7 +95,7 @@
}
}
}
if(current + opts.count < pageCount && current >= 1 && pageCount > opts.count){
if(current + opts.count < pageCount && current >= 1 && pageCount > opts.count && end!=5){// 先暂时定5 防止5页的时候显示
var end = opts.coping && opts.endPage ? opts.endPage : pageCount;
html += opts.coping ? '<span class="dian-dian">...</span><a href="javascript:;" data-page="'+pageCount+'">'+end+'</a>' : '';
}