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

1167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxin
76b7122c21 (1)修复特定服务新增时无法选择上级节点的bug 
(2)特定服务加入验证，当前节点的配置类型应当与上级配置一致
 2018-07-25 15:19:24 +08:00
zhangwei
4e0be5b70b 登录界面增加ico图标，左侧菜单去掉多余的/(解决记录操作日志时，因为多余的/匹配不上系统菜单，操作日志丢失) 2018-07-25 15:03:41 +08:00
duandongmei
8d92397dc5 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-25 13:36:05 +08:00
duandongmei
05fcfcf76e 修改not_found国际化中文 2018-07-25 13:35:41 +08:00
zhanghongqing
6398c30af0 修改日志ddos时间解析问题 2018-07-25 13:00:36 +08:00
wangxin
36b274fa4d 补充提交dao.xml 2018-07-25 12:42:18 +08:00
wangxin
fe2c7df204 (1)app策略修改dao.xml，update操作除了creatorId，creatorTime,editorId,editTime,auditor,aduitTime之外，去掉if 
null的判断
(2)app策略，基础协议页面ratelimit字段提交表单时如果atction不为限速，置空
 2018-07-25 12:41:54 +08:00
duandongmei
b670ef811f Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-25 10:01:54 +08:00
wangxin
724184fbd9 app策略行为类型字段在form表单一直展示 2018-07-25 10:00:29 +08:00
duandongmei
4b104a9fa6 HTTP替换业务转换空格和斜杠 
修改HTTP 业务下删除ip表sql（去掉protocolId条件）
 2018-07-25 09:58:30 +08:00
duandongmei
44afaabdf8 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-25 09:56:00 +08:00
duandongmei
aae475be90 增加HTTP replace的替换区域key和替换内容key 2018-07-25 09:55:17 +08:00
wangxin
3c19e75c63 （1）基础协议配置提交 
（2）修复IP配置没有的时候，APP策略点击展开时js报错，get(0)替换为eq(0)
 2018-07-24 18:45:27 +08:00
zhanghongqing
2b4404b40c 日志增加服务端，客户端位置信息字段 2018-07-24 18:14:21 +08:00
chenjinsong
8ca2b522a3 样例日志增加serverLocate和clientLocate 2018-07-24 17:56:53 +08:00
duandongmei
ea0b7a4df8 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-24 17:26:02 +08:00
zhangwenqing
344f250b32 添加音频、视频、图片样例日志. 2018-07-24 17:17:56 +08:00
duandongmei
b98b92c376 proxy属性增加国际化 2018-07-24 17:17:23 +08:00
duandongmei
4b26a62101 增加proxy模块国际化属性 
dns响应策略，有策略，只能选择非0组
ip欺骗由选择策略改为选择分组
 2018-07-24 17:15:42 +08:00
chenjinsong
d7b250e544 日志：voip样例、音频色情样例、视频色情样例 2018-07-24 15:58:20 +08:00
duandongmei
1efa4de4e8 去掉ipForm policy Group select0的情况 2018-07-24 15:33:07 +08:00
duandongmei
b72db052fd 增加http block、redirect、monit、whitelist、replace功能 
修改清空配置库sql语句
修改欺骗ip策略可空
 2018-07-24 15:20:05 +08:00
duandongmei
950872b5d1 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-24 15:17:18 +08:00
duandongmei
d48549fb03 nis和congstans冲突解决 2018-07-24 15:16:50 +08:00
zhanghongqing
255160214e 日志出入口编号改为字典中获取，去掉重复条件换为处理机IP 2018-07-24 14:36:21 +08:00
wangxin
6ae404cd3b 修正加密隧道行为字典，增加基础协议字典 2018-07-24 14:18:01 +08:00
wangxin
594c402a90 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-24 13:21:09 +08:00
wangxin
96df02fe1d 当用户选择行为类型的时候，表达式类型为与表达式 2018-07-24 13:20:27 +08:00
zhangwenqing
3a22b8621b 添加日志请求URL. 2018-07-24 11:43:16 +08:00
zhanghongqing
55567bc5e8 1.日志音视频voipIP,voipAccount展示2.图表增加跟前段时间对比 2018-07-24 11:19:37 +08:00
zhanghongqing
da5ded4b4e Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-24 11:17:11 +08:00
wangxin
8eda4424d3 修复app策略下发在有行为类别的时候下发连接符为\\&的bug 2018-07-24 11:11:22 +08:00
wangxin
56e7dd6751 app策略匹配方式改为子串匹配 2018-07-24 11:00:14 +08:00
zhanghongqing
dd7a478d88 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-24 10:59:14 +08:00
wangxin
ee6108c78b 修复查询社交应用无数据bug 2018-07-24 10:52:46 +08:00
wangxin
272afe55f7 (1)行为类型由userRegion改为加在behavCode字段上 
(2)界面展示行为类型的name
(3)审核自定义域添加BEHAV_ID
 2018-07-24 10:46:54 +08:00
zhanghongqing
95d780f1de Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-24 09:17:23 +08:00
zhanghongqing
3a11461acd 大屏页面列表中增加对比增减趋势显示，扇形图增加其它项others 2018-07-23 18:48:53 +08:00
wangxin
cb650427e4 (1)特定服务管理，增加一列，配置类型； 
(2)app策略，增加一列行为类型
 2018-07-23 18:48:11 +08:00
duandongmei
5d99522e57 去掉国际化中的“色情” 
修改avIp和avUrl日志list文件中的functionId判断
 2018-07-23 17:05:12 +08:00
zhangwenqing
c072e4a2aa 日志公共类增加属性. 2018-07-23 15:31:27 +08:00
duandongmei
ec6b09d6dd 增加控制策略下的国际化 
ctrl_http_reject=HTTP管控
ctrl_http_redirect=HTTP重定向
ctrl_http_replace=HTTP替换
ctrl_http_monit=HTTP监测
ctrl_http_whitelist=HTTP白名单
 2018-07-23 11:27:26 +08:00
wangxin
f93737b290 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-20 18:25:51 +08:00
wangxin
778eb6a657 lang 的声明放在外层，解决firefox报错 2018-07-20 18:24:33 +08:00
wangxin
143ac0f9a6 Update nis.properties 2018-07-20 16:40:21 -04:00
zhanghongqing
c4fa82e451 日志点击搜索时增加遮罩防止重复点击 2018-07-20 17:02:46 +08:00
wangxin
c3dee31aa2 domian替换为domain 2018-07-20 16:38:18 +08:00
wangxin
ab020d4d3c Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-07-20 16:19:26 +08:00
wangxin
1ab5aecc0d 修复user_region domain_id,domain_str拼写错误 2018-07-20 16:18:22 +08:00
duandongmei
21e678cb14 NTC_SSL_CA修改为NTC_SSL_CN 2018-07-20 16:08:21 +08:00