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

1505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
duandongmei
34b1caa445 app内置特征文件上传 2018-08-28 13:40:04 +08:00
wangxin
2f4a33785d 恢复被覆盖的ip common处理 2018-08-28 12:34:24 +08:00
zhanghongqing
f2ddc8ec65 日志统一字段名称源IP,目的IP 2018-08-28 09:11:35 +08:00
zhanghongqing
2fac813097 修改日志列宽度，详情宽度 2018-08-27 21:16:47 +08:00
wangxin
18bfc299e4 (1)策略分组修改，增加分租asn,id 为4 
(2)策略分组删除时判断ASN分组是否已经下发过，如果已经下发过，则不能删除
(3)配置分组修改不能更新分组类型
 2018-08-27 21:10:13 +08:00
fangshunjian
4259117e94 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
	src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
 2018-08-27 20:08:13 +08:00
fangshunjian
76aa9d4f27 1、添加http检验提示信息 2018-08-27 20:02:29 +08:00
fangshunjian
bded2d718e 1、新增http 格式校验 2018-08-27 20:00:45 +08:00
wangxin
9f33c72a42 去掉social_app字典值的滥用 2018-08-27 18:12:00 +08:00
wangxin
531f85017d ip属性共用值提取为一个全局的函数，当initCommIpVal执行的时候初始化ipcommon的属性，并且初始化完成之后将页面无用的select 
option直接remove
 2018-08-27 17:40:14 +08:00
wangxin
3350d70b8a Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-27 17:32:34 +08:00
zhangwei
a231611c39 修改文件上传逻辑，新增配置时样例文件生成成功后立刻将源文件和样例文件上传至中间服务。 
Signed-off-by: zhangwei <zhangwei@intranet.com>
 2018-08-27 16:39:23 +08:00
zhangwenqing
5f93a39d3f 解决配置新增界面取消按钮跳转问题. 2018-08-27 16:31:42 +08:00
leijun
ed5a25afdc APP session 国际化名称优化 2018-08-27 16:27:33 +08:00
wangxin
b723761f61 (1)修改app范围，基础协议范围 
(2)app标签修改，新增不再提示用户是否保存
 2018-08-27 15:40:54 +08:00
duandongmei
c5e83214f2 去掉appType字典获取item_value 2018-08-27 15:33:04 +08:00
duandongmei
58617f496c Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-27 15:31:06 +08:00
duandongmei
6f21f50cab 未做更改 2018-08-27 15:30:44 +08:00
wangxin
7f5d27f90a (1)修复业务日志总量查询回显0的bug 
(2)调整业务日志总量查询方法，改为批量查询，减少资源浪费
 2018-08-27 15:26:32 +08:00
duandongmei
e25d29c07b 刘老师建议所有界面的data list去掉 2018-08-27 10:40:41 +08:00
duandongmei
1a4ccf8f6f 秘钥对名称增加特殊字符替换 2018-08-27 10:21:26 +08:00
zhanghongqing
17996009f1 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-26 20:00:58 +08:00
zhanghongqing
e97cb03d22 1.解决冲突 2018-08-26 20:00:38 +08:00
zhanghongqing
33c2c81a7e 1.修复日志详情弹框转义，换行2.加载遮罩文字onloading 2018-08-26 19:54:34 +08:00
wangxin
8006664e60 優化獲取日誌失敗時的顯示。當ajax complex事件執行的時候，返回狀態如果爲success或者timeout之外的值，顯示failed 2018-08-26 18:13:21 +08:00
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