nis和congstans冲突解决

src/main/resources/nis.properties

@@ -254,6 +254,14 @@ mmAvIpLog=mmAvIpLogs
 mmAvUrlLog=mmAvUrlLogs
 mmPicIpLog=mmPicIpLogs
 mmPicUrlLog=mmPicUrlLogs
+mmVoipIpLog=mmVoipIpLogs
+mmVoipAccountLog=mmVoipAccountLogs
+mmSampleAudioLog=mmSampleAudioLogs
+mmSampleVideoLog=mmSampleVideoLogs
+mmPornAudioLevelLog=mmPornAudioLevelLogs
+mmPornVideoLevelLog=mmPornVideoLevelLogs
+mmSamplePicLog=mmSamplePicLogs
+mmSampleVoipLog=mmSampleVoipLogs
 ########################################
 #大屏图表展示服务接口
 dashboardUrl=http://10.0.6.101:8080/galaxy/service/log/v1/
@@ -303,6 +311,12 @@ http_req_body_region=NTC_HTTP_REQ_BODY
 http_res_hdr_region=NTC_HTTP_RES_HDR
 http_res_body_region=NTC_HTTP_RES_BODY
 http_url_region=NTC_HTTP_URL
+http_redirect_url_region=PXY_CTRL_HTTP_URL
+http_redirect_req_hdr_region=PXY_CTRL_HTTP_REQ_HDR 
+http_redirect_res_hdr_region=PXY_CTRL_HTTP_RES_HDR
+http_redirect_req_body_region=PXY_CTRL_HTTP_REQ_BODY
+http_redirect_res_body_region=PXY_CTRL_HTTP_RES_BODY
+http_redirect_ip_region=PXY_CTRL_HTTP_IP
 voip_ip=av_voip_ip
 voip_account=av_voip_account
 ssl_sni_region=ssl_sni
@@ -310,6 +324,8 @@ ssl_san_region=ssl_san
 ssl_ca_region=ssl_ca
 ssl_ip_region=ssl_ip
 bgp_ip_region=bgp_ip
+behav_id_region=BEHAV_ID
+rate_limit_region=RATE_LIMIT
 #存在与表达式的关键字特殊分隔符
 keyword_expr=***and***
 #时区
@@ -390,4 +406,7 @@ picture_sample_proc_param_is_translation=false
 http_header_user_region_key=HTTP_HEADER
 http_header_dict_module=HTTP_HEADER_DISTRICT
 #dns自定义域参数key
-dns_strategy_user_region_key=DNS_STRATEGY
+dns_strategy_user_region_key=DNS_STRATEGY
+#特定服务类别
+specific_service_cfg_type_app=social_app
+specific_service_cfg_type_encrypted_tunnel_protpcol=encrypted_tunnel_protpcol