648540858
|
130dc5d82d
|
优化拉流代理逻辑，修复ffmpeg拉流代理鉴权
|
2023-09-30 06:09:16 +08:00 |
|
648540858
|
b9a33f03d6
|
国标级联支持添加通道后主动推动到上级
|
2023-09-22 17:46:31 +08:00 |
|
648540858
|
59d8f2f915
|
支持录像回放使用固定流地址以及自动点播录像回放
|
2023-07-25 11:14:43 +08:00 |
|
648540858
|
668dc8f0dd
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-13 14:47:24 +08:00 |
|
648540858
|
04e7f48fde
|
合并主线的发流端口管理逻辑
|
2023-07-10 14:30:59 +08:00 |
|
648540858
|
27b125cf98
|
增加备用字段
|
2023-07-02 12:40:41 +08:00 |
|
648540858
|
64cd48a92b
|
增加备用字段
|
2023-07-02 00:03:21 +08:00 |
|
648540858
|
b64f320805
|
优化发流逻辑
|
2023-07-01 18:10:33 +08:00 |
|
648540858
|
96d2a27d41
|
添加sql字段
|
2023-06-20 14:25:01 +08:00 |
|
648540858
|
9e28923b8c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-20 14:15:27 +08:00 |
|
648540858
|
d310204d00
|
去除多余字段
|
2023-06-20 09:57:28 +08:00 |
|
‘sxh’
|
652489b47e
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2023-06-15 11:10:20 +08:00 |
|
‘sxh’
|
05cc0d14f1
|
新增设备主子码流选择（mysql语句）
|
2023-06-15 11:04:04 +08:00 |
|
xubinbin
|
7d5a5b6c8f
|
删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
|
2023-05-30 13:24:46 +08:00 |
|
648540858
|
d72c1c0c4c
|
修复升级sql
|
2023-05-29 09:23:21 +08:00 |
|
648540858
|
9e790eb0ff
|
本地集成人大金仓连接jar
|
2023-05-16 17:17:24 +08:00 |
|
648540858
|
be9bf60e81
|
兼容人大金仓对online作为保留字段的要求
|
2023-05-16 15:13:38 +08:00 |
|
648540858
|
d849352441
|
重构以适配postgresql
|
2023-05-12 10:37:03 +08:00 |
|
648540858
|
f210952ed2
|
优化国标级联中的通道全部导入
|
2023-03-22 15:21:22 +08:00 |
|
648540858
|
c85c994972
|
修复设备点播时指定流媒体
|
2023-03-22 15:21:22 +08:00 |
|
648540858
|
943f95ba8c
|
增加消息通道配置，可以通道redis在wvp上下级之间发送消息
|
2023-03-14 14:02:33 +08:00 |
|
648540858
|
7470e1fe8e
|
优化数据库自动更新功能
|
2023-02-01 15:37:19 +08:00 |
|
lin
|
aedbc4ed75
|
补充sql
|
2023-01-31 22:05:11 +08:00 |
|
648540858
|
a82b831b8b
|
优化设备状态保持，自动记录心跳间隔，三次心跳失败则设备离线，不在使用设备有效期字段作为唯一判断标准，提高容错能力和稳定性。
|
2023-01-04 10:39:40 +08:00 |
|
xubinbin
|
c8524b1d43
|
1、处理”强迫症更新，将数据表ID字段新增值重置为1“提交的内容在初始化数据时报错问题；2、修改用户表的创建时间和更新时间格式
|
2022-12-16 16:42:25 +08:00 |
|
WuPeng
|
170b0a1800
|
强迫症更新，将数据表ID字段新增值重置为1。
|
2022-11-29 21:41:55 +08:00 |
|
648540858
|
9b8c1ad8c6
|
更新全量数据库
|
2022-11-29 11:50:21 +08:00 |
|
648540858
|
8ea6e192d9
|
优化拉流代理表单以及逻辑
|
2022-11-22 17:17:35 +08:00 |
|
648540858
|
d340a37a00
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-11-17 11:31:30 +08:00 |
|
648540858
|
694076dc8c
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +08:00 |
|
648540858
|
1ab73f69eb
|
支持多网卡
|
2022-10-26 17:15:29 +08:00 |
|
648540858
|
0f0ece2401
|
设备编辑增加收流IP
|
2022-10-25 10:17:59 +08:00 |
|
XiaoQiTong
|
b0d0d30781
|
修改云端录像选择节点流媒体path不修改的bug
device表增加的mediaServerId字段丢失，重新添加
|
2022-10-18 20:18:51 +08:00 |
|
648540858
|
3c52a16e5f
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:02:05 +08:00 |
|
648540858
|
20cd60c66c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-10-17 17:23:38 +08:00 |
|
648540858
|
3e91483d4b
|
支持锁定编辑后的设备名 #642
|
2022-10-17 17:16:59 +08:00 |
|
韩浩然XiaoQiTong
|
42838a176c
|
Update update.sql
|
2022-10-17 17:10:37 +08:00 |
|
648540858
|
7918f03734
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-17 16:38:28 +08:00 |
|
XiaoQiTong
|
dabee4ed7d
|
增加指定流媒体收流功能
|
2022-10-15 20:57:24 +08:00 |
|
648540858
|
feb9996538
|
修复添加业务分组失败
|
2022-09-08 17:51:12 +08:00 |
|
648540858
|
8b6449ce3a
|
升级版本号
|
2022-08-29 09:55:09 +08:00 |
|
648540858
|
d891b89c4b
|
去除多余内容
|
2022-07-27 14:53:19 +08:00 |
|
648540858
|
c7e09589af
|
去除多余内容
|
2022-07-27 14:51:49 +08:00 |
|
648540858
|
c77c1a956c
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
|
648540858
|
8ee7211ba3
|
更新mysql.sql
|
2022-07-22 16:05:23 +08:00 |
|
648540858
|
9e397ba9f6
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
2b351e1e18
|
为pushKey增加默认值
|
2022-07-18 20:38:47 +08:00 |
|
648540858
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
648540858
|
74d97734ba
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
|
648540858
|
afbec28906
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|