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

1380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxin
576885f1e8 加了日志总量一列但是上面属性不全的统一设置其日志量为0 2018-08-26 17:59:44 +08:00
leijun
aac644777c Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-26 16:52:42 +08:00
leijun
6854f82fe1 appTcp 去除日志总量，去除字符串域相关字段 2018-08-26 16:52:02 +08:00
zhanghongqing
565c4f8fc3 1.common.js增加查询时的compileId 为数字判断2.音视频中添加do_log字段，compileId查询 2018-08-26 16:16:23 +08:00
duandongmei
dcaebffeb1 区域IP注释 
摘要允许单独配置subscribe_id
 2018-08-26 15:26:53 +08:00
leijun
b79807ccf5 bgp、xmpp subscribe_id域不可单独提交，必须搭配其他域 2018-08-26 15:17:15 +08:00
duandongmei
5b5e63e816 ssl subscribeId BUG更改 
mail 子域配置详情bug更改
ftp ftp-url域配置无法新增bug更改
 2018-08-26 14:51:39 +08:00
wangxin
f99e15b3c4 修复表单修改时doLog选中的不对的bug 2018-08-26 12:52:41 +08:00
wangxin
9678a4a10f 调整日志配置总量查询，整页配置只查询一次，减小资源浪费 2018-08-26 10:43:03 +08:00
duandongmei
6b79b5f7ef Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
去掉app_tcpsession_size
 2018-08-26 10:30:11 +08:00
duandongmei
cc0a307958 http增加compileId查询 
apptcpsessionBYte增加数值类型属性，去掉字符串类型属性
 2018-08-26 10:20:50 +08:00
zhangwenqing
015a5811c9 APP策略修改. 2018-08-25 17:07:34 +08:00
wangxin
0354487dc8 ratelimit数据库改为varchar,pojo改为String 2018-08-25 16:37:39 +08:00
wangxin
4233142304 bgp 修改日志总量cfg为indexCfg 2018-08-25 15:31:32 +08:00
wangxin
1130cee152 xmppList加入日志总量查询 2018-08-25 15:29:25 +08:00
wangxin
1ff5251341 日志总量查询修复 2018-08-25 15:15:20 +08:00
wangxin
eebdb41cf5 调整回调IP调用put请求 2018-08-25 14:05:11 +08:00
wangxin
28bbfecf16 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-25 14:01:54 +08:00
wangxin
54264d3bf5 ip配置增加doLog属性 2018-08-25 13:57:35 +08:00
zhangwenqing
19daff68ab Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-25 13:51:51 +08:00
zhangwenqing
c68a1cd80c APP特征界面修改. 2018-08-25 13:51:13 +08:00
wangxin
7bb0ac6bd5 app 特征表单增加tree可新增app的功能 2018-08-25 12:07:17 +08:00
wangxin
c59408bd84 修改时间，修改人添加 2018-08-25 11:55:40 +08:00
wangxin
c8a6dd4055 ip地址添加NTC_SUBSCRIBE_ID，丢弃和回流不加NTC_SUBSCRIBE_ID配置，不记录日志 2018-08-25 11:42:24 +08:00
zhangwenqing
13ad6d7199 文件摘要IsValid、IsAudit状态修改时,域配置也相应修改. 2018-08-25 10:33:16 +08:00
zhangwenqing
0295265cae Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-25 09:35:33 +08:00
wangxin
b8ce71e20e (1)域名白名单添加订阅ID，dolog 
(2)WebsiteController redirect 使用RedirectAttributes
 2018-08-25 01:55:10 +08:00
wangxin
e5e0d47a27 ip白名单修改，增加SUBSCRIBE_ID属性 2018-08-24 20:55:20 +08:00
zhangwenqing
5ab0a34638 FTP新增界面修改. 2018-08-24 20:40:16 +08:00
wangxin
c23beae5e1 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-24 20:36:45 +08:00
wangxin
2dbbd88f8b 修复提交新标签之后立即删除报错 2018-08-24 20:36:01 +08:00
fangshunjian
cd36033871 Merge remote-tracking branch 'origin/develop' into develop 2018-08-24 20:33:02 +08:00
fangshunjian
88427a5f4f 1、修改 白名单 dolog 为 0 2018-08-24 20:32:42 +08:00
leijun
8c353a0560 隐藏do_log 2018-08-24 20:27:27 +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