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

1845 Commits

Author SHA1 Message Date
wangxin
f373fa1a3c 修正界面行为一列部分未展示的bug 2018-10-07 20:19:55 +08:00
wangxin
34d56b814e 调整协议字段取值 2018-10-06 23:10:54 +08:00
duandongmei
210ba71901 domainSub界面的十六进制信息展示更改 
摘要审核失败bug更改
文件拦截策略表单必填项增加校验
dnat复用地址池隐藏方向属性
snat复用地址池隐藏方向属性
 2018-10-06 15:01:10 +08:00
duandongmei
d7d0ad706f Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-06 12:16:52 +08:00
duandongmei
55d25bc92d service层 saveCfgIndexOf方法增加 
ip_drop国际化更改
 2018-10-06 12:16:12 +08:00
leijun
4d0fddf8e7 HTTP-URL页面优化 2018-10-06 00:27:06 +08:00
zhangwq
236660f3ce IP复用策略拆分为SNAT/DNAT复用策略. 2018-10-05 21:31:48 +08:00
leijun
c06d7e11cb http_url 
1、动作：白名单，阻断，监测
2、白名单业务为原有的域名白名单，阻断和监测业务为HTTP的阻断和监测业务
 2018-10-05 02:26:15 +08:00
wangxin
bcf66ef52d IP端口隐藏显示分开 2018-10-04 19:45:39 +08:00
duandongmei
6fb3d05a92 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
	
	业务配置的list和form的标题取自菜单的国际化code;
	修改dns ssl P2P mail ftp无subscribe时，无预配置也可提交的bug
 2018-10-04 13:13:00 +08:00
duandongmei
e6c8e78134 国际化文件更改 2018-10-04 12:59:52 +08:00
wx7614140
4c1bcce61d asn_reject,asn_monit国际化 2018-09-30 18:32:28 +08:00
wangxin
af9d0bae48 加入验证规则TCP,UDP协议端口可以不为0其他协议端口必须为0端口号不为0时必须选择协议 2018-09-30 18:13:13 +08:00
zhangwei
fa082dc89f 增加APP特征的清库sql 
Signed-off-by: zhangwei <zhangwei@zdjizhi.com>
 2018-09-30 16:56:05 +08:00
zhangwei
0163de8120 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-09-30 16:53:58 +08:00
zhangwei
cd17eb37c4 修改俄文国际化 2018-09-30 16:50:45 +08:00
wangxin
47a0490b87 协议arbitrary修改为all 2018-09-30 16:00:21 +08:00
zhangwei
c7ab561590 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-09-30 14:39:21 +08:00
duandongmei
47f39dfc99 业务配置标题与菜单名称保持一致 2018-09-30 11:36:09 +08:00
duandongmei
3e0877f85b Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-09-30 11:34:14 +08:00
duandongmei
4d7fc28aa1 业务配置的list和from界面的title从菜单中取 2018-09-30 11:33:42 +08:00
wangxin
14cc0cd496 修改PROTOCOL字典GRE项 2018-09-30 11:29:32 +08:00
wangxin
025182e551 (1)实时报表动作替换为serviceId 
(2)配置日志总量统计查询条件action替换为serviceId
(3)配置列表日志总量列加入serviceId
(4)配置日志总量跳转到日志列表action替换为serviceId
(5)配置日志相关js提取到pzLog。js中
 2018-09-30 10:54:30 +08:00
duandongmei
e69191219a IpPayload标题增加 2018-09-30 10:16:01 +08:00
duandongmei
97a8868998 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
ip_payload功能新增
 2018-09-30 10:01:52 +08:00
duandongmei
16f3b0e15a ishexbinbug更改 
ip表单拆成ip domain和payload
 2018-09-30 09:56:20 +08:00
wangxin
61b56958c6 (1)ip地址功能整个asn功能 
(2)ip域处理提到单独的js ipRegion.js中
 2018-09-29 21:46:17 +08:00
zhangwenqing
a29c6367b3 生效区域配置下发格式修改. 2018-09-29 21:41:03 +08:00
leijun
02257001b4 新增界面去除title 2018-09-29 21:14:18 +08:00
leijun
9db2e73d04 新增界面去除title 2018-09-29 21:12:47 +08:00
leijun
5e2efc3e5a IP复用地址池国际化 2018-09-29 20:50:55 +08:00
leijun
0e87242c67 IP复用地址池配置 
拆分为两个子菜单：SNAT地址池管理和DNAT地址池管理
 2018-09-29 20:48:12 +08:00
leijun
7292839ea5 区域选择弹框调整，表头样式优化 2018-09-29 14:56:08 +08:00
zhanghongqing
04d8fb2438 voip ip和voipaccount合并数据库修改sql,新增页面增加协议提示 2018-09-29 10:31:42 +08:00
wangxin
7607649143 更改ip地址 ratelimit service_id 2018-09-29 09:09:17 +08:00
zhanghongqing
a38093347f 1、voip合并，2、subscribeId新增时提交的问题 2018-09-28 20:20:51 +08:00
wangxin
75060d9a09 ip配置form表单调整action与协议 2018-09-28 19:34:04 +08:00
duandongmei
190d924195 group type去掉ip group type增加snat ip和dnat ip； 
ddos ip pattern只有ip和ipmask，port pattern只有port，direction只有single;
ip whitelist 去掉subscribe
 2018-09-28 18:36:04 +08:00
zhangwei
23ae8cfc64 修改数据库ip 2018-09-28 16:55:34 +08:00
zhangwei
2912aaee19 修改外网开发使用数据库名称 2018-09-28 16:18:25 +08:00
leijun
fbabc9daed 修复app协议action为drop dolog隐藏 2018-09-28 14:55:12 +08:00
leijun
3636a10020 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-09-28 14:37:03 +08:00
leijun
d018e2797e message 样式调整 2018-09-28 14:36:51 +08:00
duandongmei
d96be667cd service和region增加字典id过滤； 
导出修改注释添加到对应cell
 2018-09-28 14:29:28 +08:00
duandongmei
8debf0d38d Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-09-28 14:23:39 +08:00
zhangwenqing
9ce49b9e25 1.生效区域下发格式修改 2.日志总量日志查询时间修改 2018-09-28 12:00:13 +08:00
wangxin
ab50f58560 调整删除asn ip验证，只有下发过的asn ip需要ajax后台判断。调整ajax判断sql 2018-09-28 11:49:53 +08:00
duandongmei
3d1c0ed5e3 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-09-28 11:28:08 +08:00
duandongmei
1fc335f750 导入界面样式更改 
是否表达式和是否十六进制初始化顺序更改
 2018-09-28 11:27:40 +08:00
wangxin
520a336037 注释掉${_cfg.behavCode}的判断，页面修改时直接调用ajax添加行为 2018-09-28 10:19:50 +08:00