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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-09-03 17:25:31 +08:00
parent 2a1912c0a5 27e59bc9c1
commit 15ee2b2778
11 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
View File

@@ -61,7 +61,7 @@
left join sys_user u on r.auditor_id=u.id left join sys_user u on r.auditor_id=u.id
<trim prefix="WHERE" prefixOverrides="AND |OR "> <trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''"> <if test="page !=null and page.where != null and page.where != ''">
AND ${page.where} AND ${page.where}
</if> </if>
<if test="cfgId != null"> <if test="cfgId != null">
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT} AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
@@ -69,8 +69,8 @@
<if test="cfgDesc != null and cfgDesc != ''"> <if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="asnIpGroupName != null and asnIpGroupName != ''"> <if test="asnIpGroup != null and asnIpGroup != ''">
AND dns.group_name like concat(concat('%',#{asnIpGroupName,jdbcType=VARCHAR}),'%') AND r.asn_Ip_Group =#{asnIpGroup,jdbcType=INTEGER}
</if> </if>
<if test="cfgRegionCode != null"> <if test="cfgRegionCode != null">
AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER} AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}

11
src/main/resources/messages/message_en.properties
View File

@@ -617,7 +617,7 @@ val_dst_ip=Server IP format is incorrect or inconsistent with IP type
val_dst_mask=Server IP mask format is incorrect or inconsistent with IP type val_dst_mask=Server IP mask format is incorrect or inconsistent with IP type
val_dst_port=Server port is empty or incorrectly formatting(0-65535) val_dst_port=Server port is empty or incorrectly formatting(0-65535)
val_dst_port_mask=Server port mask format is incorrect(0-65535) val_dst_port_mask=Server port mask format is incorrect(0-65535)
val_protocol=Protocol Can't be empty,and should be 6(TCP),17(UDP),0(\u4EFB\u610F) val_protocol=Protocol Can't be empty,and should be 6(TCP),17(UDP),0(\u4efb\u610f)
val_direction=Direction should be 0(bidirectional) or 1(unidirectional) val_direction=Direction should be 0(bidirectional) or 1(unidirectional)
#===============protocol IP Import end================= #===============protocol IP Import end=================
@@ -983,7 +983,7 @@ attr_type_report=Attribute Report
lwhh_report=Official Letter Report lwhh_report=Official Letter Report
src_ip_report=Src IP Report src_ip_report=Src IP Report
dest_ip_report=Dest IP Report dest_ip_report=Dest IP Report
isp_report=ISP Report isp_report=Entrance Report
#=============about report=================== #=============about report===================
ip_multiplex_policy=IP Reuse Policy ip_multiplex_policy=IP Reuse Policy
ip_multiplex_pool_config=IP Reuse Addr Pool ip_multiplex_pool_config=IP Reuse Addr Pool
@@ -1139,4 +1139,9 @@ asn_ip_configuration=ASN IP Configuration
asn_policy=ASN Policy asn_policy=ASN Policy
asn_ip_group=ASN IP Group asn_ip_group=ASN IP Group
can_not_delete_has_ip_asn_group=Can not delete ASN group which has ASN IP can_not_delete_has_ip_asn_group=Can not delete ASN group which has ASN IP
last_ip_in_asn_group=Can not delete last IP in an ASN group last_ip_in_asn_group=Can not delete last IP in an ASN group
#==============================about reoirt=========================================
src_province=Str Province
src_city=Src City
dest_country=Dest IP Country

2
src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
View File

@@ -122,7 +122,7 @@ var reSort=function(obj,index){
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="group"/></label> <label class="control-label col-md-3"><spring:message code="group"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="asnIpGroup" class="selectpicker show-tick form-control required"> <select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<%-- <option value="0" ><spring:message code="default_group"/></option>--%> <%-- <option value="0" ><spring:message code="default_group"/></option>--%>
<c:forEach items="${policyGroups }" var="policyGroup"> <c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option> <option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>

2
src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
View File

@@ -66,7 +66,7 @@ $(function(){
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="group"/></label> <label class="control-label col-md-3"><spring:message code="group"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="asnIpGroup" class="selectpicker show-tick form-control required"> <select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<c:forEach items="${policyGroups }" var="policyGroup"> <c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option> <option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach> </c:forEach>

10
src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
View File

@@ -8,11 +8,9 @@
//搜索框提示语初始化 //搜索框提示语初始化
if("${cfg.cfgDesc}"){ if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}"); $("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.srcIpAddress}"){ }else if("${cfg.destIpAddress}"){
$("#intype").val("${cfg.srcIpAddress}"); $("#intype").val("${cfg.destIpAddress}");
}else if("${cfg.srcPort}"){ }else{
$("#intype").val("${cfg.srcPort}");
} else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text()); $("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
} }
$("#seltype").change(function(){ $("#seltype").change(function(){
@@ -85,7 +83,7 @@
<!-- 搜索内容与操作按钮栏 --> <!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
<form:select path="asnIpGroup" class="selectpicker select2 input-small" > <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> <form:option value=""><spring:message code='asn_ip_group'/></form:option>
<c:forEach items="${policyGroups}" var="policyGroup"> <c:forEach items="${policyGroups}" var="policyGroup">
<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option> <form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>

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

@@ -33,7 +33,10 @@
$(".Wdate").attr("value",''); $(".Wdate").attr("value",'');
$("#level").attr("value",''); $("#level").attr("value",'');
$("#searchForm")[0].reset(); $("#searchForm")[0].reset();
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text()); $("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
$("#specServiceIdId").val("");
$("#specServiceIdName").val("");
$("#specServiceIdName").attr("placeholder",'<spring:message code="social_app"/>');
}); });
//异步获取策略ip相关信息 //异步获取策略ip相关信息
$("span[id^=open]").click(function(){ $("span[id^=open]").click(function(){
@@ -80,6 +83,8 @@
$("#"+openId).show(); $("#"+openId).show();
$("#"+closeId).parent().parent().next("tr").hide(); $("#"+closeId).parent().parent().next("tr").hide();
}); });
}); });
</script> </script>

2
src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
View File

@@ -73,7 +73,7 @@ $(function(){
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="group"/></label> <label class="control-label col-md-3"><spring:message code="group"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="userRegion1" class="selectpicker show-tick form-control required"> <select name="userRegion1" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<c:forEach items="${policyGroups }" var="policyGroup"> <c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.userRegion1==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option> <option value="${policyGroup.groupId}" <c:if test="${_cfg.userRegion1==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach> </c:forEach>

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

@@ -36,6 +36,9 @@
$("#level").attr("value",''); $("#level").attr("value",'');
$("#searchForm")[0].reset(); $("#searchForm")[0].reset();
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text()); $("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
$("#specServiceIdId").val("");
$("#specServiceIdName").val("");
$("#specServiceIdName").attr("placeholder",'<spring:message code="basic_protocol"/>');
}); });
//异步获取策略ip相关信息 //异步获取策略ip相关信息
$("span[id^=open]").click(function(){ $("span[id^=open]").click(function(){

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

@@ -8,8 +8,8 @@
//搜索框提示语初始化 //搜索框提示语初始化
if("${cfg.cfgDesc}"){ if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}"); $("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.srcIpAddress}"){ }else if("${cfg.destIpAddress}"){
$("#intype").val("${cfg.srcIpAddress}"); $("#intype").val("${cfg.destIpAddress}");
}else if("${cfg.srcPort}"){ }else if("${cfg.srcPort}"){
$("#intype").val("${cfg.srcPort}"); $("#intype").val("${cfg.srcPort}");
} else{ } else{

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

@@ -36,6 +36,9 @@
$("#level").attr("value",''); $("#level").attr("value",'');
$("#searchForm")[0].reset(); $("#searchForm")[0].reset();
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text()); $("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
$("#specServiceIdId").val("");
$("#specServiceIdName").val("");
$("#specServiceIdName").attr("placeholder",'<spring:message code="encrypted_tunnel_behavior"/>');
}); });
//异步获取策略ip相关信息 //异步获取策略ip相关信息
$("span[id^=open]").click(function(){ $("span[id^=open]").click(function(){

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

@@ -1310,6 +1310,7 @@ var GetLogTotal=function(_data){
success:function(data,textStatus){//处理返回结果 success:function(data,textStatus){//处理返回结果
if(textStatus=="success"){ if(textStatus=="success"){
totalTrs.each(function(){ totalTrs.each(function(){
var hasLog=false;
for(var i=0;i<data.length;i++){ for(var i=0;i<data.length;i++){
if($(this).attr("compileId")==data[i].compileId){ if($(this).attr("compileId")==data[i].compileId){
$(this).attr("id",i+"logTotal"); $(this).attr("id",i+"logTotal");
@@ -1318,8 +1319,12 @@ var GetLogTotal=function(_data){
}else{ }else{
$(this).html(data[i].sum); $(this).html(data[i].sum);
} }
hasLog=true;
} }
} }
if(!hasLog){
$(this).html("0");
}
}) })
} }
}, },