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 |
|
zhanghongqing
|
79c45d097d
|
国际化off大写
|
2018-09-11 16:33:44 +08:00 |
|
zhanghongqing
|
9ebcc20254
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-11 15:27:02 +08:00 |
|
zhanghongqing
|
114c643cd4
|
1.处理配置列表展示关键字换行问题
2.处理日志url 前缀http问题（http,https,ftp直接展示不判断添加http）
|
2018-09-11 15:26:52 +08:00 |
|
wangxin
|
fcc34b26b5
|
分类性质标签加入默认值0
|
2018-09-11 15:23:32 +08:00 |
|
wangxin
|
8f4c43b62e
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-11 11:04:02 +08:00 |
|
wangxin
|
e87febaeaa
|
(1)特定服务表单提交是否叶子节点自动切换
(2)基础协议，加密隧道行为协议ID修改与APP一致
|
2018-09-11 11:03:08 +08:00 |
|
zhanghongqing
|
da8b211f97
|
解决日志详情的换行问题
|
2018-09-11 10:22:44 +08:00 |
|
zhanghongqing
|
769900820a
|
1.新增说话人识别，台标识别，人脸识别配置
2.菜单新增sql提交
|
2018-09-10 19:07:27 +08:00 |
|
wangxin
|
ab995804d0
|
列表界面是否区域管控替换成与form表单一致
|
2018-09-10 18:27:46 +08:00 |
|
wangxin
|
8823653113
|
特定服务列表查询条件业务分类添加动态搜索
|
2018-09-10 17:56:57 +08:00 |
|
wangxin
|
59315d73fd
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-09-10 17:23:16 +08:00 |
|
wangxin
|
6b70234c14
|
更新业务类型
|
2018-09-10 17:22:32 +08:00 |
|
zhanghongqing
|
2679dc6553
|
日志邮件 列表调整
|
2018-09-10 17:09:50 +08:00 |
|
wangxin
|
b7e69bbf90
|
注释掉特定协议中的序号动态变更
|
2018-09-10 14:12:48 +08:00 |
|
zhanghongqing
|
3af86b92de
|
添加国际化
|
2018-09-10 13:42:51 +08:00 |
|
zhanghongqing
|
c5fb19c695
|
1.新 httpclient版本到4.5.6，解决凯歌提出的4.4.1版本存在的连接可能出现失败问题
2.提交图标样式更改
|
2018-09-10 11:39:04 +08:00 |
|
wangxin
|
7f918963a0
|
俄文国际化提交
|
2018-09-10 09:52:55 +08:00 |
|
zhanghongqing
|
82d1de6d6d
|
提交工具类
|
2018-09-10 09:30:09 +08:00 |
|
wangxin
|
c29d8c9e8c
|
ztree空的父节点默认展开
|
2018-09-10 09:16:59 +08:00 |
|
zhanghongqing
|
3bbdc8107e
|
1.增加国际化
|
2018-09-08 20:21:30 +08:00 |
|
zhanghongqing
|
c62e99b4ae
|
邮件修改sql doLog的新增跟修改
|
2018-09-08 18:35:58 +08:00 |
|
zhanghongqing
|
d0205a10cf
|
http 新增加dolog属性选择
|
2018-09-08 17:08:18 +08:00 |
|
zhanghongqing
|
a5176658d1
|
1.修改视频场景增加监测封堵按钮2.增加patch调用接口更改配置状态方法
|
2018-09-07 21:10:35 +08:00 |
|