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

1251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxin
736d8ba620 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-07 15:56:10 +08:00
wangxin
4be46ac31a sql修改记录提交 2018-08-07 15:55:25 +08:00
duandongmei
3ce8bd2ea8 two-way 修改为double 
Classification选择choose Type 修改为choose Classification
keywords十六进制判断，只在非空时进行判断
 2018-08-07 15:40:53 +08:00
duandongmei
e6c6a9fff7 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-07 14:36:21 +08:00
duandongmei
a963a8d730 修改来函信息国际化en Request统一替换为Letter 2018-08-07 14:35:21 +08:00
zhanghongqing
a1978864b3 日志用httpclient 超时参数设置从配置文件中获取 2018-08-07 14:17:29 +08:00
duandongmei
78bfd4dc5e 增加hex十六进制格式校验 
修改所有多域的详细配置查看，每个属性为一行
 2018-08-07 13:55:19 +08:00
duandongmei
4f1064c420 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-07 13:52:48 +08:00
duandongmei
66f1d115d5 增加hex校验提示信息 2018-08-07 13:52:28 +08:00
wangxin
3d6179bb3e Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-07 13:05:57 +08:00
wangxin
91f0ede041 (1)域名列表配置状态一列替换为系统字典 
(2)ip配置新增/修改时cfg_region_code,cfg_type两个字段的值修复
(3)ip审核不再调用maat_service字典,改为根据配置的cfg_type字段结合function_region_dict字典的is_maat字段判断下发方式。maat_service字典只有ip导入时使用。
 2018-08-07 13:05:00 +08:00
zhanghongqing
3e97803d9e 1.解决部分日志页面验证错误也可查询问题 
2.标题首字母css控制大写
3.增加日志查询IPv4与IPv6验证及格式提示
 2018-08-07 11:56:46 +08:00
duandongmei
13cfb88fdd Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-07 10:13:35 +08:00
duandongmei
0f4793cbfc isHexbin十六进制校验 2018-08-07 10:13:13 +08:00
duandongmei
46c3e4b56a isHexbin 十六进制校验 2018-08-07 10:02:57 +08:00
zhangwenqing
10dd90c974 修改日志界面列名、列宽. 2018-08-06 17:56:35 +08:00
duandongmei
48bc66358c dns reponse 表单提交注释了的bug 2018-08-06 15:50:23 +08:00
chenjinsong
c247fd8ed9 修复配置页搜索栏高度异常的问题 2018-08-06 15:17:19 +08:00
wangxin
a4b16f4043 (1)修复修改时页面被遮盖层覆盖的bug 
(2)APP策略，基础协议，加密隧道行为调整，自定义域恢复；分隔，关键字字段用&连接
 2018-08-06 15:09:12 +08:00
chenjinsong
d839848452 1.校验搜索框的时间，开始时间不能晚于结束时间 
2.校验dns相应策略配置增加中的最大\小存活时间，最小存活时间不能大于最大存活时间
 2018-08-06 14:07:10 +08:00
wangxin
9f76db073c app策略，基础协议，加密隧道行为审核userregion调整 
(1)proto_id修改为app_id,配置文件变量名修改为app_id_region
(2)提取变量app_cfg_userregion_splitor，值为&到配置文件，app策略，基础协议，加密隧道行为分隔userregion的分隔符
 2018-08-06 13:49:01 +08:00
duandongmei
56f4dcb193 userRegion、district、stateName特殊字符转意 2018-08-06 11:02:28 +08:00
zhanghongqing
3501ea059a 日志部分搜索框统一 2018-08-06 10:29:40 +08:00
zhangwei
6899da48ea 修改英文翻译 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-08-06 10:13:17 +08:00
wangxin
32758ed07c Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-06 09:13:46 +08:00
wangxin
67f386d066 调整菜单修改sql，修改serviceId 2018-08-06 09:13:05 +08:00
duandongmei
c626849547 去掉report界面的筛选按钮 2018-08-06 09:09:06 +08:00
duandongmei
287448f3cc Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-06 09:04:48 +08:00
duandongmei
b7315bfbb4 去掉基础管理菜单中的management 2018-08-06 09:04:03 +08:00
zhangwenqing
4efcad8ca0 完善日志界面. 2018-08-03 21:24:08 +08:00
zhanghongqing
0df28b22e9 日志修改字段显示过长省略加提示 2018-08-03 21:16:14 +08:00
zhanghongqing
a63b18c7ae 本地提交服务器 2018-08-03 19:52:42 +08:00
zhanghongqing
b8a978dd6e Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-03 19:50:52 +08:00
zhangwenqing
8e3b6a3290 1、日志界面过滤过长字符串 2、界面鼠标悬停事件（洪庆） 2018-08-03 19:51:56 +08:00
zhanghongqing
f72c39a92a 日志 table class中增加logTb 2018-08-03 19:50:34 +08:00
zhangwei
44f9f514a6 修改菜单翻译 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-08-03 19:34:06 +08:00
zhanghongqing
3b10dd400a 日志调用接口工具HttpClientUtil.java 增加处理数据格式方法 2018-08-03 18:45:30 +08:00
zhangwei
aca03c0c7a 修改审核和审计菜单的翻译 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-08-03 18:32:06 +08:00
zhangwei
2dc2017c72 修改系统名称；修改英文翻译。 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-08-03 17:00:30 +08:00
zhangwei
4c70448f49 修改Maintenance翻译为Advanced 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-08-03 16:50:12 +08:00
zhanghongqing
186c509de5 修改字典修改记录 2018-08-03 14:34:57 +08:00
zhanghongqing
2f047f60a6 1.修改日志国际化字段2.日志ddos攻击类型加入字典依据协议统计已有类型 
UDP-Flood: 1069
SYN-Flood: 1070
 2018-08-03 14:28:43 +08:00
chenjinsong
6108dabc89 字典修改记录 2018-08-03 14:20:18 +08:00
zhanghongqing
09d7ecfabc 日志查询错误时统一分类提示信息 2018-08-03 10:59:20 +08:00
wangxin
e70ca37255 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-03 10:42:14 +08:00
wangxin
a4883b4ec9 修复协议IP配置treeSelect 2018-08-03 10:41:12 +08:00
duandongmei
2a41f7f365 searchQName修改为searchQname 2018-08-03 10:33:46 +08:00
wangxin
5c8707c4a3 IP白名单，IP类配置审核状态字典修改为AUDIT_STATUS 2018-08-03 10:30:48 +08:00
duandongmei
a6133cd3b6 Desured 修改为 Desired 2018-08-03 09:32:20 +08:00
chenjinsong
e082080772 今日提出的问题和bug的修改： 
1.action字典
2.日志列显示规则，配置Id，action,发现时间，isp，私有字段，公有字段（公有字段顺序保持一致）
3.音视频日志：公共字段的Device,Direction,Nested address list，私有字段av_protocol，From
To Store IP,From To Store URL,To From Store IP，To From Store URL，在界面注释掉
4.其他日志的公共字段，Nested address list注释掉
5.DNS日志的私有字段，除了Qname，其他注释掉
6.proxy的日志，url放到isp后面
7.日志列表增加详情查看按钮
8.查询条件字段名和列名保持一致  entrance、protocol
9.列表数据entranceId从字典取
10.dns翻译：qtype、qclass、opcode、cname全大写，Recursion Desired -> Recursion
Desured；Available Recursion -> Recursion Available
11.错误提示中文
 2018-08-02 20:41:51 +08:00