zhanghongqing
|
9b101f0911
|
解决视频场景off状态显示level
|
2018-09-17 15:42:13 +08:00 |
|
duandongmei
|
a7c617cd2b
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
Conflicts:
src/main/resources/messages/message_en.properties
修改国际化文件;
修改dns和account的匹配方式为多种匹配方式
app和asn的监测配置都默认为记录全日志
样例的level修改时未展示正确的level值
|
2018-09-17 15:36:06 +08:00 |
|
duandongmei
|
26856ab612
|
subscribe_id英文国际化为Subscribe Id 中文为账号
|
2018-09-17 15:31:30 +08:00 |
|
zhanghongqing
|
fe68f75c1b
|
修改国际化,修改样例图片修改level不显示问题
|
2018-09-15 13:08:42 +08:00 |
|
leijun
|
bd3ac19a83
|
修改人脸识别阻断和监测的serviceId
|
2018-09-14 19:52:00 +08:00 |
|
duandongmei
|
934fa1b3c9
|
ssl的配置详情isHexbin拆分
删除sql增加视频场景删除和增加
app和隧道行为的exprTypebug更改
|
2018-09-14 18:58:07 +08:00 |
|
zhangwenqing
|
a477c2da06
|
表达式类型->匹配方式 关系修改.
|
2018-09-14 16:34:44 +08:00 |
|
zhangwenqing
|
e2ada46d9f
|
表单关键字修改.
|
2018-09-14 12:16:15 +08:00 |
|
duandongmei
|
023317f2e4
|
ip_type all时,只有ip非空时,切换默认值
证书模块文件校验
ip掩码验证,非掩码范围增加掩码范围提示
国际化sourse和dest修改为client和server
国际化俄文提交
|
2018-09-14 11:29:17 +08:00 |
|
wangxin
|
95892b46d5
|
调整IS_SHOW_BUSINESS_TYPE字典开关只对协议以及应用中用到特定服务的页面生效
|
2018-09-14 10:24:23 +08:00 |
|
leijun
|
30b0cf2ffe
|
修复div 遮盖不能点击
|
2018-09-13 20:55:11 +08:00 |
|
leijun
|
95054e7642
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 20:43:21 +08:00 |
|
leijun
|
41bc92e9d1
|
调整 分页div高度
|
2018-09-13 20:43:08 +08:00 |
|
leijun
|
ae568c1fcb
|
修复 审核不能选择问题
|
2018-09-13 20:39:04 +08:00 |
|
duandongmei
|
bf7842cdfb
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 20:36:56 +08:00 |
|
duandongmei
|
f41d4f05b7
|
去掉修改时,ip地址修改为默认值
|
2018-09-13 20:36:29 +08:00 |
|
duandongmei
|
59a69613de
|
代理文件批量审核
|
2018-09-13 20:34:13 +08:00 |
|
leijun
|
c07897f3e4
|
界面滚动条优化
|
2018-09-13 20:10:28 +08:00 |
|
duandongmei
|
d62799a0c1
|
来函和任务的方法去掉旧的权限标识
|
2018-09-13 19:48:46 +08:00 |
|
duandongmei
|
ed8c42cce2
|
修改source拼写错误
|
2018-09-13 19:28:39 +08:00 |
|
duandongmei
|
77406cca9c
|
不包含basicInfo的jsp增加来函、性质、标签、分类的默认值;
修改truncatesql缺少分号;
|
2018-09-13 19:14:06 +08:00 |
|
duandongmei
|
442a104531
|
maat配置,所有属性均要下发,根据pangu文档填相应默认值
|
2018-09-13 18:26:19 +08:00 |
|
duandongmei
|
c49bf6985e
|
十六进制校验去掉关键字的间隔符
|
2018-09-13 18:14:38 +08:00 |
|
duandongmei
|
e5b7661fbc
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 18:12:30 +08:00 |
|
duandongmei
|
6c72d606f6
|
去掉console.log信息
|
2018-09-13 18:12:04 +08:00 |
|
duandongmei
|
b74d51f9fb
|
修改是否十六进制切换,增加十六进制校验
|
2018-09-13 18:08:26 +08:00 |
|
zhangwenqing
|
693345b201
|
P2P日志增加字段.
|
2018-09-13 17:28:48 +08:00 |
|
wangxin
|
dc71baa9e1
|
特定服务在字典加入开关IS_SHOW_BUSINESS_TYPE,其值为1时app,基础协议属性菜单展示业务类型,其他情况不展示
|
2018-09-13 16:56:01 +08:00 |
|
zhangwenqing
|
4e1979f3b6
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 16:47:07 +08:00 |
|
zhanghongqing
|
5f657b0db4
|
视频场景在数据库预置一条compile为0 的数据
|
2018-09-13 16:48:42 +08:00 |
|
zhangwenqing
|
14c02a80ee
|
1.日志总量查询日志修改 2.提交p2p监测sql
|
2018-09-13 16:46:56 +08:00 |
|
zhanghongqing
|
ae5cb30aa1
|
说话人识别,台标,人脸,service 修改
|
2018-09-13 16:42:38 +08:00 |
|
leijun
|
25577ee70b
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-13 16:35:34 +08:00 |
|
leijun
|
90c1e45cc0
|
列表字符串字段截取展示
|
2018-09-13 16:35:25 +08:00 |
|
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 |
|