zhanghongqing
|
90b419e989
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 15:37:10 +08:00 |
|
zhanghongqing
|
0869a02ad3
|
增加国际化
|
2018-09-13 15:36:52 +08:00 |
|
wangxin
|
c7487d927f
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 14:40:47 +08:00 |
|
wangxin
|
e0611b5715
|
日志总量查询结束时间去除减1秒
|
2018-09-13 14:39:59 +08:00 |
|
zhanghongqing
|
12e23d20da
|
voip IP ，account 菜单 路径，权限sql提交
|
2018-09-13 14:32:59 +08:00 |
|
zhanghongqing
|
cd0c23c657
|
修改voip权限标识
|
2018-09-13 14:11:48 +08:00 |
|
wangxin
|
2b9ff3154b
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 13:44:12 +08:00 |
|
duandongmei
|
b6002ed6a5
|
说话者、台标、人脸三个region、service、menu的sql移动到10181910文件件下
|
2018-09-13 13:37:03 +08:00 |
|
duandongmei
|
e057fe895e
|
ssllist ip显示合并成两列
|
2018-09-13 13:35:54 +08:00 |
|
duandongmei
|
40b81c0064
|
去掉cfgId的隐藏域，P2P十六进制校验去掉关键字的替换信息
|
2018-09-13 13:35:04 +08:00 |
|
duandongmei
|
2de369e8cf
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 11:47:50 +08:00 |
|
duandongmei
|
2ff41d8c6d
|
去掉cfg的隐藏域
|
2018-09-13 11:41:31 +08:00 |
|
leijun
|
994c5ce253
|
实时报表 合计优化
|
2018-09-13 11:33:19 +08:00 |
|
wangxin
|
d72b431acd
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 11:22:25 +08:00 |
|
wangxin
|
29bda3161e
|
修复基础协议单引号查询时报错，替换后台的like查询方法
|
2018-09-13 11:21:47 +08:00 |
|
leijun
|
c6c6fb665f
|
日志检索：action检索条件drop、loop、whitelist不展示
实时统计右上角的各个动作日志总量，过滤drop、loop、whitelist anti-DDOS drop特殊，展示
实时报表 合计优化
|
2018-09-13 10:56:41 +08:00 |
|
leijun
|
e567f0b52e
|
修复dns、http、ssl、邮件 修改数据后修改人员不显示问题
|
2018-09-13 09:40:56 +08:00 |
|
wangxin
|
af526ab957
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-12 21:34:15 +08:00 |
|
wangxin
|
ecb03a7391
|
设置app name加入非空验证
|
2018-09-12 21:31:17 +08:00 |
|
zhanghongqing
|
5cd4149bde
|
日志增加cfgid 查询
|
2018-09-12 21:30:34 +08:00 |
|
wangxin
|
344c632dbd
|
加入是否有效查询条件
|
2018-09-12 21:27:56 +08:00 |
|
zhangwenqing
|
fb3f24618c
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-12 20:32:44 +08:00 |
|
zhangwenqing
|
ca0bc716f5
|
多媒体配置列表添加action查询.
|
2018-09-12 20:32:31 +08:00 |
|
duandongmei
|
12e8bdbeda
|
配置对应日志总量为0时，不加日志查询弹框
|
2018-09-12 20:26:34 +08:00 |
|
duandongmei
|
dda68fb83c
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
Conflicts:
src/main/resources/sql/truncate_tables.sql
|
2018-09-12 20:25:06 +08:00 |
|
duandongmei
|
f3cb325c6a
|
去掉dns策略配置清除，不排除策略号为0的情况
|
2018-09-12 20:11:43 +08:00 |
|
leijun
|
284a796bb0
|
dns_res_strategy 表 设置id自增长默认值 101
|
2018-09-12 19:40:34 +08:00 |
|
zhanghongqing
|
6130711759
|
修改音视频配置切换问题
|
2018-09-12 19:28:40 +08:00 |
|
duandongmei
|
626969ee4e
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-12 19:21:18 +08:00 |
|
wangxin
|
9f459ad014
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-12 19:16:50 +08:00 |
|
leijun
|
27c5f7a9ba
|
标签、dns响应策略等新增界面，不需要展示
的code，界面不做展示，数据库自动生成
|
2018-09-12 19:16:09 +08:00 |
|
wangxin
|
3b3cd99adf
|
修复特定服务列表页面国际化
|
2018-09-12 19:16:05 +08:00 |
|
duandongmei
|
9d9454fbb1
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-12 19:00:45 +08:00 |
|
zhangwenqing
|
ab7eea2b89
|
配置列表增加action查询条件.
|
2018-09-12 18:11:05 +08:00 |
|
zhanghongqing
|
76e692f72d
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-12 17:36:49 +08:00 |
|
zhanghongqing
|
745713979b
|
修改日志返回信息，增加请求服务出错
|
2018-09-12 17:30:32 +08:00 |
|
wangxin
|
4ecbbf0dc2
|
配置ID，配置描述，有效标识增加排序功能
|
2018-09-12 17:00:40 +08:00 |
|
zhanghongqing
|
fc8c9951c8
|
修改音视频样例修改失败问题
|
2018-09-12 16:27:16 +08:00 |
|
wangxin
|
04b3d4dc62
|
IPv4掩码16~32，IPv6掩码128
|
2018-09-12 15:45:18 +08:00 |
|
wangxin
|
b0f0aac6f0
|
IP验证v4和v6的掩码排除0
|
2018-09-12 14:14:20 +08:00 |
|
wangxin
|
ef5e737bd4
|
基础协议，APP协议配置，监测业务，ip域默认展开，并且必须输入
|
2018-09-12 13:20:38 +08:00 |
|
duandongmei
|
93d5dfea40
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-12 11:25:40 +08:00 |
|
zhanghongqing
|
46253186a6
|
修改voip关键字显示长度
|
2018-09-12 10:18:30 +08:00 |
|
zhanghongqing
|
c4cca92379
|
解决配置页面关键字换行问题
|
2018-09-12 10:04:34 +08:00 |
|
duandongmei
|
a71ee6be3b
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-11 19:38:34 +08:00 |
|
duandongmei
|
1740a300e0
|
配置日志总量为0，也可以查询此配置日志
|
2018-09-11 19:38:11 +08:00 |
|
zhangwenqing
|
12bea35ed8
|
ASN列表排序修改.
|
2018-09-11 19:25:11 +08:00 |
|
zhangwenqing
|
0e9110602b
|
1.是否表达式->匹配方式修改 2.去除"取消审核通过"状态查询条件 3.配置列表界面增加列表根据action排序
|
2018-09-11 19:16:15 +08:00 |
|
wangxin
|
66f1ff33f1
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-11 16:52:51 +08:00 |
|
wangxin
|
300634cce8
|
ASN策略改为ASN
|
2018-09-11 16:52:07 +08:00 |
|