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

nis和congstans冲突解决

Browse Source
This commit is contained in:
duandongmei
2018-07-24 15:16:50 +08:00
parent 5d99522e57
commit d48549fb03
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/util/Constants.java
View File

@@ -7,6 +7,11 @@ import java.util.Map;
import com.google.gson.GsonBuilder;
public final class Constants {
/**
*
*/
public static String SPECIFIC_SERVICE_CFG_TYPE_APP=Configurations.getStringProperty("specific_service_cfg_type_app", "social_app");
public static String SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_PROTPCOL=Configurations.getStringProperty("specific_service_cfg_type_encrypted_tunnel_protpcol", "encrypted_tunnel_protpcol");
/**
* 报表去重连接符
*/
@@ -379,6 +384,14 @@ public final class Constants {
public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", "");
public static final String NTC_MMPICIP_LOG = Configurations.getStringProperty("mmPicIpLog", "");
public static final String NTC_MMPICURL_LOG = Configurations.getStringProperty("mmPicUrlLog", "");
public static final String NTC_MMVOIP_IP_LOG = Configurations.getStringProperty("mmVoipIpLog", "");
public static final String NTC_MMVOIP_ACCOUNT_LOG = Configurations.getStringProperty("mmVoipAccountLog", "");
public static final String NTC_MMSAMPLEAUDIO_LOG = Configurations.getStringProperty("mmSampleAudioLog", "");
public static final String NTC_MMSAMPLEVIDEO_LOG = Configurations.getStringProperty("mmSampleVideoLog", "");
public static final String NTC_MMPORNAUDIOLEVEL_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", "");
public static final String NTC_MMPORNVIDEOLEVEL_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", "");
public static final String NTC_MMSAMPLEPIC_LOG = Configurations.getStringProperty("mmSamplePicLog", "");
public static final String NTC_MMSAMPLEVOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", "");
//报表类型,1- 配置命中总量业务
public static final Integer BUSINESSTYPE_CONFIG=Configurations.getIntProperty("businesstype_config", 1);
@@ -391,6 +404,8 @@ public final class Constants {
public static final Integer CLIENT_CONNECT_TIMEOUT = Configurations.getIntProperty("client_connect_timeout",1000);
public static final Integer CLIENT_READ_TIMEOUT = Configurations.getIntProperty("client_read_timeout",1000);
public static final Integer CLIENT_SOCKET_TIMEOUT = Configurations.getIntProperty("client_socket_timeout",1000);
public static final String BEHAV_ID_REGION = Configurations.getStringProperty("behav_id_region","BEHAV_ID");
public static final String RATE_LIMIT_REGION = Configurations.getStringProperty("rate_limit_region","RATE_LIMIT");
public static final String AREA_REGION = Configurations.getStringProperty("area_region","area_ip");
public static final String HTTP_IP_REGION = Configurations.getStringProperty("http_ip_region","http_ip");
public static final String HTTP_REQ_HEAD_REGION = Configurations.getStringProperty("http_req_hdr_region","http_req_hdr");
@@ -430,6 +445,7 @@ public final class Constants {
public static final String HTTP_REDIRECT_RES_HEAD_REGION = Configurations.getStringProperty("http_redirect_res_hdr_region","PXY_CTRL_HTTP_RES_HDR");
public static final String HTTP_REDIRECT_REQ_BODY_REGION = Configurations.getStringProperty("http_redirect_req_body_region","PXY_CTRL_HTTP_REQ_BODY");
public static final String HTTP_REDIRECT_RES_BODY_REGION = Configurations.getStringProperty("http_redirect_res_body_region","PXY_CTRL_HTTP_RES_BODY");
public static final String HTTP_REDIRECT_IP_REGION = Configurations.getStringProperty("http_redirect_ip_region","PXY_CTRL_HTTP_IP");
public static final String REDIRECT_RESPONSE_CODE_KEY = Configurations.getStringProperty("redirect_response_code_key","code");
public static final String REDIRECT_URL_KEY = Configurations.getStringProperty("redirect_url_key","url");
public static final String REDIRECT_CONTENT_KEY = Configurations.getStringProperty("redirect_content_key","content");

21
src/main/resources/nis.properties
View File

@@ -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