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

797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxin
f94e43aa60 LogReport更名为NtcPzReport 2018-07-12 17:36:12 +08:00
wangxin
4519d86867 日志总量英文国际化值修改 2018-07-12 16:43:33 +08:00
duandongmei
7a0787081c 修改系统管理遮盖层不消失的bug 
修改图片url多一列数据的问题
 2018-07-12 16:22:07 +08:00
wangxin
a5f9ee791f Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-12 15:52:34 +08:00
wangxin
101837514f xml用function_id替换协议ID 2018-07-12 15:49:52 +08:00
zhangwei
3d954f1fca 用户自定义域不需要初始化预置 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-07-12 15:47:02 +08:00
wangxin
930373e999 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-12 15:20:47 +08:00
chenjinsong
af3171b17b 修复：1. 切换报表类型后默认时间消失 
2. 部分页面时间输入框消失
 2018-07-12 15:28:46 +08:00
wangxin
ed4e9201e3 协议ID修改 2018-07-12 15:19:37 +08:00
zhangwei
91799c01f9 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-12 15:01:01 +08:00
zhangwei
0e4583e7a5 修改HTTP监测时用户自定义域的HTTP头部匹配区域字典获取 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-07-12 14:59:50 +08:00
duandongmei
7ab708fd25 bgp去掉打开配置下发代码 2018-07-12 14:43:18 +08:00
wangxin
f1abf9062d Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-12 14:36:33 +08:00
wangxin
fabfc87741 实时报表页面重写自定义列功能 2018-07-12 14:35:53 +08:00
wangxin
cc61430930 （1）删除不再使用的旧版IP页面 
（2）公共IP页面调整IP复用逻辑，去除目的IP和目的端口的配置，IPSEC修复协议显示错误
 2018-07-12 13:50:39 +08:00
duandongmei
245c051d0a dns欺骗ip列表去掉目的ip、目的端口、方向和协议字段 2018-07-12 11:51:57 +08:00
duandongmei
a291a25ed2 修改tabInfo自适应css 
修改音视频、文件摘要、bgp、http替换、dnsresstrategy、dns fake ip的action取值方式
 2018-07-12 11:38:14 +08:00
wangxin
5ca5f4940b ipv4 ip范围默认值修改为0.0.0.0-0.0.0.0 2018-07-12 11:19:33 +08:00
wangxin
caac10f967 修改random为当前时间戳，防止tomcat高版本因为非法字符导致请求失败 2018-07-12 10:14:36 +08:00
duandongmei
27858999be Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
 2018-07-12 09:32:44 +08:00
duandongmei
7386312fa6 去掉 proxy_http_res_body_replace 
中的PXY
 2018-07-12 09:21:56 +08:00
wangxin
cdde9c1f6c （1）实时报表国际化 
（2）恢复报表遮罩层
 2018-07-12 09:08:25 +08:00
zhangwenqing
489a3f1088 报表页面修改. 2018-07-11 20:31:47 +08:00
zhanghongqing
b2d6524279 去掉统计图无用类 2018-07-11 19:05:08 +08:00
zhanghongqing
34892e5fd8 1.日志增加app,Ddos 2.修改日志类名3.增加国际化代码及日志nis配置4.修改页面需要的标签类 2018-07-11 18:15:59 +08:00
zhangwei
d303ffc9d7 修改顶部菜单内容过长时截取 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-07-11 18:00:13 +08:00
zhangwei
fa7ab0dd28 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-11 17:55:44 +08:00
zhangwei
4f1b7b0406 修改英文国际化文件 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-07-11 17:12:02 +08:00
wangxin
479f45a3d7 报表名称替换为国际化代码 2018-07-11 16:58:45 +08:00
wangxin
ec88f29689 IP白名单表单替换 2018-07-11 16:37:21 +08:00
duandongmei
4466b9c1e1 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
 2018-07-11 16:18:23 +08:00
duandongmei
89ec630a33 首页增加配置统计列表 2018-07-11 16:15:23 +08:00
chenjinsong
f067b24fba report前端分页bug修复 2018-07-11 15:38:37 +08:00
zhangwei
84338393d9 修改音视频文件样例配置功能，表单界面删除样例文件的上传，改由后台调用外部程序生成样例文件。 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-07-11 14:20:01 +08:00
chenjinsong
e989f78fe6 1.report前端分页 
2.report的时间搜索框显示默认时间（当日）
 2018-07-11 13:50:24 +08:00
wangxin
37b358eecb IP复用地址池审核权限修复 2018-07-10 17:50:39 +08:00
wangxin
7319513775 NtcPzReport移动到report包下，路径改为report 2018-07-10 17:26:43 +08:00
wangxin
e3e2417fca Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-10 16:51:33 +08:00
zhangwei
0504326fb6 国际化英文内容修改 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-07-10 17:03:50 +08:00
wangxin
d1ef4cfc15 修复修改样例文件配置时重新上传样例文件，下发MD5出错的bug 2018-07-10 16:50:46 +08:00
duandongmei
23c2da6dee Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-10 16:49:52 +08:00
duandongmei
83fb581fb5 冲突文件提交本地 2018-07-10 16:49:28 +08:00
zhangwei
73917c8a28 系统用户与系统角色在系统中尚未使用的字段属性使用隐藏域缺省值，不显示在界面中。 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-07-10 16:43:19 +08:00
wangxin
ad2e448e41 报表页面获取业务类型日志总量功能提交 2018-07-10 15:26:18 +08:00
wangxin
992cec2a17 报表列表界面只查询function_service_dict，其他属性的查询去掉 2018-07-10 14:00:24 +08:00
wangxin
96634ac0ba 报表tab默认选择标签 2018-07-10 13:51:33 +08:00
zhangwenqing
31a95bde28 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-10 14:03:59 +08:00
zhangwenqing
8d9d73a831 报表Controller修改. 2018-07-10 14:03:26 +08:00
wangxin
d1aa3227d9 标签，来函报表加入前台日期字段处理 2018-07-10 13:38:56 +08:00
wangxin
0e05e2a0e4 （1）境内源IP报表加入对界面时间字段的处理 
（2）时间字段的处理放到baseController中
（3）界面ajax函数缩减为1个公用的函数
 2018-07-10 13:33:28 +08:00