648540858
|
e6d9d65e51
|
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
|
d10d7ab89c
|
合并主线的发流端口管理逻辑
|
2023-07-10 14:30:59 +08:00 |
|
648540858
|
b5ff247a82
|
增加备用字段
|
2023-07-02 12:40:41 +08:00 |
|
648540858
|
cb3c221b69
|
增加备用字段
|
2023-07-02 00:03:21 +08:00 |
|
648540858
|
e9c019a28c
|
优化发流逻辑
|
2023-07-01 18:10:33 +08:00 |
|
648540858
|
b0094a5755
|
添加sql字段
|
2023-06-20 14:25:01 +08:00 |
|
648540858
|
eef26ec736
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-20 14:15:27 +08:00 |
|
648540858
|
5c631d8039
|
去除多余字段
|
2023-06-20 09:57:28 +08:00 |
|
‘sxh’
|
ed6aaa25b9
|
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’
|
08e8469998
|
新增设备主子码流选择（mysql语句）
|
2023-06-15 11:04:04 +08:00 |
|
xubinbin
|
7a9ce766a7
|
删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
|
2023-05-30 13:24:46 +08:00 |
|
648540858
|
8c411a7d93
|
修复升级sql
|
2023-05-29 09:23:21 +08:00 |
|
648540858
|
5d4e49e1eb
|
本地集成人大金仓连接jar
|
2023-05-16 17:17:24 +08:00 |
|
648540858
|
d4e08632cd
|
兼容人大金仓对online作为保留字段的要求
|
2023-05-16 15:13:38 +08:00 |
|
648540858
|
f9c7b1c4d0
|
重构以适配postgresql
|
2023-05-12 10:37:03 +08:00 |
|
648540858
|
299a965240
|
优化国标级联中的通道全部导入
|
2023-03-22 15:21:22 +08:00 |
|
648540858
|
7caf353770
|
修复设备点播时指定流媒体
|
2023-03-22 15:21:22 +08:00 |
|
648540858
|
0b8a0d2f8f
|
增加消息通道配置，可以通道redis在wvp上下级之间发送消息
|
2023-03-14 14:02:33 +08:00 |
|
648540858
|
3e633321e0
|
优化数据库自动更新功能
|
2023-02-01 15:37:19 +08:00 |
|
lin
|
5275b5020b
|
补充sql
|
2023-01-31 22:05:11 +08:00 |
|
648540858
|
12faee32c2
|
优化设备状态保持，自动记录心跳间隔，三次心跳失败则设备离线，不在使用设备有效期字段作为唯一判断标准，提高容错能力和稳定性。
|
2023-01-04 10:39:40 +08:00 |
|
xubinbin
|
fecde062ab
|
1、处理”强迫症更新，将数据表ID字段新增值重置为1“提交的内容在初始化数据时报错问题；2、修改用户表的创建时间和更新时间格式
|
2022-12-16 16:42:25 +08:00 |
|
WuPeng
|
dd506d6cfb
|
强迫症更新，将数据表ID字段新增值重置为1。
|
2022-11-29 21:41:55 +08:00 |
|
648540858
|
cedb6fc928
|
更新全量数据库
|
2022-11-29 11:50:21 +08:00 |
|
648540858
|
b0581e2bf5
|
优化拉流代理表单以及逻辑
|
2022-11-22 17:17:35 +08:00 |
|
648540858
|
6c0a609134
|
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
|
5057c16f14
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +08:00 |
|
648540858
|
6f2badd6a4
|
支持多网卡
|
2022-10-26 17:15:29 +08:00 |
|
648540858
|
9ea33381cc
|
设备编辑增加收流IP
|
2022-10-25 10:17:59 +08:00 |
|
XiaoQiTong
|
553868cb28
|
修改云端录像选择节点流媒体path不修改的bug
device表增加的mediaServerId字段丢失，重新添加
|
2022-10-18 20:18:51 +08:00 |
|
648540858
|
af317662a5
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:02:05 +08:00 |
|
648540858
|
9052a6cf0d
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-10-17 17:23:38 +08:00 |
|
648540858
|
489fbbbb70
|
支持锁定编辑后的设备名 #642
|
2022-10-17 17:16:59 +08:00 |
|
韩浩然XiaoQiTong
|
6ee4b3538d
|
Update update.sql
|
2022-10-17 17:10:37 +08:00 |
|
648540858
|
6eb98d7b80
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-17 16:38:28 +08:00 |
|
XiaoQiTong
|
153385cd66
|
增加指定流媒体收流功能
|
2022-10-15 20:57:24 +08:00 |
|
648540858
|
5eaf45f249
|
修复添加业务分组失败
|
2022-09-08 17:51:12 +08:00 |
|
648540858
|
025b37df2e
|
升级版本号
|
2022-08-29 09:55:09 +08:00 |
|
648540858
|
ecd404c776
|
去除多余内容
|
2022-07-27 14:53:19 +08:00 |
|
648540858
|
9d48c21d76
|
去除多余内容
|
2022-07-27 14:51:49 +08:00 |
|
648540858
|
3d058b506e
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
|
648540858
|
c53622e802
|
更新mysql.sql
|
2022-07-22 16:05:23 +08:00 |
|
648540858
|
64f6d596f4
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
bf189cb11b
|
为pushKey增加默认值
|
2022-07-18 20:38:47 +08:00 |
|
648540858
|
1a285ba00f
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
648540858
|
0f945910f3
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
|
648540858
|
a1d6e96c11
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|
648540858
|
3b748f35b6
|
修复默认用户信息插入
|
2022-07-11 15:26:25 +08:00 |
|
648540858
|
99ab787468
|
用户表增加推流鉴权KEY
|
2022-07-08 11:20:29 +08:00 |
|
648540858
|
b1b4a45224
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|