From 30e33e660004368ee0270f6301175c6a455058dd Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 3 Sep 2018 14:42:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E3=80=81app=E5=8D=8F=E8=AE=AE=E3=80=81?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E9=9A=A7=E9=81=93=E8=A1=8C=E4=B8=BA=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=90=8E=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=87=8D=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp | 7 ++++++- src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp | 3 +++ .../webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 4b2dc61ff..88514d82c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -33,7 +33,10 @@ $(".Wdate").attr("value",''); $("#level").attr("value",''); $("#searchForm")[0].reset(); - $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); + $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); + $("#specServiceIdId").val(""); + $("#specServiceIdName").val(""); + $("#specServiceIdName").attr("placeholder",''); }); //异步获取策略ip相关信息 $("span[id^=open]").click(function(){ @@ -80,6 +83,8 @@ $("#"+openId).show(); $("#"+closeId).parent().parent().next("tr").hide(); }); + + }); diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index d32876c3e..a772ee8e9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -36,6 +36,9 @@ $("#level").attr("value",''); $("#searchForm")[0].reset(); $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); + $("#specServiceIdId").val(""); + $("#specServiceIdName").val(""); + $("#specServiceIdName").attr("placeholder",''); }); //异步获取策略ip相关信息 $("span[id^=open]").click(function(){ diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index a72db7637..55f5216e3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -36,6 +36,9 @@ $("#level").attr("value",''); $("#searchForm")[0].reset(); $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); + $("#specServiceIdId").val(""); + $("#specServiceIdName").val(""); + $("#specServiceIdName").attr("placeholder",''); }); //异步获取策略ip相关信息 $("span[id^=open]").click(function(){ From b812bbac5b2bac49ba96a0a0c7307e40a515a051 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 3 Sep 2018 14:43:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?(1)asn=20=E7=BB=84=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=90=9C=E7=B4=A2=20(2)asn=20ip=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=95=8C=E9=9D=A2=20asn=20ip=E7=BB=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E5=A4=8D,ip=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=8A=B6=E6=80=81=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20(3)DNS=20ip=E7=95=8C=E9=9D=A2ip=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E7=8A=B6=E6=80=81=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml | 6 +++--- .../webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp | 2 +- .../webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp | 2 +- src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp | 10 ++++------ src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp | 2 +- src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 4 ++-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index b53303456..b63525dfd 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -61,7 +61,7 @@ left join sys_user u on r.auditor_id=u.id - AND ${page.where} + AND ${page.where} AND r.CFG_ID=#{cfgId,jdbcType=BIGINT} @@ -69,8 +69,8 @@ AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') - - AND dns.group_name like concat(concat('%',#{asnIpGroupName,jdbcType=VARCHAR}),'%') + + AND r.asn_Ip_Group =#{asnIpGroup,jdbcType=INTEGER} AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER} diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp index ff3958537..59ec3e8c5 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp @@ -122,7 +122,7 @@ var reSort=function(obj,index){
- <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp index e068ca654..eaa612d83 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp @@ -66,7 +66,7 @@ $(function(){
- diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp index 51a67c0c5..bb0bb0f2d 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp @@ -8,11 +8,9 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.srcIpAddress}"){ - $("#intype").val("${cfg.srcIpAddress}"); - }else if("${cfg.srcPort}"){ - $("#intype").val("${cfg.srcPort}"); - } else{ + }else if("${cfg.destIpAddress}"){ + $("#intype").val("${cfg.destIpAddress}"); + }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } $("#seltype").change(function(){ @@ -85,7 +83,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp index 6a1fe48ce..c04db97ef 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp @@ -73,7 +73,7 @@ $(function(){
- diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index 01e62f164..30a35f7db 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -8,8 +8,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.srcIpAddress}"){ - $("#intype").val("${cfg.srcIpAddress}"); + }else if("${cfg.destIpAddress}"){ + $("#intype").val("${cfg.destIpAddress}"); }else if("${cfg.srcPort}"){ $("#intype").val("${cfg.srcPort}"); } else{ From c163f045b668ba56a146defc04f3a795e3648d89 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 3 Sep 2018 15:02:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E5=90=8E=E5=8F=B0=E7=9A=84compileId=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=97=A5=E5=BF=97=E7=BB=93=E6=9E=9C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8A?= =?UTF-8?q?loading=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E6=B6=88=E5=A4=B1?= =?UTF-8?q?=E5=8F=98=E4=B8=BA0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/static/global/scripts/common.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index e2aebcfe5..205deaa78 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1310,6 +1310,7 @@ var GetLogTotal=function(_data){ success:function(data,textStatus){//处理返回结果 if(textStatus=="success"){ totalTrs.each(function(){ + var hasLog=false; for(var i=0;i Date: Mon, 3 Sep 2018 16:05:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8=20?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 11 ++++++++--- src/main/resources/messages/message_zh_CN.properties | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index d41212c61..29569f53f 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -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_port=Server port is empty or incorrectly formatting(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) #===============protocol IP Import end================= @@ -983,7 +983,7 @@ attr_type_report=Attribute Report lwhh_report=Official Letter Report src_ip_report=Src IP Report dest_ip_report=Dest IP Report -isp_report=ISP Report +isp_report=Entrance Report #=============about report=================== ip_multiplex_policy=IP Reuse Policy ip_multiplex_pool_config=IP Reuse Addr Pool @@ -1139,4 +1139,9 @@ asn_ip_configuration=ASN IP Configuration asn_policy=ASN Policy asn_ip_group=ASN IP Group 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 383223619..4ec855aee 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1136,4 +1136,8 @@ asn_ip_configuration=ASN IP\u914D\u7F6E asn_policy=ASN\u7B56\u7565 asn_ip_group=ASN IP\u7EC4 can_not_delete_has_ip_asn_group=\u4E0D\u80FD\u5220\u9664\u5305\u542BASN IP\u7684 ASN\u7EC4 -last_ip_in_asn_group=\u4E0D\u80FD\u5220\u9664ASN\u7EC4\u4E2D\u7684\u6700\u540E\u4E00\u4E2AIP \ No newline at end of file +last_ip_in_asn_group=\u4E0D\u80FD\u5220\u9664ASN\u7EC4\u4E2D\u7684\u6700\u540E\u4E00\u4E2AIP +#==============================about reoirt========================================= +src_province=\u6240\u5C5E\u7701 +src_city=\u6240\u5C5E\u5E02 +dest_country=\u76EE\u7684IP\u6240\u5C5E\u56FD\u5BB6