gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,806 Commits 14 Branches 0 Tags
c91086c2d19dea1126970fc1a71ac98ff0fce7ed
Commit Graph

1806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leijun
c91086c2d1 日志管理界面优化及国际化添加 2018-10-12 20:05:32 +08:00
leijun
5f671e9409 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-12 19:31:27 +08:00
leijun
cb2ce6f8ba Stream Media 域配置 
NTC_STREAM_MEDIA_URL
NTC_ SUBSCRIBE_ID
NTC_UNIVERSAL_IP[protocol_id=23]
NTC_UNIVERSAL_PROTO_TYPE
 2018-10-12 19:31:16 +08:00
zhanghongqing
6195d6042c 流量统计增加活跃IPTOP10一个小时内的趋势，增加一个小时内TOP10最大值，增加接口错误处理 2018-10-12 18:12:24 +08:00
zhangwei
2fc5d87067 Merge remote-tracking branch 'origin/develop' into develop 2018-10-12 17:42:39 +08:00
zhangwei
785c356d90 修改组织机构信息列表样式 2018-10-12 17:39:23 +08:00
zhangwei
cb65ec3f1d 修改中间服务层的测试服务URL 2018-10-12 17:37:02 +08:00
wangxin
99d1bfe116 （1）流媒体protocol字段国际化修改 
（2）流媒体接口url修改
（3）ip日志查询条件后台动作换成service
 2018-10-12 17:19:21 +08:00
zhangwq
a70a3b6367 提交国际化代码. 2018-10-12 13:22:58 +08:00
zhangwei
0002deba77 系统日志实体增加菜单功能ID属性 2018-10-12 10:32:46 +08:00
duandongmei
c5130454f1 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

voip 和流媒体域与服务端表名更改
国际化文件增加voip和流媒体域描述
 2018-10-11 19:40:01 +08:00
duandongmei
e25be9a7a2 monitring和monit修改为monitor，增加voip和流媒体域国际化 2018-10-11 19:36:34 +08:00
wangxin
ef6d793d6b （1）调整ip配置界面 
（2）ip配置界面ip限速加入用户自定义域
 2018-10-11 19:09:28 +08:00
zhangwei
4c63f3b27f Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-11 18:55:57 +08:00
leijun
905a3a3821 ip 配置 2018-10-11 18:54:05 +08:00
zhangwei
d30bb40798 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-11 18:41:31 +08:00
zhangwei
fc8a9e4a57 系统行为日志记录功能修改 2018-10-11 18:39:40 +08:00
leijun
cfa8d8ed5b 文件摘要国际化添加 2018-10-11 18:38:26 +08:00
leijun
d47adc3ce1 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-11 18:36:19 +08:00
leijun
97a06a9874 VoIP ip配置修改 2018-10-11 18:33:23 +08:00
duandongmei
47697c9359 菜单国际化名称更改 
ippayload ip配置必输
topic domain去掉表达式和十六进制展示
 2018-10-11 15:52:11 +08:00
leijun
aa6c1963e7 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-11 15:04:27 +08:00
leijun
2dc6975467 http-url 界面调整 2018-10-11 15:02:24 +08:00
Administrator
49b4af58ad 样例level范围75-99.block默认为0 不显示 2018-10-11 11:31:36 +08:00
zhangwq
c8dfee7970 配置列表检索条件修改. 2018-10-10 18:30:54 +08:00
duandongmei
a0bb2e5fff app日志增加属性实体类提交 2018-10-10 17:57:26 +08:00
duandongmei
e7e91a519a Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-10 17:56:43 +08:00
duandongmei
cdb48cebac 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
zhangwq
9b53712d3e snat/dnat复用策略列表修改. 2018-10-10 17:53:28 +08:00
duandongmei
a763e92aaf app的日志检索改为查ntcAppLogs接口，属性有变更 2018-10-10 17:50:36 +08:00
wangxin
9f0f87b745 专项任务表头修改 2018-10-10 17:21:03 +08:00
wangxin
ef2896e234 替换系统字典菜单ID，解决common.js中的字段省略处理对修改按钮的影响 2018-10-10 17:09:55 +08:00
wangxin
653b56f5c6 bgp日志type字段换成字典取值，as字段换成asNum 2018-10-10 16:55:34 +08:00
wangxin
8d48d9a354 （1）音视频url日志字段修改 
（2）所有日志传输层协议国际化修改
（3）部分国际化修改
 2018-10-10 16:17:19 +08:00
leijun
8cc18a96a7 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-10 15:29:14 +08:00
leijun
1b3ee67f4c 区域和运营商管理的itemcode增加当前类型下的有效配置，itemcode不重复 2018-10-10 15:29:01 +08:00
Administrator
1f93df146c 1.提交修改数据库keywords长度2048，cfg_desc长度128，district长度128 
2.专项任务表单增加长度限制
3.关键字长度增加限制
4.实时报表来函列表过长省略
 2018-10-10 15:08:04 +08:00
duandongmei
24c7aaaed8 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
 2018-10-10 14:00:18 +08:00
duandongmei
608a74eace 实时统计增加合计国际化 2018-10-10 13:57:52 +08:00
wangxin
5042d6e99b (1)文件摘要日志检索功能提交 
(2)BGP日志增加字段type,as route
 2018-10-09 18:14:27 +08:00
wangxin
821132931a 捕捉异常后log日志打印改为logger.error 2018-10-09 16:36:11 +08:00
leijun
87c58379b8 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-09 16:12:22 +08:00
leijun
346f2982a1 文件长度增加单位 2018-10-09 16:12:09 +08:00
wangxin
4ee273acb3 解决EDGE下IP自动加入超链的问题 2018-10-09 15:29:55 +08:00
leijun
0e09654c56 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-09 15:00:02 +08:00
leijun
7915c4216b Special task的国际化改成Task 2018-10-09 14:59:49 +08:00
wangxin
69b3626ae2 业务配置界面Tag调整，修改支持全选，不选时默认值0的设置调整 2018-10-09 13:56:30 +08:00
zhangwq
6fa2926268 区域、运营商配置下发格式修改. 2018-10-09 11:53:09 +08:00
leijun
f73f390841 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-09 10:21:07 +08:00
leijun
d0b7fbea4d 界面业务配置的检索条件Confirm Valid和列表的effective State保持一致 2018-10-09 10:20:54 +08:00