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

2049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leijun
070dcb911c 多媒体、ddos Excel导出功能 2018-10-19 19:41:19 +08:00
wangxin
eefe3b35dd 去除冲突标记 2018-10-19 17:52:01 +08:00
duandongmei
04833e917c Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into 
develop

Conflicts:
	src/main/webapp/WEB-INF/include/excel/importModal.jsp
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
增加region和service导入属性，动态控制导入业务
优化导入界面
 2018-10-19 17:19:52 +08:00
duandongmei
3b6a3b8721 优化ip导入，增加app选项 2018-10-19 16:37:37 +08:00
wangxin
02b7908116 修复userRegion3写成userRegion2的bug 2018-10-19 15:47:42 +08:00
wangxin
bd1e9b5fb9 (1)IP payload模板修改 
(2)IP导入方法加入参数path,functionId
(3)IP payload导入提交
 2018-10-19 15:28:17 +08:00
zhanghongqing
674dc1ea06 域名增加长度限制1024，自定义district限制长度64，website_domain_topic表域名长度修改为1024 sql提交 2018-10-19 14:34:34 +08:00
wangxin
777e78c167 (1)修复字段域导入时获取字典值失败原值被替换为空，影响验证的bug 
(2)packet ip ratelimit 字段验证
(3)packet ip 滚动条修复
 2018-10-19 12:46:15 +08:00
duandongmei
5655f16c32 导入模板replace_zone字典增加 
音视频样例120s
 2018-10-19 09:13:43 +08:00
zhanghongqing
905f19bc69 修改ddos协议跟流量阈值的位置 2018-10-18 20:22:49 +08:00
zhanghongqing
e40773def2 流量统计处理数据格式问题 2018-10-18 19:12:50 +08:00
leijun
075bdfcf5e Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-18 18:42:59 +08:00
leijun
78d472c223 界面配置域表达式处理 2018-10-18 18:41:36 +08:00
wangxin
672765d467 Excel导入配置的IP格式校验 2018-10-18 18:05:49 +08:00
leijun
71c5af409d 解决界面radio表达式未选中 2018-10-18 17:20:42 +08:00
leijun
62eb9cf7fc 关键字处理 2018-10-18 16:07:32 +08:00
leijun
1179daeb78 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-18 16:03:23 +08:00
leijun
286d1fb122 导出配置域关键字处理 2018-10-18 16:03:08 +08:00
zhanghongqing
55cd20f6bb 修改ddos审核问题 2018-10-18 15:02:18 +08:00
duandongmei
fce51498ae 域名拦截强度、丢包率，置信度、hex、case-sensitive字典增加 2018-10-18 13:55:13 +08:00
duandongmei
a9648c0a8b Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-18 13:53:48 +08:00
duandongmei
b695f209c3 字符串类处理和限速信息处理 2018-10-18 13:53:38 +08:00
zhanghongqing
17be1fc436 更新邮件菜单，function_region,function_service ,sql提交 2018-10-18 13:48:35 +08:00
leijun
7c3f452d2b 界面检索框优化 2018-10-18 11:49:12 +08:00
leijun
ccbc1d5eff ftp、dns、mail、http导出 2018-10-18 11:24:12 +08:00
leijun
6d3fcbf8be Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-18 11:15:35 +08:00
leijun
5cb07b724c 解决火狐浏览器文件名空格出现+号 2018-10-18 11:15:25 +08:00
zhanghongqing
8c96e21a27 流量统计调整图形显示排序，修改国际化 2018-10-18 11:10:10 +08:00
wangxin
bfaa681811 (1)端口掩码格式中的端口部分协议非TCP,UDP是加入非0校验 
(2)IP校验恢复起始IP不能相同的校验
 2018-10-18 10:45:18 +08:00
zhanghongqing
e9f7e1370f 修改国际化 2018-10-18 10:34:01 +08:00
zhanghongqing
60de40563a Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-18 10:28:45 +08:00
zhanghongqing
02f121e53a 配置关键字限制长度1024 2018-10-18 10:28:26 +08:00
wangxin
796de73bca Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-18 10:18:10 +08:00
wangxin
a277a4b29d (1)修正配置文件IP默认值 
(2)Packet,Whitelist IP的update方法去掉部分if判断
 2018-10-18 10:18:03 +08:00
zhanghongqing
849ba480de ddos提交 2018-10-18 10:14:15 +08:00
duandongmei
85d127c000 字符串类导入模板定义 2018-10-18 10:13:34 +08:00
zhanghongqing
b201c7a520 ddos 新增ddos协议跟流量阈值的下发，日志流量统计默认保护dddos 2018-10-18 10:11:38 +08:00
zhanghongqing
f17fe56c9d 增加ddos数据库增加字段sql,增加国际化 2018-10-17 18:53:40 +08:00
duandongmei
86f992d8cf Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-17 17:22:19 +08:00
duandongmei
c8633639ff 音视频文件去掉单个文件的大小校验 2018-10-17 17:19:51 +08:00
zhanghongqing
3ebd22e014 证书上传增加文件后缀名验证 2018-10-17 17:18:47 +08:00
duandongmei
cbfe2a6498 修改导出无数据BUG 2018-10-17 17:00:40 +08:00
duandongmei
a9b78e358a block时level默认为0 monitor时level默认100 
修改request、cfg、sys_log、proc_exec_log表的id为bigint
 2018-10-17 14:53:52 +08:00
duandongmei
94cb4fc9e4 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into 
develop

Conflicts:
	src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
	限速模板增加ratelimit字段，修改导出protocol注释信息
 2018-10-17 11:10:50 +08:00
duandongmei
2b1192df3e ip导出bug修正 2018-10-17 11:08:54 +08:00
zhangwei
aa690069bd 除图片外的其他音频、视频相关样例都增加验证时长的处理逻辑。 
Signed-off-by: zhangwei <zhangwei2@iie.ac.cn>
 2018-10-17 11:07:44 +08:00
leijun
e71d14254b 白名单、packed、stream导出 2018-10-17 10:36:38 +08:00
leijun
f7cbf39325 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-17 10:26:56 +08:00
duandongmei
263141ee5f 导入界面去掉多余c:forEach 2018-10-17 10:15:47 +08:00
zhanghongqing
5dd4f4b239 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-17 10:06:26 +08:00