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

1347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhangwenqing
5ab0a34638 FTP新增界面修改. 2018-08-24 20:40:16 +08:00
duandongmei
846985886f 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-24 19:47:32 +08:00
duandongmei
7374c16da7 ratelimit限制大小0-1 2018-08-24 19:44:19 +08:00
duandongmei
d3f59cfe99 证书文件策略国际化修改 2018-08-24 19:41:42 +08:00
zhangwenqing
919c649e4e APP策略ssl、header界面修改. 2018-08-24 19:14:50 +08:00
wangxin
e62cace354 ip复用策略单独提出页面 2018-08-24 18:41:21 +08:00
zhanghongqing
5d2d5f2ba6 1.调整加密隧道新增页面字段位置2.替换字典中中文提示 2018-08-24 17:52:39 +08:00
leijun
d404305509 修改审核不通过状态的配置，再次修改，配置状态未修改为“未审核”，并且没有记录修改人员和修改日期问题 2018-08-24 17:47:11 +08:00
zhanghongqing
ab2ca5ecc2 主题网站，VoIP，基础协议，加密隧道协议action切换增加方法 增加doLog样式 2018-08-24 15:59:17 +08:00
duandongmei
d16db28a1e 拦截文件策略功能更改 2018-08-24 15:41:05 +08:00
duandongmei
b134786c70 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-24 15:39:21 +08:00
duandongmei
e53f714848 证书管理国际化 2018-08-24 15:36:45 +08:00
zhangwenqing
0546a0c93c APP策略新增修改. 2018-08-24 15:32:11 +08:00
wangxin
5ef877121c (1)修复中文国际化乱码 
(2)中文国际化UNICODE大写
 2018-08-24 15:19:11 +08:00
zhanghongqing
b970557c78 统计图表增加详情静态页面 2018-08-24 14:17:53 +08:00
zhanghongqing
7c9e65ecb1 1.修改VoIP 列表字段位置 2018-08-24 14:04:17 +08:00
fangshunjian
a9e348b8a0 Merge remote-tracking branch 'origin/develop' into develop 2018-08-24 13:54:33 +08:00
fangshunjian
c07bb1b685 1、proxy 增加 do_log 
2、proxy 增加 subcribe id
 2018-08-24 13:53:23 +08:00
zhangwenqing
85e813a5d7 1.解决APP策略SubscribeId修改问题 2.APP特征dolog为0 2018-08-24 12:15:19 +08:00
wangxin
0ea0db2369 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-24 11:55:06 +08:00
wangxin
063fa03a94 (1)tree属性扩展，支持新增节点 
(2)特定服务增加一列标记新增节点
 2018-08-24 11:54:21 +08:00
leijun
f70838f4d4 1.XMPP增加subscribe_id 2.增加do_log 3.compileId查询 2018-08-24 11:45:35 +08:00
leijun
295d92fe79 增加APP session Feature 2018-08-24 10:25:01 +08:00
zhangwenqing
62549388fb APP策略、文件摘要加SubscribeId域. 2018-08-24 09:53:24 +08:00
zhanghongqing
d9a516f00f app修改时间查询 2018-08-23 21:44:57 +08:00
zhanghongqing
50d8d8c10f 1.修改主题网站topic从码表中获取 2018-08-23 20:53:04 +08:00
leijun
be0107e748 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-23 17:40:02 +08:00
leijun
dc1f876e2d 音视频日志的access url 去掉http://前缀 2018-08-23 17:39:39 +08:00
zhanghongqing
cc8b3f566a 增加主题网站配置 2018-08-23 17:07:09 +08:00
leijun
c5e372f4d0 修改bgp没有删掉subscribe 2018-08-23 16:22:53 +08:00
fangshunjian
57bccca189 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-23 15:39:34 +08:00
fangshunjian
897a01fb82 1、删掉action 2018-08-23 15:38:49 +08:00
duandongmei
0e0f574c97 域名拦截功能完成 2018-08-23 15:21:50 +08:00
wangxin
ac21f74043 隐藏isLeaf字段，修复insert没加businessType字段 2018-08-23 15:10:21 +08:00
zhangwenqing
190b90099b app特征xml dolog. 2018-08-23 12:52:23 +08:00
duandongmei
78b35d49b2 dns\ssl\mail\http修改subscribeId不允许单独配置问题 2018-08-23 11:07:29 +08:00
duandongmei
8aa82dda00 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-23 11:05:09 +08:00
duandongmei
6b89fcae49 functionId名称错误 2018-08-23 11:04:43 +08:00
wangxin
8b92242581 serviceId为1057,1058的function_id为302,303的菜单隐藏 2018-08-23 10:36:53 +08:00
zhangwenqing
4639fe0fdb 修改findSubscribeIdCfgList() xml. 2018-08-23 10:28:29 +08:00
zhangwenqing
38d9da2693 APP策略、文件摘要doLog CompileId 2018-08-23 10:08:55 +08:00
fangshunjian
76b9a732e0 1、去掉文件策略 action 
2、调整service 接口
 2018-08-23 10:03:25 +08:00
duandongmei
82664d2f21 dns mail http ssl增加subscribeId业务 2018-08-23 10:01:28 +08:00
duandongmei
2d2a342d44 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-23 10:00:54 +08:00
zhanghongqing
f2e72bef46 修改ftp中dolog bug 2018-08-23 09:43:41 +08:00
duandongmei
42554ecb8b Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-23 09:36:09 +08:00
duandongmei
1cec30a6b1 ssl冲突解决 2018-08-23 09:35:39 +08:00
duandongmei
96217e2910 mail,dns,ssl,http冲突文件提交 2018-08-23 09:30:37 +08:00
zhanghongqing
8884972507 1.ftp增加doLog2.增加subscribeId3.增加compileId查询 2018-08-22 22:42:12 +08:00
wangxin
5932b68c84 由于业务类别使用数字会与app以及基础协议重复早晨树层级混乱，修改了层级ID为字符串businessType+数字code 2018-08-22 20:16:04 +08:00