648540858
|
e861c9dfab
|
Merge remote-tracking branch 'origin/master' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
2157bb0270
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
0a44eb8965
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:33:17 +08:00 |
|
648540858
|
0b6587b1ad
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:29:03 +08:00 |
|
648540858
|
5bcd8495e0
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
2022-02-20 16:22:43 +08:00 |
|
648540858
|
b7635ec05d
|
优化级联通道发送速度
|
2022-02-20 16:18:14 +08:00 |
|
648540858
|
0327d16021
|
优化级联平台删除
|
2022-02-17 15:33:25 +08:00 |
|
648540858
|
59c79c08e1
|
修复级联通道回复错误
|
2022-02-16 15:13:16 +08:00 |
|
648540858
|
b0d3bf3ed9
|
添加通道导入实例文件
|
2022-02-15 17:52:37 +08:00 |
|
648540858
|
9442c37ce7
|
优化级联添加通道流程
|
2022-02-15 17:41:09 +08:00 |
|
648540858
|
d4fe0fb325
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-15 09:13:16 +08:00 |
|
648540858
|
5528517471
|
Merge pull request #325 from nikmu/wvp-28181-2.0
新增实时监控功能
|
2022-02-15 09:13:03 +08:00 |
|
朱俊杰
|
54df5df031
|
mapper改用注释方式
|
2022-02-14 10:18:00 +08:00 |
|
648540858
|
b663a8ab41
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-11 18:01:58 +08:00 |
|
648540858
|
980052015a
|
优化列表展示
|
2022-02-11 16:46:58 +08:00 |
|
648540858
|
bf66f8f694
|
推流导入支持添加平台信息与目录信息
|
2022-02-11 16:45:06 +08:00 |
|
648540858
|
59f0210d04
|
Merge pull request #324 from SaltFish001/wvp-28181-2.0
更新生成的HTTP(s)/WS(s)-flv的链接地址
|
2022-02-11 09:47:26 +08:00 |
|
朱俊杰
|
37a84e6691
|
新增实时监控功能
左边是设备通道树，右边是分屏预览
|
2022-02-10 14:45:33 +08:00 |
|
SaltFish
|
0209dc89c9
|
Update MediaServiceImpl.java
最新版本zlm更新了flv的链接地址， 同步更新
|
2022-02-10 10:29:36 +08:00 |
|
648540858
|
d07a5680f3
|
为推流列表增加批量移除功能
|
2022-02-07 18:30:43 +08:00 |
|
648540858
|
e0028a87cb
|
为推流列表增加搜索功能
|
2022-02-07 14:12:34 +08:00 |
|
648540858
|
ea85a620d1
|
添加服务器信息获取能力。
|
2022-02-04 21:46:48 +08:00 |
|
648540858
|
d7afcab601
|
优化媒体服务器配置展示界面
|
2022-01-30 16:39:15 +08:00 |
|
648540858
|
8d5764b9a0
|
优化信令配置展示界面
|
2022-01-30 15:58:15 +08:00 |
|
648540858
|
646419e4ad
|
#247
|
2022-01-28 16:45:12 +08:00 |
|
648540858
|
8cfff8db97
|
添加对可能空指针的判断
|
2022-01-28 16:30:10 +08:00 |
|
648540858
|
f33c3a3630
|
添加重启后拉流代理自动恢复
|
2022-01-27 18:08:19 +08:00 |
|
648540858
|
66cadafd1c
|
优化直播推流的CivilCode
|
2022-01-27 17:40:59 +08:00 |
|
648540858
|
89db9991a2
|
2.0.2版本 去除默认的mediaIP 127.0.0.1,避免误导新用户
|
2022-01-27 14:25:26 +08:00 |
|
648540858
|
9b21fba871
|
解析xml异常时，回复400
|
2022-01-27 10:39:08 +08:00 |
|
648540858
|
e728233781
|
使用log4j-over-slf4j取代log4j避免log4j漏洞
|
2022-01-27 10:09:47 +08:00 |
|
648540858
|
f9b8ea6573
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-01-26 11:00:48 +08:00 |
|
648540858
|
7cb74dbe51
|
Merge pull request #317 from nikmu/wvp-28181-2.0
添加lombok，分离注册周期事件
|
2022-01-26 10:55:36 +08:00 |
|
lanss
|
d34be408d6
|
update web_src/src/components/dialog/changePassword.vue.
|
2022-01-25 13:50:22 +00:00 |
|
648540858
|
75ee368c96
|
优化默认节点的展示
|
2022-01-25 20:21:36 +08:00 |
|
648540858
|
c547851487
|
优化zlm上线与下线过时通道的移除
|
2022-01-25 19:38:04 +08:00 |
|
648540858
|
abc65c6317
|
优化目录移除时默认目录的选择
|
2022-01-25 17:14:10 +08:00 |
|
648540858
|
08468edd45
|
移除sqlite支持
|
2022-01-25 16:36:55 +08:00 |
|
648540858
|
5c2d27f75d
|
兼容mysql5低版本
|
2022-01-25 16:23:29 +08:00 |
|
648540858
|
1dbb559b38
|
优化文件导入判断
|
2022-01-25 15:43:52 +08:00 |
|
朱俊杰
|
4065703317
|
添加lombok，分离注册周期事件
1、添加lombok依赖
2、分离注册周期事件
|
2022-01-25 15:42:11 +08:00 |
|
648540858
|
94688534f8
|
移除db 导出的sql文件
|
2022-01-25 14:42:46 +08:00 |
|
648540858
|
5f7fa2784e
|
修改sql文件
|
2022-01-25 12:22:32 +08:00 |
|
648540858
|
2e60339e0a
|
修复候选通道查询bug
|
2022-01-25 12:20:52 +08:00 |
|
648540858
|
a179a45ac3
|
优化通道选择是通道的查询
|
2022-01-21 18:41:41 +08:00 |
|
648540858
|
46cf650a86
|
优化通道选择是通道的查询
|
2022-01-21 18:00:15 +08:00 |
|
648540858
|
b6702f7c05
|
修改mysql脚本
|
2022-01-21 16:05:02 +08:00 |
|
648540858
|
3f5e885e82
|
目录默认节点被删除时，重置默认节点为根节点
|
2022-01-21 14:10:49 +08:00 |
|
648540858
|
7d88827415
|
处理服务重启或设备重新上线时的订阅，优化通道导入重复的处理
|
2022-01-20 16:48:30 +08:00 |
|
648540858
|
c5ddf59858
|
修改readme
|
2022-01-19 17:40:03 +08:00 |
|