648540858
|
b9db7c15a6
|
优化自动获取stream ip
|
2023-06-25 13:49:07 +08:00 |
|
648540858
|
3691d6ff97
|
优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895
|
2023-06-22 22:35:35 +08:00 |
|
648540858
|
312775fb27
|
修复表名错误 #904
|
2023-06-21 15:53:26 +08:00 |
|
648540858
|
4fd26db2a1
|
优化国标级联的端口保持
|
2023-06-21 14:03:31 +08:00 |
|
648540858
|
94ace01c42
|
添加文档依赖，去除cdn依赖
|
2023-06-20 15:25:56 +08:00 |
|
648540858
|
b0094a5755
|
添加sql字段
|
2023-06-20 14:25:01 +08:00 |
|
648540858
|
0325efd84c
|
恢复默认值
|
2023-06-20 14:17:44 +08:00 |
|
648540858
|
2546748867
|
Merge pull request #893 from sxh-netizen/wvp-28181-2.0
新增设备主子码流开关选择，默认为不开启
|
2023-06-20 14:16:46 +08:00 |
|
648540858
|
eef26ec736
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-20 14:15:27 +08:00 |
|
648540858
|
f3b44a97f5
|
修复删除的设备无法重新注册的问题
|
2023-06-20 13:02:18 +08:00 |
|
648540858
|
f96f575d65
|
修复通道刷新
|
2023-06-20 12:51:06 +08:00 |
|
648540858
|
5c631d8039
|
去除多余字段
|
2023-06-20 09:57:28 +08:00 |
|
648540858
|
3e45526474
|
优化国标级联注册机制
|
2023-06-20 09:29:12 +08:00 |
|
648540858
|
16256537fb
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
# src/main/resources/all-application.yml
# web_src/package-lock.json
|
2023-06-19 20:19:31 +08:00 |
|
648540858
|
c64fb0d3db
|
优化国标级联注册机制
|
2023-06-19 20:09:16 +08:00 |
|
648540858
|
eeb345fa93
|
优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范
|
2023-06-19 18:42:36 +08:00 |
|
‘sxh’
|
5d6b8c1804
|
同步主线的代码，保持一致性
|
2023-06-15 11:20:43 +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 |
|
‘sxh’
|
7e70ad4849
|
新增设备主子码流选择，默认为不开启
|
2023-06-15 11:00:29 +08:00 |
|
648540858
|
d9506b9e59
|
优化移动位置的时间
|
2023-06-14 20:39:10 +08:00 |
|
648540858
|
ef5440a97f
|
Merge pull request #876 from criver31/wvp-28181-2.0
移动设备实时位置兼容ISO8601格式
|
2023-06-14 20:14:31 +08:00 |
|
648540858
|
b4f0d17f9f
|
修复前端空指针异常 #831
|
2023-06-14 18:14:40 +08:00 |
|
648540858
|
db1d503c55
|
修复移动位置获取接口超时 #857
|
2023-06-14 17:04:41 +08:00 |
|
648540858
|
7f22b5e504
|
修复级联录像查询sql错误
|
2023-06-14 16:26:29 +08:00 |
|
648540858
|
dcde54d8cd
|
去除多余日志
|
2023-06-13 23:11:56 +08:00 |
|
648540858
|
1fcb946700
|
Merge branch '2.6.8' into wvp-28181-2.0
|
2023-06-13 23:11:00 +08:00 |
|
648540858
|
5f2d4393c3
|
修复zlm上线时过期任务设置错误
|
2023-06-13 23:06:35 +08:00 |
|
648540858
|
97bd082a40
|
修复sdp解析错误
|
2023-06-12 22:54:40 +08:00 |
|
648540858
|
415c13cf72
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-10 00:33:00 +08:00 |
|
648540858
|
4ed7cb49be
|
优化sdp解析，兼容带有f=的设备
|
2023-06-10 00:32:42 +08:00 |
|
648540858
|
0a538ca23d
|
Merge pull request #887 from bigbeef/wvp-28181-2.0
fix:修复拉流代理配置展示问题:音频、录制、无人观看
|
2023-06-09 23:18:15 +08:00 |
|
winfed
|
45ad19b712
|
feat:删除拉流代理时，提示是否确认删除，防止误删
|
2023-06-09 15:50:33 +08:00 |
|
winfed
|
9f50dd8fcb
|
fix:修复拉流代理配置展示问题:音频、录制、无人观看
|
2023-06-09 15:19:18 +08:00 |
|
648540858
|
4815af8ca0
|
修复stream-on-demand配置失效的BUG
|
2023-06-08 22:46:07 +08:00 |
|
648540858
|
4d8cf32fbc
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
|
2023-06-08 10:41:36 +08:00 |
|
648540858
|
508b3aa44f
|
优化ffmpeg拉流代理
|
2023-06-08 10:40:16 +08:00 |
|
648540858
|
0b8584243f
|
优化via的branch生成规则
|
2023-06-07 21:45:15 +08:00 |
|
648540858
|
3d2f34e736
|
增加收到notify增加或移除通道时发送redis消息
|
2023-06-07 21:11:39 +08:00 |
|
648540858
|
3a2468eef5
|
支持redis消息强制关闭流
|
2023-06-07 20:58:35 +08:00 |
|
648540858
|
e196e012de
|
合并分支
|
2023-06-07 20:27:57 +08:00 |
|
648540858
|
96f8bded6e
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
|
2023-06-07 20:21:10 +08:00 |
|
648540858
|
e7402c9488
|
修复录像下载，优化拉流代理接口
|
2023-06-07 20:15:08 +08:00 |
|
648540858
|
730779ba86
|
优化截图获取接口
|
2023-06-05 11:10:15 +08:00 |
|
648540858
|
8e014cce07
|
修复拉流代理的ffmpeg代理方式
|
2023-06-05 10:28:11 +08:00 |
|
648540858
|
3c1528b168
|
修复添加目录SQL错误 #881
|
2023-06-05 09:39:59 +08:00 |
|
648540858
|
6a24603fd3
|
优化日志
|
2023-06-02 16:40:19 +08:00 |
|
648540858
|
75bb0ec40a
|
优化点播流程中ssrc的释放
|
2023-06-02 15:46:07 +08:00 |
|
648540858
|
b840b94bd2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-01 15:58:33 +08:00 |
|
648540858
|
8903f64532
|
Merge pull request #872 from xu-bin-bin/wvp-28181-2.0
删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
|
2023-06-01 15:58:19 +08:00 |
|