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

1139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxin
49679a93fc Merge branch 'demostration_08' into 'develop' 
(1)tag根节点替换root_node

See merge request !15
 2018-08-14 14:40:37 -04:00
zhanghongqing
127f814734 Merge branch 'demostration_08' into 'develop' 
解决日志中火狐title不自动换行问题

See merge request !14
 2018-08-14 10:56:53 -04:00
wangxin
6ffd267c6a (1)tag根节点替换root_node 
(2)特定服务app列名替换
 2018-08-14 14:37:48 +08:00
zhanghongqing
429024eab4 解决日志中火狐title不自动换行问题 2018-08-14 10:51:27 +08:00
duandongmei
4f9f1bb8cb Merge branch 'demostration_08' into 'develop' 
行为日志去掉action

See merge request !13
 2018-08-13 18:39:25 -04:00
zhangwenqing
ff041bfe68 Merge branch 'demostration_08' into 'develop' 
日志界面URL列加宽

See merge request !12
 2018-08-13 18:15:29 -04:00
duandongmei
41fb17eff6 Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !11
 2018-08-13 18:02:53 -04:00
duandongmei
2de40c838f Merge branch 'demostration_08' into 'develop' 
日志行为识别去掉App_label字段，增加五个标签

See merge request !10
 2018-08-13 17:37:30 -04:00
duandongmei
af91ea8ac4 Merge branch 'demostration_08' into 'develop' 
来函列表增加Id展示，方便用户做导入来函查看

See merge request !9
 2018-08-13 15:59:21 -04:00
wangxin
69d1c4bbb2 Merge branch 'demostration_08' into 'develop' 
message忽略大小写

See merge request !8
 2018-08-13 15:37:54 -04:00
zhanghongqing
cb1b87df21 Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !7
 2018-08-13 15:14:56 -04:00
wangxin
fadb66bb7f Merge branch 'demostration_08' into 'develop' 
ip列表界面增加IP格式和端口格式

See merge request !6
 2018-08-13 14:00:26 -04:00
duandongmei
f9dfbd4370 Merge branch 'demostration_08' into 'develop' 
合并到develop

See merge request !5
 2018-08-13 12:32:48 -04:00
duandongmei
a5458cacc3 Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !4
 2018-08-13 11:15:58 -04:00
duandongmei
96b6b2abe5 行为日志去掉action 2018-08-13 18:34:14 +08:00
zhangwenqing
d42b161602 日志界面URL列加宽. 2018-08-13 18:11:37 +08:00
zhanghongqing
32eaa9d4d8 修改http分页bug 2018-08-13 18:03:00 +08:00
duandongmei
a17b3272ca Merge branch 'demostration_08' of http://10.0.6.99/gwall/gwall.git into demostration_08 2018-08-13 17:54:31 +08:00
duandongmei
969f441a53 c2s_pkt_num=C2S(Pkt) 
s2c_pkt_num=S2C(Pkt)
c2s_byte_num=C2S(Byte)
s2c_byte_num=S2C(Byte)
target_ip_protect=Target IP Protect
国际化更改
 2018-08-13 17:53:25 +08:00
zhanghongqing
b8d742e11c 日志行为识别去掉App_label字段，增加五个标签 
LABEL_PROTO_ID
LABEL_OS_ID
LABEL_BS_ID
LABEL_BEHAV_ID
LABEL_APP_ID
 2018-08-13 17:26:16 +08:00
duandongmei
84d548b6fd 来函列表增加Id展示，方便用户做导入来函查看 2018-08-13 15:53:11 +08:00
wangxin
dac6531d17 message忽略大小写 2018-08-13 15:33:57 +08:00
zhanghongqing
17b61ff96e 修改日志文件字段为http前缀 2018-08-13 14:53:37 +08:00
zhanghongqing
a029ff9b25 补充日志url加http前缀 2018-08-13 14:29:20 +08:00
zhanghongqing
ad9aca91f3 1.修改页面文件字段为超链接，2.标题有配置中获取 2018-08-13 14:19:55 +08:00
wangxin
b3213adbe5 ip列表界面增加IP格式和端口格式 2018-08-13 13:49:04 +08:00
wangxin
aa768302a1 Merge branch 'demostration_08' of http://10.0.6.99/gwall/gwall.git into demostration_08 2018-08-13 11:49:20 +08:00
wangxin
e3e2adb5ab Merge branch 'demostration_08' of http://10.0.6.99/gwall/gwall.git into demostration_08 2018-08-13 11:47:36 +08:00
wangxin
522bd14dbb IP导入4OVER6,6OVER4,ALL格式校验 2018-08-13 11:46:58 +08:00
duandongmei
d6352b3939 Merge branch 'develop' into 'demostration_08' 
Develop

See merge request !3
 2018-08-13 10:18:14 -04:00
zhanghongqing
d3d4286b0d 日志 httpList 路径字段改为超链接 2018-08-13 11:45:33 +08:00
duandongmei
41cbb4feba input=Please enter==>input=Please Enter 2018-08-13 11:09:52 +08:00
wangxin
7c016a9ad8 IP导入加入4over6,6over4,all的判断 2018-08-13 10:38:04 +08:00
duandongmei
246ee9ec9a 拦截域名更改： 
进允许无表达式，同时进允许右匹配
修改域名拦截列表中，所有属性判断均使用expr的bug
 2018-08-13 10:02:11 +08:00
wangxin
e09f7ce436 国际化字典policy_name的值Action Parameter->Response Profile改为Response Profile 2018-08-13 09:19:04 +08:00
zhangwenqing
5b58ac229e 修改提示语句. 2018-08-12 17:58:21 +08:00
zhanghongqing
7fc1c3a0da 头像显示 2018-08-10 20:43:15 +08:00
wangxin
21f403ea58 修改modal宽度 2018-08-10 19:27:02 +08:00
duandongmei
4144b5333c 列表检索取消遮盖层 
Text Content国际化修改为Plaintext
 2018-08-10 19:16:36 +08:00
duandongmei
73cc8c90af Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_zh_CN.properties
 2018-08-10 16:33:03 +08:00
wangxin
1badce36cb 部分HTTP替换为HTTP(S) 2018-08-10 16:26:13 +08:00
duandongmei
96fa1eedb9 首页来函业务类型统计功能 
修改部分页面十六进制校验不生效bug
更换logo
 2018-08-10 16:24:07 +08:00
zhangwenqing
61ad81687c 删除测试数据. 2018-08-10 16:13:30 +08:00
duandongmei
8bcd16718b Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-10 15:30:37 +08:00
duandongmei
60b84ca6ed logo1备份 2018-08-10 15:30:15 +08:00
wangxin
ac7427cd2a IP导入界面展示国际化修改 2018-08-10 15:12:58 +08:00
duandongmei
835e478b2f app feature模块去掉区域、action、基础信息 2018-08-10 14:25:39 +08:00
zhangwenqing
44dfbe1e79 1.修改国际化代码 2.解决界面搜索框Clear按钮失效 3.日志串联设备字典取 2018-08-10 11:49:00 +08:00
wangxin
f4f1600509 IP Type All验证 2018-08-10 11:42:00 +08:00
zhanghongqing
b8b17f6f80 1日志修改标题为配置中获取与菜单相同2.串联设备号改为字典中获取 2018-08-10 09:55:41 +08:00