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

冲突处理

Browse Source
This commit is contained in:
段冬梅
2019-04-01 10:10:33 +08:00
parent 5e1095f2bb
commit 85da9461e5
1 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,14 +219,14 @@ clusterBStartTime=1503504000725
isCommit=true
############################################################################################################################################
############################################################################################################################################
httpUrl=http://10.0.7.14:9999/galaxy-service/service/cfg/
httpUrl=http://192.168.10.192:9999/galaxy-service/service/cfg/
maatCfg=v1/configSources
fileUploadCfg=v1/fileUploadSources
callbackCfg=v1/commonSources
fileDigestCfg=v1/fileDigestSources
configIdSources=v1/configPzIdSources
#logBaseUrl=http://10.0.6.242:8080/galaxy-service/service/log/v1/
logBaseUrl=http://10.0.7.14:9999/galaxy-service/service/log/
logBaseUrl=http://192.168.10.192:9999/galaxy-service/service/log/
ntcPzReport=v1/ntcPzReport
ntcServiceReport=v1/ntcServiceReport
ntcTagReport=v1/ntcTagReport
@@ -270,7 +270,7 @@ mmLogoDetectionLog=v1/mmLogoDetectionLogs
mmFaceRecognizationLog=v1/mmFaceRecognizationLogs
########################################
#\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3
dashboardUrl=http://10.0.7.14:9999/galaxy-service/service/log/
dashboardUrl=http://192.168.10.192:9999/galaxy-service/service/log/
trafficIpActive=v1/trafficIpActive
trafficProtocol=v1/trafficProtocol
trafficApp=v1/trafficApp
@@ -444,43 +444,43 @@ mm_logo_detection_region=MM_LOGO_DETECTION
mm_face_recognization_region=MM_FACE_RECOGNIZATION
#\u6837\u4f8b\u6587\u4ef6\u751f\u6210\u7a0b\u5e8f
audio_sample_create_proc=/home/ceiec/av_feature_gen/audio_convert_proc
video_sample_create_proc=/home/ceiec/av_feature_gen/extract_frame_feature
picture_sample_create_proc=/home/ceiec/av_feature_gen/picture_convert_proc
speaker_sample_create_proc=java -jar /home/sampleTest.jar
logo_sample_create_proc=/home/ceiec/av_feature_gen/logo_convert_proc
face_sample_create_proc=/home/ceiec/av_feature_gen/face_convert_proc
audio_sample_proc_param_is_quotation=true
video_sample_proc_param_is_quotation=true
picture_sample_proc_param_is_quotation=true
speaker_sample_proc_param_is_quotation=true
logo_sample_proc_param_is_quotation=true
face_sample_proc_param_is_quotation=true
audio_sample_proc_param_is_translation=false
video_sample_proc_param_is_translation=false
picture_sample_proc_param_is_translation=false
speaker_sample_proc_param_is_translation=false
logo_sample_proc_param_is_translation=false
face_sample_proc_param_is_translation=false
#audio_sample_create_proc=/home/ceiec/av_feature_gen/audio_convert_proc
#video_sample_create_proc=/home/ceiec/av_feature_gen/extract_frame_feature
#picture_sample_create_proc=/home/ceiec/av_feature_gen/picture_convert_proc
#speaker_sample_create_proc=java -jar /home/sampleTest.jar
#logo_sample_create_proc=/home/ceiec/av_feature_gen/logo_convert_proc
#face_sample_create_proc=/home/ceiec/av_feature_gen/face_convert_proc
#audio_sample_proc_param_is_quotation=true
#video_sample_proc_param_is_quotation=true
#picture_sample_proc_param_is_quotation=true
#speaker_sample_proc_param_is_quotation=true
#logo_sample_proc_param_is_quotation=true
#face_sample_proc_param_is_quotation=true
#audio_sample_proc_param_is_translation=false
#video_sample_proc_param_is_translation=false
#picture_sample_proc_param_is_translation=false
#speaker_sample_proc_param_is_translation=false
#logo_sample_proc_param_is_translation=false
#face_sample_proc_param_is_translation=false
#\u672c\u5730\u6d4b\u8bd5
#audio_sample_create_proc=java -jar D\:\\sampleTest.jar
#video_sample_create_proc=java -jar D\:\\sampleTest.jar
#picture_sample_create_proc=java -jar D\:\\sampleTest.jar
#speaker_sample_create_proc=java -jar D\:\\sampleTest.jar
#logo_sample_create_proc=java -jar D\:\\sampleTest.jar
#face_sample_create_proc=java -jar D\:\\sampleTest.jar
#audio_sample_proc_param_is_quotation=false
#video_sample_proc_param_is_quotation=false
#picture_sample_proc_param_is_quotation=false
#speaker_sample_proc_param_is_quotation=false
#logo_sample_proc_param_is_quotation=false
#face_sample_proc_param_is_quotation=false
#audio_sample_proc_param_is_translation=true
#video_sample_proc_param_is_translation=true
#picture_sample_proc_param_is_translation=true
#speaker_sample_proc_param_is_translation=true
#logo_sample_proc_param_is_translation=true
#face_sample_proc_param_is_translation=true
audio_sample_create_proc=java -jar E\:\\sampleTest.jar
video_sample_create_proc=java -jar E\:\\sampleTest.jar
picture_sample_create_proc=java -jar E\:\\sampleTest.jar
speaker_sample_create_proc=java -jar E\:\\sampleTest.jar
logo_sample_create_proc=java -jar E\:\\sampleTest.jar
face_sample_create_proc=java -jar E\:\\sampleTest.jar
audio_sample_proc_param_is_quotation=false
video_sample_proc_param_is_quotation=false
picture_sample_proc_param_is_quotation=false
speaker_sample_proc_param_is_quotation=false
logo_sample_proc_param_is_quotation=false
face_sample_proc_param_is_quotation=false
audio_sample_proc_param_is_translation=true
video_sample_proc_param_is_translation=true
picture_sample_proc_param_is_translation=true
speaker_sample_proc_param_is_translation=true
logo_sample_proc_param_is_translation=true
face_sample_proc_param_is_translation=true
#http\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570
http_header_user_region_key=HTTP_HEADER
http_header_dict_module=HTTP_HEADER_DISTRICT
@@ -544,7 +544,7 @@ ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(
#\u57df\u540d\u9a8c\u8bc1\u6b63\u5219
domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$
#IP\u590d\u7528maat json\u4e2d\u7684ip region\u5355\u6b21send \u6700\u5927\u4e2a\u6570
maat_json_send_size=20000
maat_json_send_size=10000
#\u5bfc\u5165\u9a8c\u8bc1\u7684\u7ebf\u7a0b\u6570\u91cf
mulity_thread_size=5
ntcRadiusReport=v2/ntcRadiusReport
@@ -565,7 +565,7 @@ userPasswordSet=UserPasswordSet
userDelete=UserDelete
userGet=UserGet
userList=UserList
ip_reuse_call_cgi_url=http://10.4.10.32:8090/command
ip_reuse_call_cgi_url=http://192.168.11.137:8090/command
ipNumGet=IpNumGet
allIpGet=AllIpGet
#\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5
@@ -577,7 +577,7 @@ trafficBandwidthTrans=v1/trafficBandwidthTrans
trafficProtocolList=v1/trafficProtocolList
trafficAppList=v1/trafficAppList
ntcActionEntranceReport=v1/ntcActionEntranceReport
redis.host=10.0.4.2:6379
redis.host=192.168.10.192:6384
redis.expire=1800
redis.timeout=10000
dns_spoofing_ip_desc=Default Spoofing IP
@@ -599,14 +599,14 @@ trafficWebsiteListNoTime=v1/trafficWebsiteListNoTime
trafficTopicList=v1/trafficTopicList
trafficDomainTrans=v1/trafficDomainTrans
#maximum number to import
import_limit=10000
import_limit=20000
trafficPortActiveFiveMinute=v1/trafficPortActiveFiveMinute
trendTotalReport=v1/trendTotalReport
#\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835
ntcEventsMonitorOrBlock=v1/ntcEventsMonitorOrBlock
#\u91cd\u70b9\u4fdd\u969c\u4e8b\u4ef6
ntcEventKeyProtection=v1/ntcEventKeyProtection
dashboardUrlV2=http://10.0.7.14:9999/galaxy-service/service/log/v2/
dashboardUrlV2=http://192.168.10.192:9999/galaxy-service/service/log/v2/
trafficAreaStat=v1/trafficAreaStat
logServiceTopn=v1/logServiceTopn
blockAndDropStat=v1/blockAndDropStat
@@ -621,4 +621,6 @@ ntcHttpRecordLog=v1/ntcHttpRecordLogs
trafficAppPpsTrend=v1/trafficAppPpsTrend
trafficAppBpsTrend=v1/trafficAppBpsTrend
#vpn cgi error info
cgiError=cannot connect to vpnserver,Connection to the server has failed,Specified object can not be found,Too many users,User already exists,Too many created users,The destination server is not a VPN server,The connection has been interrupted,
cgiError=cannot connect to vpnserver,Connection to the server has failed,Specified object can not be found,Too many users,User already exists,Too many created users,The destination server is not a VPN server,The connection has been interrupted,
#\u83b7\u53d6\u670d\u52a1\u914d\u7f6e\u603b\u91cf\u63a5\u53e3
getConfigByService=v1/getConfigByService