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

232 Commits

Author SHA1 Message Date
duandongmei
549cae1823 修改en国际化冲突记录，修改ru国际化code 2018-08-21 14:10:35 +08:00
duandongmei
5ee8b5a857 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-21 13:35:57 +08:00
duandongmei
29a1eeac70 国际化文件更改 2018-08-21 13:33:15 +08:00
duandongmei
d6a2b98ec9 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/java/com/nis/web/controller/BaseController.java
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
 2018-08-21 13:31:21 +08:00
leijun
de567f9e35 NTC MAIL 添加 eml_key字段 2018-08-21 12:02:00 +08:00
duandongmei
b5d990c160 国际化文件恢复 2018-08-21 11:24:04 +08:00
fangshunjian
974a34ea49 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 22:17:34 +08:00
fangshunjian
1bb113766b 1、新增 http redirect&block 支持文件作为应答内容 2018-08-20 22:12:05 +08:00
zhanghongqing
aa7c75da99 1.增加do_log字典属性2.cfg_index_info增加do_log字段更新sql文件 
3.VoIP IP跟account增加do_log是否显示日志
 2018-08-20 18:48:10 +08:00
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
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
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
zhangwenqing
ab07d98b55 p2p配置提交以及相关国际化代码. 2018-08-18 19:05:12 +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
chenjinsong
27ff08ca41 同步修改国际化代码refer为referer 2018-08-16 16:45:30 +08:00
duandongmei
9450df24b5 所有字符串域新增时，方便用户理解HEX和Case-senstive 
将“是否hex二进制”属性隐藏，增加是否二进制和是否大小写敏感两个选项，common.js中根据界面两个选项，自动设置隐藏的“是否二进制“属性的值【注：十六进制时，大小写敏感】

其他后期新增的界面，也需要这样处理
 2018-08-16 15:13:18 +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
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
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
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
duandongmei
c939d46ba8 proxy http国际化增加https 2018-08-09 19:45:35 +08:00
duandongmei
f3bc6c5069 Replacement替换为replace 2018-08-09 18:32:19 +08:00
duandongmei
9b1f4d30cc //HTTP block： response code is not null ;response content 
null(userRegion is not null)
//HTTP redirect： response code is not null ;response content is not
null(userRegion is not null)
//HTTP replace： replace type is not null ;find is not null;replace with
is not null(userRegion is not null)
修复proxy 排序 查询列表bug
 2018-08-09 15:07:49 +08:00
duandongmei
ddad1e6bac realtime_report、http国际化修改 2018-08-08 19:00:30 +08:00
duandongmei
83b227c029 Maintenance国际化修改为Policy Objects 
realtime_report国际化修改为Log Report
 2018-08-08 16:48:00 +08:00
duandongmei
64554be14f VoIP国际化规范 url国际化修改为URL 2018-08-08 13:50:59 +08:00
wangxin
36cc75083e 注释掉INLINE_IP_CB字典，添加几个IP备用字典 2018-08-08 10:10:10 +08:00
duandongmei
978867a45d policy group management 去掉management 2018-08-07 18:35:22 +08:00
wangxin
145cde1010 function_region_dict中config_region_value字段国际化 2018-08-07 17:15:40 +08:00
wangxin
4584b86b02 ip_protocol国际化 2018-08-07 16:32:52 +08:00
wangxin
6b2d13b4af (1)调整src_ip_report，dest_ip_report字典 
(2)添加基础协议和加密隧道行为的对应action字典
 2018-08-07 16:21:35 +08:00