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

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接口
2018-10-10 17:54:17 +08:00
parent a763e92aaf 9f0f87b745
commit cdb48cebac
52 changed files with 427 additions and 104 deletions
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -250,7 +250,7 @@ ntcMailLog=ntcMailLogs
 ntcFtpLog=ntcFtpLogs
 ntcAppLog=ntcAppLogs
 ntcDdosLog=ntcDdosLogs
-dkBehaviorLog=dkBehaviorLogs
+dkBehaviorLog=ntcAppLogs
 mmVoipLog=mmVoipLogs
 mmAvIpLog=mmAvIpLogs
 mmAvUrlLog=mmAvUrlLogs