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

（1）IP类配置增加区域GK逻辑

Browse Source 
（2）修复编译ID的重复获取BUG
（3）监测类配置目前不提供区域管控逻辑
This commit is contained in:
wangxin
2018-04-08 16:15:06 +08:00
parent 1f6bbc20ce
commit aaf8dd5afb
20 changed files with 1133 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -91,6 +91,9 @@ $(function(){
<c:if test="${not empty _cfg.cfgId}">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
</c:if>
<c:if test="${not empty _cfg.compileId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
</c:if>
<input type="hidden" name="audit" value="${audit}">
<input type="hidden" name="tableName" value="${_cfg.tableName}">
<input type="hidden" name="serviceId" value="${_cfg.serviceId}">

153
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -6,6 +6,50 @@
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script type="text/javascript">
$(function(){
if($("input[name='isAreaEffective']:checked").val()==1){
$(".areaType").removeClass("hidden");
if($("input[name='areaEffectiveIds']").val()){
$(".areaType").find("[value='1']").prop("checked",true);
$("#areaIsp").removeClass("hidden");
$("#areaIp").addClass("hidden");
}else{
$(".areaType").find("[value='0']").prop("checked",true);
$("#areaIp").removeClass("hidden");
$("#areaIsp").addClass("hidden");
}
}else{
$("input[name='areaEffectiveIds']").val("");
}
$("input[name='isAreaEffective']").on('change',function(){
var val=$(this).val();
if(val==1){
$(".areaType").removeClass("hidden");
if($("input[name='areaType']:checked").val()==1){//areaISP
$("#areaIsp").removeClass("hidden");
}else if($("input[name='areaType']:checked").val()==0){//areaIp
$("#areaIp").removeClass("hidden");
}
}else{
$(".areaType").addClass("hidden");
$("#areaIp").addClass("hidden");
$("#areaIsp").addClass("hidden");
}
});
$("input[name='areaType']").on('change',function(){
var val=$(this).val();
if($(this).is(":visible")){
if(val==0){
$("#areaIp").removeClass("hidden");
$("#areaIsp").addClass("hidden");
}else{
$("#areaIsp").removeClass("hidden");
$("#areaIp").addClass("hidden");
}
}else{
$("#areaIsp").addClass("hidden");
$("#areaIp").addClass("hidden");
}
});
$("#save").on("click",function(){
$("#ipCfgFrom").attr("action","${ctx}/cfg/ip/saveOrUpdateCfg");
$("#save").submit();
@@ -13,53 +57,10 @@ $(function(){
$("#cancel").on("click",function(){
window.history.back();
});
$("select[name='ipType']").on("change",function(){
var type=$(this).val();
if(4==type){
if(!$("input[name='srcIpMask']").val()){
$("input[name='srcIpMask']").val("255.255.255.255");
}else if($("input[name='srcIpMask']").val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
$("input[name='srcIpMask']").val("255.255.255.255");
}
if(!$("input[name='dstIpMask']").val()){
$("input[name='dstIpMask']").val("255.255.255.255");
}else if($("input[name='dstIpMask']").val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
$("input[name='dstIpMask']").val("255.255.255.255");
}
if(!$("input[name='srcIp']").val()){
$("input[name='srcIp']").val("0.0.0.0");
}else if($("input[name='srcIp']").val()=="::"){
$("input[name='srcIp']").val("0.0.0.0");
}
if(!$("input[name='dstIp']").val()){
$("input[name='dstIp']").val("0.0.0.0");
}else if($("input[name='dstIp']").val()=="::"){
$("input[name='dstIp']").val("0.0.0.0");
}
}
if(6==type){
if(!$("input[name='srcIpMask']").val()){
$("input[name='srcIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}else if($("input[name='srcIpMask']").val()=="255.255.255.255"){
$("input[name='srcIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if(!$("input[name='dstIpMask']").val()){
$("input[name='dstIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}else if($("input[name='dstIpMask']").val()=="255.255.255.255"){
$("input[name='dstIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if(!$("input[name='srcIp']").val()){
$("input[name='srcIp']").val("::");
}else if($("input[name='srcIp']").val()=="0.0.0.0"){
$("input[name='srcIp']").val("::");
}
if(!$("input[name='dstIp']").val()){
$("input[name='dstIp']").val("::");
}else if($("input[name='dstIp']").val()=="0.0.0.0"){
$("input[name='dstIp']").val("::");
}
}
});
$("select[name$='ipType']").on("change",function(){
switchIpType($(this));
});
$("#ipCfgFrom").validate({
rules: {
ipType: {
@@ -182,6 +183,58 @@ $(function(){
"请输入正确的IP!"
);
});
var switchIpType=function(obj){
var type=$(obj).val();
var row=$(obj).parents('.row');
var srcIpMask=row.siblings().find("input[name$='srcIpMask']");
var dstIpMask=row.siblings().find("input[name$='dstIpMask']");
var srcIp=row.siblings().find("input[name$='srcIp']");
var dstIp=row.siblings().find("input[name$='dstIp']");
if(4==type){
if(!$(srcIpMask).val()){
$(srcIpMask).val("255.255.255.255");
}else if($(srcIpMask).val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
$(srcIpMask).val("255.255.255.255");
}
if(!$(dstIpMask).val()){
$(dstIpMask).val("255.255.255.255");
}else if($(dstIpMask).val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
$(dstIpMask).val("255.255.255.255");
}
if(!$(srcIp).val()){
$(srcIp).val("0.0.0.0");
}else if($(srcIp).val()=="::"){
$(srcIp).val("0.0.0.0");
}
if(!$(dstIp).val()){
$(dstIp).val("0.0.0.0");
}else if($(dstIp).val()=="::"){
$(dstIp).val("0.0.0.0");
}
}
if(6==type){
if(!$(srcIpMask).val()){
$(srcIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}else if($(srcIpMask).val()=="255.255.255.255"){
$(srcIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if(!$(dstIpMask).val()){
$(dstIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}else if($(dstIpMask).val()=="255.255.255.255"){
$(dstIpMask).val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
}
if(!$(srcIp).val()){
$(srcIp).val("::");
}else if($(srcIp).val()=="0.0.0.0"){
$(srcIp).val("::");
}
if(!$(dstIp).val()){
$(dstIp).val("::");
}else if($(dstIp).val()=="0.0.0.0"){
$(dstIp).val("::");
}
}
}
</script>
</head>
<body>
@@ -210,6 +263,9 @@ $(function(){
<c:if test="${not empty _cfg.cfgId}">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
</c:if>
<c:if test="${not empty _cfg.compileId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
</c:if>
<input type="hidden" name="tableName" value="${_cfg.tableName}">
<input type="hidden" name="serviceId" value="${serviceId}">
<input type="hidden" name="cfgName" value="${cfgName}">
@@ -217,14 +273,13 @@ $(function(){
<input type="hidden" name="protocolId" value="${_cfg.protocolId}">
<c:choose>
<c:when test="${action!=5 and action!=8}">
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</c:when>
<c:otherwise>
<input type="hidden" name=requestId value="0">
</c:otherwise>
</c:choose>
</div>
<div class="form-actions">
<div class="row">

4
src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
View File

@@ -100,6 +100,9 @@ $(function(){
<c:if test="${not empty _cfg.cfgId}">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
</c:if>
<c:if test="${not empty _cfg.compileId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
</c:if>
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="action" name="action" type="hidden" value="${action}"/>
<input type="hidden" name="tableName" value="${_cfg.tableName}">
@@ -107,6 +110,7 @@ $(function(){
<input type="hidden" name="cfgName" value="${cfgName}">
<c:choose>
<c:when test="${action!=5 and action!=8}">
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</c:when>
<c:otherwise>