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

1823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhangwei
336437ec70 区域生效信息的ISP参数改为显示 2018-10-15 17:19:43 +08:00
zhangwei
442ad3c9c1 区域生效的ISP参数改为显示 
Signed-off-by: zhangwei <zhangwei2@iie.ac.cn>
 2018-10-15 17:15:08 +08:00
wx7614140
bfdf4e8d24 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-15 16:18:44 +08:00
wangxin
101372efd5 修复copyProperties覆盖属性的bug 2018-10-15 16:18:36 +08:00
zhangwei
c59e45b996 1、用户管理恢复用户身份标识字段配置，普通用户不能查看、新建、修改管理员用户； 
2、角色管理恢复角色类型字段配置，普通用户不能查看、新建、修改管理员类型的角色。

Signed-off-by: zhangwei <zhangwei2@iie.ac.cn>
 2018-10-15 15:41:01 +08:00
wangxin
b6276cdc8c (1)ipsec协议修改 
(2)ipv6掩码范围修改
(3)全部协议放开端口限制
 2018-10-15 15:26:43 +08:00
zhanghongqing
fd2a4cf28e 增加国际化配置 2018-10-15 14:37:50 +08:00
zhanghongqing
e75c540e74 修改日志ddos拆分为两个日志 2018-10-15 11:12:00 +08:00
duandongmei
6880363d9a voip界面去掉无用的检索条件 
摘要文件类型增加音视频文件类
ip和http增加配置导出
 2018-10-15 10:14:01 +08:00
leijun
4e98aa217f Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-13 10:48:03 +08:00
leijun
e6d29bbda5 流媒体界面查询优化 2018-10-13 10:47:52 +08:00
leijun
7cfa8147bb 流媒体 IP配置初始化隐藏 2018-10-13 10:26:37 +08:00
duandongmei
bede27ba2a Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-12 23:42:51 +08:00
duandongmei
4a06fc5044 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
	src/main/resources/nis.properties
 2018-10-12 22:33:13 +08:00
zhanghongqing
25def0b389 修改流量统计活跃IP判断条件 2018-10-12 20:30:09 +08:00
duandongmei
5722529e81 国际化增加 2018-10-12 20:25:15 +08:00
zhanghongqing
7c3d7c75c3 配置文件增加流量统计活跃IP近一小时的趋势接口路径 
增加活跃IPtop10的近一小时最大数据接口路径
 2018-10-12 20:10:58 +08:00
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