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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
This commit is contained in:
fangshunjian
2018-08-20 22:17:34 +08:00
parent 1bb113766b 14301b43f3
commit 974a34ea49
161 changed files with 10070 additions and 1890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,6 +389,8 @@ public final class Constants {
public static final String NTC_NTC_LWHH_REPORT=Configurations.getStringProperty("ntcLwhhReport","ntcLwhhReport");
public static final String NTC_NTC_ENTRANCE_REPORT=Configurations.getStringProperty("ntcEntranceReport","ntcEntranceReport");
public static final String NTC_IP_LOG = Configurations.getStringProperty("ntcIpLog","");
public static final String NTC_BGP_LOG = Configurations.getStringProperty("ntcBgpLog","");
public static final String NTC_P2P_LOG = Configurations.getStringProperty("ntcP2pLog","");
public static final String NTC_HTTP_LOG = Configurations.getStringProperty("ntcHttpLog","");
public static final String NTC_DNS_LOG = Configurations.getStringProperty("ntcDnsLog","");
public static final String NTC_SSL_LOG = Configurations.getStringProperty("ntcSslLog","");
@@ -482,6 +484,10 @@ public final class Constants {
public static final String REDIRECT_RESPONSE_CODE_STARTWITH = Configurations.getStringProperty("redirect_response_code_startwith","30");
public static final String REPLACE_ZONE_KEY = Configurations.getStringProperty("replace_zone_key","zone");
public static final String REPLACE_SUBSTITUTE_KEY = Configurations.getStringProperty("replace_substitute_key","substitute");
//P2P配置域
public static final String P2P_HASH_BIN_REGION = Configurations.getStringProperty("p2p_hash_bin_region","NTC_P2P_HASH_BIN");
public static final String P2P_KEYWORDS_REGION = Configurations.getStringProperty("p2p_keywords_region","NTC_P2P_KEYWORDS");
public static final String NTC_SUBSCRIBE_ID_REGION = Configurations.getStringProperty("ntc_subscribe_id_region","NTC_SUBSCRIBE_ID");
/**
* 样例文件URL关键字
*/
@@ -560,6 +566,9 @@ public final class Constants {
public static String HTTP_HEADER_DICT_MODULE=Configurations.getStringProperty("http_header_dict_module", "HTTP_HEADER_DISTRICT");
//DNS自定义域参数
public static String DNS_STRATEGY_USER_REGION_KEY=Configurations.getStringProperty("dns_strategy_user_region_key", "DNS_STRATEGY");
//P2P自定义域参数
public static String P2P_IP_TYPE_USER_REGION_KEY=Configurations.getStringProperty("p2p_ip_type_user_region_key", "P2P_IP_TYPE");
public static String P2P_HASH_TYPE_USER_REGION_KEY=Configurations.getStringProperty("p2p_hash_type_user_region_key", "P2P_HASH_TYPE");
//大屏统计分析查询接口URL
public static final String DASHBOARD_URL = Configurations.getStringProperty("dashboardUrl","dashboardUrl");