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
Stream模块相关的日志查询修改查询接口为ntcAppLogs接口
This commit is contained in:
duandongmei
2018-10-10 17:54:17 +08:00
parent a763e92aaf 9f0f87b745
commit cdb48cebac
52 changed files with 427 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1205,5 +1205,5 @@ transport_layer_protocol=TLS Protocol
av_voip_monit=VoIP Monit
av_voip_reject=VoIP Reject
label_proto_source=Protocol Source
label_behav_source=Behavior Source
label_app_source=APP Source
label_behav_source=Behavior Source
label_app_source=APP Source

4
src/main/resources/messages/message_ru.properties
View File

@@ -1207,5 +1207,5 @@ transport_layer_protocol=TLS Protocol
av_voip_monit=VoIP\u76D1\u6D4B
av_voip_reject=VoIP\u7BA1\u63A7
label_proto_source=Protocol Source
label_behav_source=Behavior Source
label_app_source=APP Source
label_behav_source=Behavior Source
label_app_source=APP Source

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1200,4 +1200,4 @@ av_voip_monit=VoIP\u76D1\u6D4B
av_voip_reject=VoIP\u7BA1\u63A7
label_proto_source=\u534F\u8BAE\u6765\u6E90
label_behav_source=\u884C\u4E3A\u6765\u6E90
label_app_source=\u5E94\u7528\u6765\u6E90
label_app_source=\u5E94\u7528\u6765\u6E90