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

1858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
duandongmei
6b610bf665 ip模板提交 
样例的level改成下拉选项
拦截强度做成下拉选项
 2018-10-17 10:06:08 +08:00
zhanghongqing
6f10ac027e 请求头中自定义增加不可见字符校验 2018-10-17 10:05:56 +08:00
duandongmei
cd7f4cc101 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-17 10:03:38 +08:00
duandongmei
90828d3414 nis本地提交 2018-10-17 10:03:27 +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
duandongmei
d392d7cdb6 去掉拦截强度的旧选项国际化 2018-10-16 18:19:09 +08:00
duandongmei
bba2c0f19f Certificate Strategy改名为 Key Ring 
拦截强度 Intercept intensity改为Intercept Related Domains (YES/NO)默认是NO
http content统一为http body。
http replace search in 默认为http response body
 2018-10-16 18:17:46 +08:00
zhangwei
3b8d2a4168 音视频场景配置不在数据库脚本中预置，界面功能按钮触发预置。 2018-10-16 15:42: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
leijun
d8857c7a5f Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-15 19:19:04 +08:00
wangxin
79071fd6a6 (1)更改IP验证选择相关属性的选择方式，去掉各种parents 
(2)ip range 限制C网段，并且网络位必须相同
(3)IPSEC协议调整，ESP,AH加入字典
 2018-10-15 19:17:55 +08:00
leijun
905067c68c Stream Media 字典修改 2018-10-15 19:15:58 +08:00
duandongmei
3aa398811a intercept domain 增加拦截强度 2018-10-15 19:12:10 +08:00
zhangwei
7eb2c88858 修改生效区域字典信息 2018-10-15 18:07:43 +08:00
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