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

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

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	关键字日志转http url配置功能完成
This commit is contained in:
duandongmei
2018-10-29 16:29:23 +08:00
parent 65ba7f2d7a 27575259a8
commit a30d80e64e
98 changed files with 2202 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/messages/message_en.properties
View File

@@ -1298,4 +1298,5 @@ ruleLimitTip=The number of effective rules has reached the limit(%s).
av_protocol_note=Note:Recognizable Protocols Include RTSP,RTMP.
ip_range_in_the_same=Start IP and end IP in a IP range must with in the same subnet
log_to_url=To HTTP URL
source_compile_id=Configuration Source
source_compile_id=Configuration Source
ip_range_in_the_same=Start IP and end IP in a IP range must with in the same subnet