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

910 Commits

Author SHA1 Message Date
duandongmei
224402956b Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 16:19:58 +08:00
duandongmei
6aa6f253d4 增加proxy证书提交 2018-08-20 16:17:38 +08:00
leijun
a8aebd9e23 添加P2P日志查询 2018-08-20 11:33:34 +08:00
leijun
2c52a0acc3 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 11:28:45 +08:00
leijun
e6bc92cb24 提交本地 2018-08-20 11:28:27 +08:00
leijun
488cdde3e6 提交本地 2018-08-20 11:15:02 +08:00
wangxin
7b86868cd1 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 10:16:35 +08:00
duandongmei
fbbe28a619 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 10:03:10 +08:00
duandongmei
1b42f73d4e 国际化添加intercepter限速和替换 2018-08-20 10:01:52 +08:00
zhangwenqing
b2bb12a52b 添加国际化代码. 2018-08-20 09:52:44 +08:00
wangxin
5fa8ad485c region,service字典增加字段 2018-08-20 09:24:44 +08:00
duandongmei
45556b7e05 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值
 2018-08-19 15:55:27 +08:00
duandongmei
8c7e1d088d 字典增加域类型属性 2018-08-19 15:52:11 +08:00
zhangwenqing
fbdae196f8 提交新增字典数据sql 2018-08-19 10:42:26 +08:00
zhangwenqing
d1d29a52dd 提交新建库表结构sql文件. 2018-08-19 09:27:15 +08:00
duandongmei
af704de60a 修改增强字符串类域的region属性为动态展示 2018-08-18 20:47:32 +08:00
zhangwenqing
ab07d98b55 p2p配置提交以及相关国际化代码. 2018-08-18 19:05:12 +08:00
zhangwenqing
ea99d23eec p2p配置部分提交. 2018-08-17 19:31:48 +08:00
chenjinsong
9888290add 1.bgp日志 
2.增加公共字段、调整部分日志展示项
 2018-08-17 16:23:03 +08:00
wangxin
2601724cdb Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !31
 2018-08-16 17:56:14 -04:00
zhangwenqing
2e87ac174c 修改国际化. 2018-08-16 17:46:56 +08:00
zhangwenqing
e1bcd495cc 添加国际化. 2018-08-16 17:03:28 +08:00
zhanghongqing
0f13045065 Merge branch 'demostration_08' into 'develop' 
去掉国际化汉语重复单词：来函

See merge request !30
 2018-08-16 16:30:20 -04:00
chenjinsong
27ff08ca41 同步修改国际化代码refer为referer 2018-08-16 16:45:30 +08:00
zhanghongqing
e1a035762a 去掉重复单词：来函 2018-08-16 16:24:22 +08:00
duandongmei
9450df24b5 所有字符串域新增时，方便用户理解HEX和Case-senstive 
将“是否hex二进制”属性隐藏，增加是否二进制和是否大小写敏感两个选项，common.js中根据界面两个选项，自动设置隐藏的“是否二进制“属性的值【注：十六进制时，大小写敏感】

其他后期新增的界面，也需要这样处理
 2018-08-16 15:13:18 +08:00
duandongmei
c08b57a414 ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565 
target_ip_protect=\u6297DDOS\u653B\u51FB 
ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60
letter=\u61D2\u6C49
国际化中文更改
 2018-08-16 14:24:39 +08:00
duandongmei
10ebfca48d 增加letter_statistics_info中文国际化 2018-08-15 20:32:48 +08:00
zhanghongqing
2eb851c79e 增加标签字典码表sql文件 2018-08-15 20:13:11 +08:00
wangxin
c0181beb34 音视频，图片类型修改 2018-08-15 20:01:47 +08:00
duandongmei
3c5e22fcae 国际化修改ipv 为IPv 2018-08-15 18:22:13 +08:00
duandongmei
95b711c2d5 国际化更改 2018-08-15 15:04:36 +08:00
duandongmei
e14aa17e2e 国际化中文补全，中文统一根据英文翻译，去掉英文中不使用的国际化 2018-08-15 14:37:46 +08:00
zhangwenqing
96ca3d6b3c 添加国际化代码. 2018-08-14 21:31:52 +08:00
wangxin
3f9aa29320 (1)加入新异常，调用外部程序异常。原外部程序调用异常提示在在返回信息 
(2)音视频控制类异常处理，防止出现表单提交，审核时为了防止出现未知异常导致界面出错，catch
MaatCovertException修改为catch exeption,根据异常类型进行判断返回界面信息
(3)message.tag不够严谨，修改了success的判断
 2018-08-14 17:58:00 +08:00
wangxin
a4cc2fb89c (1)去掉误输入的字符 
(2)添加加密隧道行为菜单项
 2018-08-14 15:01:19 +08:00
wangxin
6ffd267c6a (1)tag根节点替换root_node 
(2)特定服务app列名替换
 2018-08-14 14:37:48 +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
41cbb4feba input=Please enter==>input=Please Enter 2018-08-13 11:09:52 +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
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
wangxin
ac7427cd2a IP导入界面展示国际化修改 2018-08-10 15:12:58 +08:00
zhangwenqing
44dfbe1e79 1.修改国际化代码 2.解决界面搜索框Clear按钮失效 3.日志串联设备字典取 2018-08-10 11:49:00 +08:00
duandongmei
52b86c7599 PROXY https修改为s 2018-08-10 09:17:52 +08:00