From 2d190ad7f3fc6069ab5aabfbacdc76b4b8e5cd68 Mon Sep 17 00:00:00 2001 From: DuanDongmei Date: Thu, 22 Nov 2018 14:29:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=9F=9Ftitle=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E4=BF=AE=E5=89=AA=20=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=BC=BA=E5=BA=A6=E6=94=BE=E5=9C=A8monitor?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/InterceptCfgService.java | 27 ++--- .../resources/messages/message_en.properties | 114 +++++++++--------- .../messages/message_zh_CN.properties | 72 +++++------ 3 files changed, 105 insertions(+), 108 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index b93367306..2452d11f2 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -352,12 +352,21 @@ public class InterceptCfgService extends CrudService maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setIsValid(entity.getIsValid()); - //监测需要发keyring_id + //监测 需要发keyring_id if(entity.getAction().equals(Constants.MONIT_ACTION)){ entity.setUserRegion1(StringUtil.isEmpty(entity.getUserRegion1()) ? "0":entity.getUserRegion1()); maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"="+entity.getUserRegion1()); + //监测的域名需下发拦截强度 + if(entity.getFunctionId().equals(201)){ + entity.setUserRegion5(StringUtil.isEmpty(entity.getUserRegion5()) ? "1":entity.getUserRegion5()); + if(StringUtil.isEmpty(maatCfg.getUserRegion())) { + maatCfg.setUserRegion(Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5()); + }else { + maatCfg.setUserRegion(maatCfg.getUserRegion()+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5()); + } + } } - //限速需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps + //限速 需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps if(entity.getAction().equals(Constants.RATELIMIT_ACTION)){ if(entity.getUserRegion1().equals("0")){//丢包率 entity.setUserRegion2(StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2()); @@ -370,7 +379,7 @@ public class InterceptCfgService extends CrudService String userRegion=""; //替换需要发zone if(entity.getAction().equals(Constants.REPLACE_ACTION)){ - //HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null) + //HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null) userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion1(); String substitute=""; String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2(); @@ -400,18 +409,6 @@ public class InterceptCfgService extends CrudService } } - //域名拦截需要增加拦截强度自定义域 - if(doaminFlag){ - if(StringUtil.isEmpty(entity.getUserRegion5()) || maatCfg.getUserRegion().equals(Constants.USER_REGION_PLACEHOLDER)){ - userRegion= Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5(); - maatCfg.setUserRegion(userRegion); - }else{ - userRegion= maatCfg.getUserRegion(); - userRegion=userRegion+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5(); - maatCfg.setUserRegion(userRegion); - } - } - configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); maatBean.setAuditTime(entity.getAuditTime()); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4f2c8c312..e95572053 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -551,15 +551,15 @@ has_prohibit_delete=Only unconfirmed configuration can be deleted has_prohibit_nopass=Only unconfirmed configuration can be confirmed has_prohibit_pass=Only unconfirmed configuration can be confirmed multiple_keywords_tip=Multiple keyword can be input,Please separate it with the return key. -action_drop=DROP -action_reject=BLOCK -action_redirect=REDIRECT -action_loop=LOOP -action_forward=FORWARD -action_ratelimit=RATE LIMIT -action_replace=REPLACE -action_whitelist=WHITE LIST -action_monit=MONITOR +action_drop=Drop +action_reject=Block +action_redirect=Redirect +action_loop=Loop +action_forward=Forward +action_ratelimit=Rate Limit +action_replace=Replace +action_whitelist=White List +action_monit=Monitor file_digest_control=File Digest raw_len=File Length digest=Digest @@ -746,50 +746,50 @@ av_sample_picture=Picture Sample av_sample_voip=VoIP Voice Sample av_sample_audio_porn=Audio Scene Detection av_sample_video_porn=Porn Detection -WHITE_LIST_IP=IP White List -av_voip_ip=VoIP IP Configuration -NTC_HTTP_URL=URL Configuration -NTC_HTTP_REQ_HDR=Request Header Keyword Configuration -NTC_HTTP_RES_HDR=Response Header Keyword Configuration -NTC_HTTP_REQ_BODY=Request Body Configuration -NTC_HTTP_RES_BODY=Response Body Configuration -NTC_UNIVERSAL_IP=IP Configuration -NTC_BGP_AS=AS Configuration -NTC_DNS_REGION=Keyword Configuration -WHITE_LIST_DOMAIN=URL Configuration -av_voip_account=VoIP Account Configuration -av_cont_ip=Content IP Configuration -NTC_SSL_SNI=SNI Keyword Configuration -NTC_SSL_SAN=SAN Keyword Configuration -NTC_SSL_CN=CN Keyword Configuration -av_pic_ip=Picture IP Configuration -av_cont_url=Content URL Configuration -av_pic_url=Picture URL Configuration -NTC_IP=IP Configuration +WHITE_LIST_IP=IP +av_voip_ip=IP +NTC_HTTP_URL=URL +NTC_HTTP_REQ_HDR=Request Header +NTC_HTTP_RES_HDR=Response Header +NTC_HTTP_REQ_BODY=Request Body +NTC_HTTP_RES_BODY=Response Body +NTC_UNIVERSAL_IP=IP +NTC_BGP_AS=AS +NTC_DNS_REGION=DNS +WHITE_LIST_DOMAIN=URL +av_voip_account=VoIP Account +av_cont_ip=IP +NTC_SSL_SNI=SNI +NTC_SSL_SAN=SAN +NTC_SSL_CN=CN +av_pic_ip=IP +av_cont_url=URL +av_pic_url=URL +NTC_IP=IP file_transfer_digest=File Transfer Digest Configuration -PXY_INTERCEPT_IP=IP Intercept Configuration -PXY_INTERCEPT_DOMAIN=Domain Intercept Configuration -PXY_CTRL_HTTP_REQ_BODY=Request Body Configuration -PXY_CTRL_HTTP_RES_BODY=Response Body Configuration -dns_fake_ip=DNS Spoofing IP Configuration -APP_POLICY=APP Policy Configuration -PXY_CTRL_IP=IP Block Configuration -APP_STATIC_SEV_IP=App Identify IP Configuration -APP_HTTP=APP HTTP Feature Configuration -APP_DOMAIN=APP Domain Feature Configuration -APP_PKT_BIN=APP Byte Feature Configuration -PXY_CTRL_HTTP_URL=URL Configuration -LIMIT_IP=IP Rate Limit Configuration -IR_POLICY_IP=IP Reusing Configuration -PXY_CTRL_HTTP_REQ_HDR=Request Header Keyword Configuration -PXY_CTRL_HTTP_RES_HDR=Response Header Keyword Configuration -DDOS_PROTECT_TARGET_IP_CB=DDOS IP Configuration -IR_STATIC_IP_POOL_CB=IP Reusing Pool Configuration -NTC_MAIL_HDR=Header Keyword Configuration -NTC_MAIL_BODY=Content Configuration -NTC_FILE_DIGEST=File Digest Configuration -NTC_FTP_URL=URL Configuration -NTC_FTP_CONTENT=Content Configuration +PXY_INTERCEPT_IP=IP +PXY_INTERCEPT_DOMAIN=Domain +PXY_CTRL_HTTP_REQ_BODY=Request Body +PXY_CTRL_HTTP_RES_BODY=Response Body +dns_fake_ip=IP +APP_POLICY=APP +PXY_CTRL_IP=IP +APP_STATIC_SEV_IP=IP +APP_HTTP=HTTP +APP_DOMAIN=Domain +APP_PKT_BIN=Byte +PXY_CTRL_HTTP_URL=URL +LIMIT_IP=IP +IR_POLICY_IP=IP +PXY_CTRL_HTTP_REQ_HDR=Request Header +PXY_CTRL_HTTP_RES_HDR=Response Header +DDOS_PROTECT_TARGET_IP_CB=IP +IR_STATIC_IP_POOL_CB=IP +NTC_MAIL_HDR=Header Keyword +NTC_MAIL_BODY=Content +NTC_FILE_DIGEST=File Digest +NTC_FTP_URL=URL +NTC_FTP_CONTENT=Content id_not_exists=id of %s %s is not exist id_not_valid=id of %s %s is invalid num_split_by_comma=%s is a character separated by a comma @@ -993,9 +993,9 @@ case_insenstive=Case-insensitive hex=Hex not_hex=Not HEX p2p_reject=P2P Block -NTC_P2P_IP=IP Configuration -NTC_P2P_HASH_BIN=File Marking Configuration -NTC_P2P_KEYWORDS=eMule Keyword Search Configuration +NTC_P2P_IP=IP +NTC_P2P_HASH_BIN=File Marking +NTC_P2P_KEYWORDS=eMule Keyword s_asn=Source ASN d_asn=Destination ASN s_subscribe_id=Source Subscribe ID @@ -1143,9 +1143,9 @@ stream=Stream protocol_menu=Protocol advanced=Advanced protocol_identify=Protocol Identify -MM_FILE_DIGEST=File Digest Configuration +MM_FILE_DIGEST=File Digest NTC_ASN_IP=ASN -NTC_STREAMING_MEDIA_URL=Streaming Media URL +NTC_STREAMING_MEDIA_URL=URL NTC_VOIP_ACCOUNT=VoIP Account export_failed=Export Failed user_manage=Client Account Manage diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index ab719ae0b..0daf6d323 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -763,31 +763,31 @@ NTC_SSL_CN=CN\u5173\u952E\u5B57\u914D\u7F6E av_pic_ip=\u56FE\u7247IP\u914D\u7F6E av_cont_url=\u5185\u5BB9URL\u914D\u7F6E av_pic_url=\u56FE\u7247URL\u914D\u7F6E -NTC_IP=IP\u914D\u7F6E +NTC_IP=IP file_transfer_digest=\u6587\u4EF6\u4F20\u8F93\u6458\u8981\u914D\u7F6E -PXY_INTERCEPT_IP=IP\u62E6\u622A\u914D\u7F6E -PXY_INTERCEPT_DOMAIN=\u57DF\u540D\u62E6\u622A\u914D\u7F6E -PXY_CTRL_HTTP_REQ_BODY=\u8BF7\u6C42\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E -PXY_CTRL_HTTP_RES_BODY=\u5E94\u7B54\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E -dns_fake_ip=DNS\u6B3A\u9A97IP\u914D\u7F6E -APP_POLICY=APP\u7B56\u7565\u914D\u7F6E -PXY_CTRL_IP=IP\u63A7\u5236\u914D\u7F6E -APP_STATIC_SEV_IP=APP\u534F\u8BAEIP\u914D\u7F6E -APP_HTTP=APP HTTP\u7279\u5F81\u914D\u7F6E -APP_DOMAIN=APP\u57DF\u540D\u7279\u5F81\u914D\u7F6E -APP_PKT_BIN=APP\u5B57\u8282\u7279\u5F81\u914D\u7F6E -PXY_CTRL_HTTP_URL=URL\u914D\u7F6E -LIMIT_IP=IP\u9650\u6D41\u914D\u7F6E -IR_POLICY_IP=IP\u590D\u7528\u914D\u7F6E -PXY_CTRL_HTTP_REQ_HDR=\u8BF7\u6C42\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E -PXY_CTRL_HTTP_RES_HDR=\u5E94\u7B54\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E -DDOS_PROTECT_TARGET_IP_CB=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E -IR_STATIC_IP_POOL_CB=IP\u590D\u7528\u5730\u5740\u6C60\u914D\u7F6E -NTC_MAIL_HDR=\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E -NTC_MAIL_BODY=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E -NTC_FILE_DIGEST=\u6587\u4EF6\u6458\u8981\u914D\u7F6E -NTC_FTP_URL=URL\u914D\u7F6E -NTC_FTP_CONTENT=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E +PXY_INTERCEPT_IP=IP +PXY_INTERCEPT_DOMAIN=\u57DF\u540D +PXY_CTRL_HTTP_REQ_BODY=\u8BF7\u6C42\u5185\u5BB9\u5173\u952E\u5B57 +PXY_CTRL_HTTP_RES_BODY=\u5E94\u7B54\u5185\u5BB9\u5173\u952E\u5B57 +dns_fake_ip=IP +APP_POLICY=APP\u7B56\u7565 +PXY_CTRL_IP=IP +APP_STATIC_SEV_IP=IP +APP_HTTP=HTTP +APP_DOMAIN=\u57DF\u540D +APP_PKT_BIN=APP\u5B57\u8282 +PXY_CTRL_HTTP_URL=URL +LIMIT_IP=IP +IR_POLICY_IP=IP +PXY_CTRL_HTTP_REQ_HDR=\u8BF7\u6C42\u5934 +PXY_CTRL_HTTP_RES_HDR=\u5E94\u7B54\u5934 +DDOS_PROTECT_TARGET_IP_CB=IP +IR_STATIC_IP_POOL_CB=IP +NTC_MAIL_HDR=\u5934\u57DF\u5173\u952E\u5B57 +NTC_MAIL_BODY=\u5185\u5BB9 +NTC_FILE_DIGEST=\u6587\u4EF6\u6458\u8981 +NTC_FTP_URL=URL +NTC_FTP_CONTENT=\u5185\u5BB9 id_not_exists=id\u4E3A%s\u7684%s\u4E0D\u5B58\u5728 id_not_valid=id\u4E3A%s\u7684%s\u65E0\u6548 num_split_by_comma=%s\u4E3A\u9017\u53F7\u5206\u9694\u7684\u6570\u5B57 @@ -962,13 +962,13 @@ encrypted_tunnel_behavior_ratelimit=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u9650\u encrypted_tunnel_behavior_monit=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u76D1\u6D4B encrypted_tunnel_behavior_drop=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u4E22\u5F03 ip_protocol=IP\u534F\u8BAE -MM_AV_IP=\u97F3\u89C6\u9891IP -MM_PIC_IP=\u56FE\u7247IP -MM_PIC_URL=\u56FE\u7247URL -MM_AV_URL=\u97F3\u89C6\u9891URL -INLINE_IP_CB=IP\u914D\u7F6E -website_http_monit=URL\u76D1\u6D4B -MM_VOIP_IP=VoIP IP +MM_AV_IP=IP +MM_PIC_IP=IP +MM_PIC_URL=URL +MM_AV_URL=URL +INLINE_IP_CB=IP +website_http_monit=URL +MM_VOIP_IP=IP MM_VOIP_ACCOUNT=VoIP\u8D26\u53F7 drop_ip=IP\u4E22\u5F03 loop_ip=IP\u56DE\u6D41 @@ -992,9 +992,9 @@ case_insenstive=\u5927\u5C0F\u5199\u4E0D\u654F\u611F hex=\u5341\u516D\u8FDB\u5236 not_hex=\u975E\u5341\u516D\u8FDB\u5236 p2p_reject=P2P\u963B\u65AD -NTC_P2P_IP=IP\u914D\u7F6E -NTC_P2P_HASH_BIN=\u6587\u4EF6\u6807\u8BC6\u914D\u7F6E -NTC_P2P_KEYWORDS=eMule\u641C\u7D22\u5173\u952E\u8BCD\u914D\u7F6E +NTC_P2P_IP=IP +NTC_P2P_HASH_BIN=\u6587\u4EF6\u6807\u8BC6 +NTC_P2P_KEYWORDS=eMule\u641C\u7D22\u5173\u952E s_asn=\u5BA2\u6237\u7AEFASN d_asn=\u670D\u52A1\u7AEFASN s_subscribe_id=\u5BA2\u6237\u7AEF\u7528\u6237\u540D @@ -1138,9 +1138,9 @@ stream=Stream protocol_menu=Protocol advanced=Advanced protocol_identify=Protocol Identify -MM_FILE_DIGEST=\u6587\u4EF6\u6458\u8981\u914D\u7F6E +MM_FILE_DIGEST=\u6587\u4EF6\u6458\u8981 NTC_ASN_IP=ASN -NTC_STREAMING_MEDIA_URL=Streaming Media URL +NTC_STREAMING_MEDIA_URL=URL NTC_VOIP_ACCOUNT=VoIP Account export_failed=\u5BFC\u51FA\u5931\u8D25 user_manage=\u5BA2\u6237\u7AEF\u8D26\u53F7\u7BA1\u7406