Commit Graph

2678 Commits

Author SHA1 Message Date
leijun
1cdaa9b19b 解决 protocol identify导出 匹配不到字典信息时显示默认值 2018-12-18 18:18:46 +08:00
zhangwei
b81dca0fae Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-18 15:30:53 +06:00
zhangwei
0704d61cb8 只有音频和视频样例有提示说明信息 2018-12-18 15:30:32 +06:00
wangxin
1bc0f0381f Merge branch 'develop' of https://wangxin:QFDZ1534WxzN@git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-18 15:17:42 +06:00
wangxin
9aa60164cf 域名统计添加一个打印按钮用于演示 2018-12-18 15:17:22 +06:00
zhangwei
a464ad4abd 更新国际化 2018-12-18 15:15:55 +06:00
zhangwenqing
9d13f4346c Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-18 17:01:20 +08:00
zhangwenqing
cbbb888720 IP白名单 APP协议IP APP域名特征导入页隐藏来函性质分类. 2018-12-18 17:01:10 +08:00
wangxin
ad5107928d (1)导入模板生成取消将function_region_dict中字段只只有一个的时候,方向,协议,大小写敏感等字段隐藏
(2)ip导入方向协议导入时填入默认值
2018-12-18 14:58:48 +06:00
leijun
317cb9ab28 解决IP Spoofing表单不对应
解决 msgProp读取不到文件时,空指针错误
2018-12-18 16:49:16 +08:00
wangxin
b58b710d47 Merge branch 'develop' of https://wangxin:QFDZ1534WxzN@git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-18 13:11:09 +06:00
zhangwei
560eb2d815 修改仿冒IP相关功能属性的默认值,以及顶部菜单的字数截取限制 2018-12-18 13:09:22 +06:00
wangxin
5e43e3f52e ddosIP导入根据DDOS Protocol
设置Protocol
2018-12-18 13:06:17 +06:00
wangwenrui
9bed38f4e8 修复自定义比较后台报错 2018-12-18 15:00:16 +08:00
wangxin
dafa40a3af Merge branch 'develop' of https://wangxin:QFDZ1534WxzN@git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-18 12:56:12 +06:00
wangxin
54f47663c3 ddos IP协议值跟DDOS协议互相关联 2018-12-18 12:54:15 +06:00
zhangwei
96fdd8772d 批量下发时不打印json数据日志 2018-12-18 12:41:58 +06:00
zhangwenqing
7cca77addf 导入增加性质、分类. 2018-12-18 14:17:35 +08:00
wangxin
9355918750 (1)Packet IP Block限制协议值为6
(2)导入加入账号保存的方法
2018-12-18 10:09:14 +06:00
zhangwei
05677333ef 增加asn查询条件 2018-12-18 06:30:59 +06:00
zhangwei
0d754f5949 修改统计报表的数据列,以及导出忽略的列,以及ip range list查询范围 2018-12-18 06:00:42 +06:00
dongxiaoyan
73eeb14ef0 Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-18 07:40:37 +08:00
dongxiaoyan
d377fcbf89 导出列问题修改 2018-12-18 07:38:27 +08:00
zhanghongqing
ab7f79c47a 增加国际化文件 2018-12-18 07:31:33 +08:00
dongxiaoyan
97c867208b Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-18 07:16:57 +08:00
dongxiaoyan
f844ea60b9 调整时间和其他条件的位置,统一 2018-12-18 07:04:35 +08:00
tanghao
961ce94631 修复主题区域刷新错误问题 2018-12-18 06:49:48 +08:00
dongxiaoyan
67f8730fee 调整导出列选择的问题 2018-12-18 06:24:03 +08:00
dongxiaoyan
6ac2cfccab NTCIPRANCE报表查询调整 2018-12-18 06:10:15 +08:00
wangxin
0748992b8d Merge branch 'develop' of https://wangxin:QFDZ1534WxzN@git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-18 03:25:37 +06:00
wangxin
784fee2ab7 修复导入excel前列为空时自动补全空列 2018-12-18 03:25:21 +06:00
zhangwei
deb7532de9 修改spoofing
group分解为snat组和dnat组,仿冒IP池引用snat组direction=2,引用dnat组direction=1
2018-12-18 03:09:48 +06:00
tanghao
fadf57b51d update 2018-12-18 05:03:17 +08:00
dongxiaoyan
f492ec8353 ANS\HTTPS report界面调整提交 2018-12-18 04:19:49 +08:00
tanghao
45b1d4b324 帮洪庆提交 内容:网站域名统计详情 2018-12-18 03:59:34 +08:00
doufenghu
056289209e Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC into develop 2018-12-18 01:04:24 +06:00
doufenghu
29099acda0 修正首页pass live 数量的位置
修正通联关系 单向流占比显示
2018-12-18 00:53:18 +06:00
zhangwei
f280af71b7 修改国际化字典 2018-12-18 00:13:48 +06:00
wangxin
efd08e1faa ddos IP导入protocl根据DDOS协议切换 2018-12-17 23:14:31 +06:00
zhangwei
05ae3f8d1d 修改http日志的Action显示 2018-12-17 22:53:28 +06:00
tanghao
0244c55ced 帮雷军提交 修改内容:导出csv文件乱码解决 http、网页关键字日志添加检索条件 2018-12-18 00:09:10 +08:00
tanghao
8d69dc2df4 Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-17 23:44:20 +08:00
tanghao
765cbb4fe3 merge 2018-12-17 23:44:11 +08:00
tanghao
3ef37ce356 优化 Traffic性能 2018-12-17 23:42:59 +08:00
zhangwei
d7f6c6de49 删除影响项目编译效率的代码 2018-12-17 21:32:04 +06:00
zhangwei
8a3633d1c3 APP payload特征增加session数值域配置 2018-12-17 21:26:04 +06:00
wangxin
c4423ff900 策略分组拆分为4个菜单 2018-12-17 21:06:45 +06:00
default
570a98f87a Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2018-12-17 20:14:21 +08:00
default
28691719d9 主题点击进入详情功能 2018-12-17 20:14:14 +08:00
wangxin
e1d3a8d849 修改联通日志的appLabel字段类型为String 2018-12-17 18:14:09 +06:00