Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

src/main/resources/messages/message_en.properties

@@ -35,7 +35,7 @@ control_grey=Grey List
 social_app_grey=Application Grey List
 encryption_control=Encrypted Text Control
 specific_agreement_control=Specific Protocol Control
-social_app_control=App Protocol
+social_app_control=App Identify
 online_media_control=Media Addr
 sip_ip_control=SIP IP Control
 domain_control_white=Domain White List
@@ -513,15 +513,15 @@ av_content_ip_control=Audio/Video IP
 av_picture_ip_control=Picture IP
 av_content_url_control=Audio/Video URL
 av_picture_url_control=Picture URL
-av_voip_control=VoIP Protocol
+av_voip_control=VoIP
 av_voip_ip_control=VoIP IP
 av_voip_account_control=VoIP Account
 av_sample_audio_control=Audio Sample
 av_sample_video_control=Video Sample
 av_sample_picture_control=Picture Sample
-av_sample_voip_control=VoIP Sample
+av_sample_voip_control=VoIP Voice Sample
 av_sample_audio_porn_control=Audio Scene Detection
-av_sample_video_porn_control=Video Scene Detection
+av_sample_video_porn_control=Porn Detection
 av_sample_control=Sample
 configure_statistics_info=Configuration Service And Status Statistics
 letter_statistics_info=Letter And Configuration Service Statistics
@@ -695,7 +695,7 @@ s2c_pkt_num=S2C(Pkt)
 c2s_byte_num=C2S(Byte)
 s2c_byte_num=S2C(Byte)
 voip_recv_time=VoIP Receive Time
-voip_protocol=VoIP Protocol
+voip_protocol=VoIP
 av_protocol=AV Protocol
 duation=Duation(S)
 calling_account=Calling Account
@@ -725,7 +725,7 @@ ip_intercept=IP Intercept
 domain_intercept=Domain Intercept
 control_policy=Control Policy
 domain_forward=Domain Forward
-http_redirect=HTTP(S) Redirect
+http_redirect=HTTP(s) Redirect
 http_req_replace=Http Request Body Replace
 http_res_replace=Http Response Body Replace
 replace_content=Replace With 
@@ -750,18 +750,18 @@ no_strategy=No Strategy
 #=============about manipulation=========
 #=============about app config===========
 domain=Domain
-app_ip_config=APP Protocol IP
+app_ip_config=App Identify IP
 bytes=Byte
 app_http_config=APP HTTP Feature
 app_domain_config=APP Domain Feature
 app_byte_config=APP Byte Feature
 social_app=Applicaiton
 app_policy_config=APP Policy
-app_features_config=APP Feature
+app_features_config=APP Policy Object
 cfg_type=Configuration Type
-encrypted_tunnel_behavior=Tunnel Behavior
+encrypted_tunnel_behavior=Behavior Identify
 behaviour_type=Behaviour Type
-basic_protocol=Basic Protocol
+basic_protocol=Protocol Identify
 #=============about app config===========
 #=============about Maintenance=========
 ip_Reuse_pool_config=IP Reusing Pool
@@ -791,9 +791,9 @@ not_number=%s must be a number
 av_sample_audio=Audio Sample
 av_sample_video=Video Sample
 av_sample_picture=Picture Sample
-av_sample_voip=VoIP Sample
+av_sample_voip=VoIP Voice Sample
 av_sample_audio_porn=Audio Scene Detection
-av_sample_video_porn=Video 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
@@ -822,7 +822,7 @@ PXY_CTRL_HTTP_RES_BODY=Response Body Configuration
 dns_fake_ip=DNS Spoofing IP Configuration
 APP_POLICY=APP Policy Configuration
 PXY_CTRL_IP=IP Control Configuration
-APP_STATIC_SEV_IP=APP Protocol IP 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
@@ -848,11 +848,11 @@ temporary_redirect=Found (Previously "Moved temporarily")
 prohibition_access=Forbidden
 not_allowed_method=Not Found
 law_prohibition_access=Unavailable For Legal Reasons
-http_block=HTTP(S) Block
-http_reddirect=HTTP(S) Redirect
-http_replace=HTTP(S) Replace
-http_monit=HTTP(S) Monitoring
-http_whitelist=HTTP(S) White List
+http_block=HTTP(s) Block
+http_reddirect=HTTP(s) Redirect
+http_replace=HTTP(s) Replace
+http_monit=HTTP(s) Monitoring
+http_whitelist=HTTP(s) White List
 response_code=Response Code
 response_content=Response Content
 not_found=Not Found
@@ -888,12 +888,12 @@ video_sample_reject=Video Sample Control
 video_sample_monit=Video Sample Monitoring
 pic_sample_reject=Picture Sample Control
 pic_sample_monit=Picture Sample Monitoring
-voip_sample_reject=VoIP Sample Control
-voip_sample_monit=VoIP Sample Monitoring
+voip_sample_reject=VoIP Voice Sample Control
+voip_sample_monit=VoIP Voice Sample Monitoring
 audio_pornography_sample_reject=Audio Scene Detection Control
 audio_pornography_sample_monit=Audio Scene Detection Monitoring
-video_pornography_sample_reject=Video Scene Detection Control
-video_pornography_sample_monit=Video Scene Detection Monitoring
+video_pornography_sample_reject=Porn Detection Control
+video_pornography_sample_monit=Porn Detection Monitoring
 ip_white_monit=IP Address White List Monitoring
 ip_white_reject=IP Address White List Control
 ip_white_whitelist=IP Address White List
@@ -957,8 +957,8 @@ app_strategy_reject=APP Strategy Control
 app_strategy_ratelimit=APP Strategy Ratelimit
 proxy_ip_redirect=IP Redirect
 proxy_ip_forward=IP Forward
-app_protocol_ip_reject=APP Protocol IP Control
-app_protocol_ip_monit=APP Protocol IP Monitoring
+app_protocol_ip_reject=App Identify IP Control
+app_protocol_ip_monit=App Identify IP Monitoring
 app_http_feature_monit=APP HTTP Feature Monitoring
 app_domain_feature_monit=APP Domain Feature Monitoring
 app_byte_feature_monit=APP Byte Feature Monitoring
@@ -968,11 +968,11 @@ ddos_ip_drop=DDOS IP
 ip_reuse_adress_pool_loop=IP Reuse Address Pool
 app_strategy_monit=APP Strategy Monitoring
 app_strategy_drop=APP Strategy Drop 
-ctrl_http_reject=HTTP(S) Block
-ctrl_http_redirect=HTTP(S) Redirect
-ctrl_http_replace=HTTP(S) Replace
-ctrl_http_monit=HTTP(S) Monitoring
-ctrl_http_whitelist=HTTP(S) White List
+ctrl_http_reject=HTTP(s) Block
+ctrl_http_redirect=HTTP(s) Redirect
+ctrl_http_replace=HTTP(s) Replace
+ctrl_http_monit=HTTP(s) Monitoring
+ctrl_http_whitelist=HTTP(s) White List
 #=============function_service_dict==>service_name=================
 #=============about report===================
 report_list=Report
@@ -1009,19 +1009,19 @@ traffic_website_type_chart=Website Type
 website=Website
 #===============dashboard end===================================
 ratelimit_limit=Limit Rate must between 0 and 1
-Maintenance=Advanced
+Maintenance=Policy Object
 Proxy=Proxy
 selective=Selective
 max_shouldnot_less_than_min=The max item should not be less than the min item.
 unknown_cfg_type=Unknown configuration type.
-basic_protocol_reject=Basic Protocol Reject
-basic_protocol_ratelimit=Basic Protocol Ratelimit
-basic_protocol_monit=Basic Protocol Monitoring
-basic_protocol_drop=Basic Protocol Drop
-encrypted_tunnel_behavior_reject=Tunnel Behavior Reject
-encrypted_tunnel_behavior_ratelimit=Tunnel Behavior Ratelimit
-encrypted_tunnel_behavior_monit=Tunnel Behavior Monitoring
-encrypted_tunnel_behavior_drop=Tunnel Behavior Drop
+basic_protocol_reject=Protocol Identify Reject
+basic_protocol_ratelimit=Protocol Identify Ratelimit
+basic_protocol_monit=Protocol Identify Monitoring
+basic_protocol_drop=Protocol Identify Drop
+encrypted_tunnel_behavior_reject=Behavior Identify Reject
+encrypted_tunnel_behavior_ratelimit=Behavior Identify Ratelimit
+encrypted_tunnel_behavior_monit=Behavior Identify Monitoring
+encrypted_tunnel_behavior_drop=Behavior Identify Drop
 ip_protocol=IP Protocol
 MM_AV_IP=AV IP
 MM_PIC_IP=Picture IP
@@ -1042,9 +1042,9 @@ ratelimit_ip=IP Ratelimit
 app_code=Application No
 app_name=Application Name
 app_desc=Application Description
-tunnel_code=Tunnel Behavior No
-tunnel_name=Tunnel Behavior Name
-tunnel_desc=Tunnel Behavior Description
+tunnel_code=Behavior Identify No
+tunnel_name=Behavior Identify Name
+tunnel_desc=Behavior Identify Description
 call_external_procedures_failed=Call external procedures failed
 is_hex=Is HEX
 is_case_insenstive=Is Case-sensitive
@@ -1099,8 +1099,8 @@ tcp_unit=Unit / byte
 app_tcp_config=APP TCP Session Feature
 app_tcp_max_min=Maximum Session Should Not Exceed 4294967295
 new=New
-basic_protocol_business_type=Basic protpcol business classification
-tunnel_behavior_business_type=Tunnel behavior business classification
+basic_protocol_business_type=Basic Identify business classification
+tunnel_behavior_business_type=Behavior Identify business classification
 app_business_type=Application business classification
 pxy_intercept_monit_keyring=Certificate Strategy
 intercept_file_strategy=Certificate Strategy
@@ -1124,7 +1124,7 @@ bandwith=Bandwidth
 limit_rate_type=Limit Rate Type
 business_type=Business Type
 topic=Topic
-website_server=Website Server
+website_server=Website
 domain_existed=Domain Has Existed
 app_ssl_cert_feature_monit=APP SSL Cert Feature Monitoring
 app_header_feature_monit=APP Header Feature Monitoring
@@ -1207,3 +1207,8 @@ av_voip_reject=VoIP Reject
 label_proto_source=Protocol Source
 label_behav_source=Behavior Source
 label_app_source=APP Source
+packet=Packet
+stream=Stream
+protocol_menu=Protocol
+advanced=Advanced
+protocol_identify=Protocol Identify

src/main/resources/messages/message_ru.properties

@@ -1209,3 +1209,7 @@ av_voip_reject=VoIP\u7BA1\u63A7
 label_proto_source=Protocol Source
 label_behav_source=Behavior Source
 label_app_source=APP Source
+packet=Packet
+stream=Stream
+protocol_menu=Protocol
+protocol_identify=Protocol Identify

src/main/resources/messages/message_zh_CN.properties

@@ -1201,3 +1201,8 @@ av_voip_reject=VoIP\u7BA1\u63A7
 label_proto_source=\u534F\u8BAE\u6765\u6E90
 label_behav_source=\u884C\u4E3A\u6765\u6E90
 label_app_source=\u5E94\u7528\u6765\u6E90
+packet=Packet
+stream=Stream
+protocol_menu=Protocol
+advanced=Advanced
+protocol_identify=Protocol Identify

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp

@@ -274,7 +274,7 @@ $(function(){
 										</div>
 										<!-- WEBSITE -->
 										<!-- EXPRTYPE -->
-										<div class="col-md-6">
+										<div class="col-md-6  hidden">
 											<div class="form-group">
 											
 												<label class="control-label col-md-3"><font color="red">*</font>
@@ -396,7 +396,7 @@ $(function(){
 									</div>
 									
 									<!-- is hex -->
-									<div class="row">
+									<div class="row hidden">
 										<c:if test="${!empty region.configHex}">
 										    <div class="col-md-6">
 										        <div class="form-group ">

src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp

@@ -37,13 +37,14 @@
 														+ "']").append(error);
 									},
 									submitHandler : function(form) {
-										
 										var flag = true;
+										var actionValue=$("input[name=action]:checked").val();
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
 										if($(".boxSolid").length ==$(".boxSolid.hidden").length){
 											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 											return;
 										}
+										
 										//代表所有区域都隐藏了，提示必须增加个区域信息
 										if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
 											if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
@@ -123,10 +124,10 @@
 	}
 	//单域默认展开且不可关闭
 	var openSingleBoxsolid = function() {
-		var boxsolidLenth=$(".boxSolid").prev(".form-section:visible").length;
+		var boxsolidLenth=$(".boxSolid").not(".intercept_replace_pkt_bin_div").prev(".form-section:visible").length;
 		if(boxsolidLenth == 1){
-			$(".boxSolid").prev(".form-section:visible").find("span[title=add]").click();
-			$(".boxSolid").prev(".form-section:visible").next(".boxSolid").find("span[title=remove]").addClass("hidden");
+			$(".boxSolid").prev(".form-section:visible").eq(0).find("span[title=add]").click();
+			$(".boxSolid").prev(".form-section:visible").eq(0).next(".boxSolid").find("span[title=remove]").addClass("hidden");
 		}
 	}
 </script>