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

957 Commits

Author SHA1 Message Date
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
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
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
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
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
leijun
ccbc1d5eff ftp、dns、mail、http导出 2018-10-18 11:24:12 +08:00
leijun
5cb07b724c 解决火狐浏览器文件名空格出现+号 2018-10-18 11:15:25 +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
duandongmei
c8633639ff 音视频文件去掉单个文件的大小校验 2018-10-17 17:19:51 +08:00
duandongmei
cbfe2a6498 修改导出无数据BUG 2018-10-17 17:00:40 +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
6b610bf665 ip模板提交 
样例的level改成下拉选项
拦截强度做成下拉选项
 2018-10-17 10:06:08 +08:00
zhangwei
2bdacc7ba1 YSP样例文件增加时长验证功能。 2018-10-16 19:39:55 +08:00
wangxin
26ff72663c app ip分组复用新增两个属性（1）service，用于综合服务判断app ip业务；（1）userRegion，用于传入APP_ID 2018-10-16 19:32:30 +08:00
leijun
2f5ec8ee12 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-16 19:12:05 +08:00
zhangwq
b4668c734b 提交分组地理信息管理. 2018-10-16 18:59:30 +08:00
zhangwei
09181c6764 1、配置预置初始需要在配置表中插入一条记录，并初始下发服务接口； 
2、配置修改action后需要审核流程，才可下发更新服务接口配置内容或配置状态。
 2018-10-16 15:28:27 +08:00
leijun
c06a527297 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-16 13:51:16 +08:00
leijun
b6db2b5a0f PXY_HTTP_LOG 属性website补全属性 2018-10-16 11:21:07 +08:00
duandongmei
bc0b5cf850 voip日志接口修改为ntcVoipLogs 
音视频外部程序目录固定
bgp日志缺少scene file属性更改
 2018-10-16 11:04:21 +08:00
leijun
35e0446279 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-16 09:14:35 +08:00
leijun
8c77c1e054 PXY_HTTP_LOG web_site补全属性 2018-10-16 09:14:21 +08:00
duandongmei
f73cdd0741 域名拦截强度自定义域增加 2018-10-15 19:30:04 +08:00
duandongmei
1b1b68d2c8 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-15 19:28:31 +08:00
duandongmei
ab59fbd2ce 域名拦截强度，国际化文件更改 2018-10-15 19:28:19 +08:00
duandongmei
fe516d44a8 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-15 19:22:17 +08:00
wangxin
79071fd6a6 (1)更改IP验证选择相关属性的选择方式，去掉各种parents 
(2)ip range 限制C网段，并且网络位必须相同
(3)IPSEC协议调整，ESP,AH加入字典
 2018-10-15 19:17:55 +08:00
duandongmei
3aa398811a intercept domain 增加拦截强度 2018-10-15 19:12:10 +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
e75c540e74 修改日志ddos拆分为两个日志 2018-10-15 11:12:00 +08:00
duandongmei
6880363d9a voip界面去掉无用的检索条件 
摘要文件类型增加音视频文件类
ip和http增加配置导出
 2018-10-15 10:14:01 +08:00