648540858
|
9f7dc295cf
|
Merge pull request #1140 from shuxiaoyuan/fix-update-time
bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错
|
2023-12-11 10:05:57 +08:00 |
|
648540858
|
33506a0046
|
Merge pull request #1146 from leibnewton/fix_on_stream_changed
修复OnStreamChangedHook媒体轨道信息解析错误
|
2023-12-11 10:05:36 +08:00 |
|
648540858
|
6678ac8605
|
临时提交
|
2023-12-08 18:05:14 +08:00 |
|
648540858
|
dc4385da74
|
临时提交
|
2023-12-07 18:04:53 +08:00 |
|
648540858
|
bdd1846eb4
|
优化自动点播判断逻辑
|
2023-12-06 22:31:26 +08:00 |
|
648540858
|
4897d9a501
|
临时提交
|
2023-12-06 18:18:24 +08:00 |
|
648540858
|
0d3845af59
|
添加移除共享到上级平台的通道
|
2023-12-05 23:23:48 +08:00 |
|
648540858
|
c4aeef62ef
|
调整数据库结构
|
2023-12-04 21:56:21 +08:00 |
chenzhangyue
|
0542700225
|
fix find stream
|
2023-12-01 10:34:16 +08:00 |
|
648540858
|
e44be505d9
|
优化通用通道同步，待完成
|
2023-11-28 18:56:39 +08:00 |
|
648540858
|
5a5108c827
|
优化通用通道同步，待完成
|
2023-11-27 18:40:00 +08:00 |
|
648540858
|
d88c635d8a
|
优化通用通道同步，待完成
|
2023-11-27 11:04:43 +08:00 |
|
648540858
|
a9e5883492
|
优化通用通道同步，待完成
|
2023-11-24 18:04:57 +08:00 |
|
648540858
|
d72f57c772
|
支持通用通道国标类型的播放
|
2023-11-24 10:12:36 +08:00 |
|
648540858
|
cbc0ca91b1
|
优化区域树
|
2023-11-17 17:59:14 +08:00 |
|
648540858
|
b96c9317e8
|
优化区域树
|
2023-11-16 14:24:50 +08:00 |
|
648540858
|
7d064b0830
|
优化区域树
|
2023-11-15 18:04:59 +08:00 |
|
648540858
|
fd71a96580
|
优化分组树
|
2023-11-15 11:24:56 +08:00 |
|
648540858
|
bcd5ce25ca
|
优化分组树
|
2023-11-14 18:36:40 +08:00 |
|
648540858
|
4ab0200c90
|
修复BUG
|
2023-11-10 17:58:40 +08:00 |
|
648540858
|
abbb5643c5
|
优化分组树的添加
|
2023-11-10 17:41:20 +08:00 |
|
648540858
|
e96b39935d
|
支持生成国标ID
|
2023-11-10 16:03:47 +08:00 |
|
648540858
|
fed353c645
|
优化分组管理
|
2023-11-09 18:05:30 +08:00 |
|
648540858
|
6fb820e49c
|
修复分组更新BUG
|
2023-11-08 18:30:41 +08:00 |
|
648540858
|
2f9bd859f4
|
修复通道查询BUG
|
2023-11-07 18:27:57 +08:00 |
dongzhou.xie
|
9a572b97df
|
修复OnStreamChangedHook媒体轨道信息解析错误
|
2023-11-07 11:52:07 +08:00 |
xiaoQQya
|
f78657473e
|
fix(报警推送): 修复报警推送功能无效的问题
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
|
2023-11-06 20:34:58 +08:00 |
xiaoQQya
|
b73747138d
|
Merge branch '648540858:wvp-28181-2.0' into develop
|
2023-11-06 15:43:07 +08:00 |
|
648540858
|
a01295603a
|
简化配置
|
2023-11-03 17:32:37 +08:00 |
|
648540858
|
887f20524f
|
优化分组管理
|
2023-11-03 17:20:00 +08:00 |
lishuyuan
|
8bd2f47c9a
|
bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错
|
2023-11-02 10:17:47 +08:00 |
|
xiaoQQya
|
f0d09d1808
|
perf(snap): 优化点播后 ffmpeg 截图使用的命令参数，解决部分情况下截图失败的问题
|
2023-11-01 17:15:19 +08:00 |
|
xiaoQQya
|
8a9f8c6cab
|
fix: 修复推流鉴权时 enable_audio 设置错误的问题
推流鉴权获取 ssrc 缓存事务时通过 zlm 回调参数中的 stream 查询，因回调参数中的 stream 为 ssrc，而缓存事务中的 stream 为 deviceId_channelId，故导致查询不到缓存事务信息，进而导致查询不到设备信息无法正确配置 enable_audio 信息，现改为通过 deviceId 与 channelId 查询缓存事务信息
|
2023-11-01 16:04:12 +08:00 |
|
lishuyuan
|
5cd2e2c41b
|
bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加
|
2023-11-01 15:17:28 +08:00 |
|
648540858
|
e5ac02ff17
|
增加接口
|
2023-11-01 09:25:49 +08:00 |
|
648540858
|
f4f3e60a6b
|
Merge pull request #1082 from DavidSche/Live_streaming_push
推流列表-->添加通道 补充播放需要的默认参数 媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示)
|
2023-10-27 15:47:27 +08:00 |
|
648540858
|
af911d4f02
|
Merge pull request #1102 from xu-bin-bin/wvp-28181-2.0
修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题
|
2023-10-27 15:42:32 +08:00 |
|
648540858
|
47783946fe
|
Merge pull request #1105 from lunasaw/dev-wvp-1011
feat:支持代理拉流状态检测，离线查询流是否离线
|
2023-10-27 15:41:26 +08:00 |
|
lishuyuan
|
da7889bf67
|
bugfix：编辑国标设备时，若目录订阅周期本来不为0时不生效
|
2023-10-27 11:15:30 +08:00 |
|
lishuyuan
|
26ca854db5
|
bugfix：去掉目录订阅通知处理重复逻辑代码
|
2023-10-27 11:09:42 +08:00 |
|
648540858
|
a73508a24c
|
增加新的静态文件放过
|
2023-10-27 10:45:35 +08:00 |
xu-bin-bin
|
ae9976bb3a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2023-10-24 09:28:16 +08:00 |
|
xiaoQQya
|
613399cc6d
|
fix(play): 修复单端口推流下级自定义 ssrc 时, 流注册后接口仍然超时的问题
|
2023-10-17 17:49:31 +08:00 |
|
xu-bin-bin
|
90d9cd8ac8
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2023-10-17 09:23:45 +08:00 |
|
648540858
|
12c4128e81
|
修复目录更新时已删除数据的整理功能
|
2023-10-13 15:44:49 +08:00 |
|
xu-bin-bin
|
124d83fc0c
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2023-10-13 08:55:27 +08:00 |
|
648540858
|
78f628dd6f
|
修复同步目录时批量提交的错误
|
2023-10-12 17:01:25 +08:00 |
|
648540858
|
7d6aaf3bb0
|
修复国标接连选择通道相关的问题
|
2023-10-12 16:36:07 +08:00 |
|
chenzhangyue
|
f5d89e06a3
|
feat:支持代理拉流状态检测，离线查询流是否离线
|
2023-10-11 13:52:08 +08:00 |
xubinbin
|
4084080a8e
|
修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题。
|
2023-10-10 15:17:06 +08:00 |
|
648540858
|
89fd69b5ab
|
优化国标通道同步到资源库
|
2023-10-08 18:09:46 +08:00 |
|
648540858
|
cb41fc9f84
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-10-08 15:42:08 +08:00 |
|
648540858
|
205f1f1f60
|
优化国标级联心跳失败再次注册的逻辑
|
2023-10-08 15:41:24 +08:00 |
|
648540858
|
9fa4bf6f77
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-10-08 11:04:30 +08:00 |
|
648540858
|
c084d6c98a
|
优化国标级联心跳失败判断逻辑
|
2023-10-07 18:00:08 +08:00 |
|
648540858
|
4c28f380aa
|
优化byte数组转换
|
2023-10-07 14:52:46 +08:00 |
|
648540858
|
29352cc9cd
|
优化自动同步国标通道到通用通道，分组信息以及行政区划自动同步
|
2023-10-06 23:39:38 +08:00 |
|
648540858
|
6255e6f89f
|
支持自动同步国标通道到通用通道，分组信息以及行政区划自动同步
|
2023-10-04 00:59:16 +08:00 |
|
648540858
|
8f7673a083
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
# sql/2.6.9更新.sql
|
2023-10-01 23:59:04 +08:00 |
|
648540858
|
94a0de0d27
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-09-30 06:09:57 +08:00 |
|
648540858
|
130dc5d82d
|
优化拉流代理逻辑，修复ffmpeg拉流代理鉴权
|
2023-09-30 06:09:16 +08:00 |
|
chenzhangyue
|
7620527340
|
fix hasSubChannel
|
2023-09-28 16:00:05 +08:00 |
|
648540858
|
e2f0533510
|
添加字段控制是否自动同步国标通道
|
2023-09-26 15:39:52 +08:00 |
|
648540858
|
483d5e04a7
|
优化拉流代理
|
2023-09-25 18:51:02 +08:00 |
|
648540858
|
527dd66c0d
|
添加字段控制是否自动同步国标通道
|
2023-09-25 18:20:05 +08:00 |
|
648540858
|
e8411bc797
|
修复截图截图未关闭流 #1087
|
2023-09-25 16:22:36 +08:00 |
|
648540858
|
ea271bf4b9
|
添加字段控制是否自动同步国标通道
|
2023-09-25 16:13:38 +08:00 |
|
648540858
|
94ec880fe8
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
# sql/2.6.9更新.sql
|
2023-09-22 17:46:58 +08:00 |
|
648540858
|
b9a33f03d6
|
国标级联支持添加通道后主动推动到上级
|
2023-09-22 17:46:31 +08:00 |
che_shuai
|
da63ef5b19
|
推流列表-->添加通道 补充播放需要的默认参数 媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示)
|
2023-09-22 11:34:10 +08:00 |
|
648540858
|
37915522d7
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-09-22 09:43:59 +08:00 |
|
648540858
|
a34db2ee8b
|
增加根据国标编号添加国标级联通道的接口
|
2023-09-21 21:34:02 +08:00 |
|
648540858
|
69d72e7e4e
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-09-20 09:15:57 +08:00 |
|
648540858
|
be527a4bd1
|
增加国标通道同步到资源管理
|
2023-09-19 17:55:13 +08:00 |
|
648540858
|
074dbd69a2
|
有哈u云台控制接口
|
2023-09-18 18:19:46 +08:00 |
|
648540858
|
df0b530ce4
|
统计代理结果返回
|
2023-09-18 07:53:49 +08:00 |
Cloud User
|
bc431e4290
|
fix-use-source-ip-as-stream-ip
|
2023-09-15 22:39:08 +08:00 |
|
648540858
|
b902a659dc
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-09-15 14:30:51 +08:00 |
|
648540858
|
e073b60cb1
|
Merge pull request #1071 from lunasaw/dev-wvp-0911
generate @param
|
2023-09-15 14:29:01 +08:00 |
|
648540858
|
2d11f1b3de
|
修复ssrc缓存初始化判断错误，导致初始化失败
|
2023-09-15 14:25:08 +08:00 |
|
648540858
|
125f993f1d
|
取去除无用实现
|
2023-09-15 09:38:28 +08:00 |
|
648540858
|
da15dc908d
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
|
2023-09-15 09:36:38 +08:00 |
|
648540858
|
2d423d9668
|
Merge branch 'xinchuang' into wvp-28181-2.0
|
2023-09-15 09:35:14 +08:00 |
|
648540858
|
1d8dd248a5
|
接口优化
|
2023-09-15 09:34:29 +08:00 |
|
chenzhangyue
|
54038486f4
|
generate @param
|
2023-09-12 20:23:14 +08:00 |
|
648540858
|
b1ec6c6dd6
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-09-12 15:33:41 +08:00 |
|
648540858
|
d05bce8f7f
|
修复对接金仓数据库中的问题
|
2023-09-12 15:32:17 +08:00 |
|
648540858
|
a6fb1cdb74
|
修复Web页面播放国标录像无声音的问题
|
2023-09-11 16:17:29 +08:00 |
|
648540858
|
f57ed350b3
|
添加设置mobilePosition中ChannelId #1054
|
2023-09-11 11:01:20 +08:00 |
|
648540858
|
4f90b28b93
|
修复自动点播超时后无法继续点播的问题
|
2023-09-11 10:36:40 +08:00 |
|
648540858
|
33debb002a
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-09-06 16:37:59 +08:00 |
|
648540858
|
d02078397e
|
修复修改流传输模式
|
2023-09-06 16:37:41 +08:00 |
|
648540858
|
c56a842194
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-09-06 16:18:33 +08:00 |
|
648540858
|
212218c7c4
|
Merge pull request #1057 from lunasaw/dev-wvp-0906
fix set password
|
2023-09-06 10:32:24 +08:00 |
davidche
|
18aff4b546
|
修复 #1058
|
2023-09-06 10:30:20 +08:00 |
|
648540858
|
33d4107d0c
|
修复启动时如果上机平台不可连接的导致的持续报错
|
2023-09-06 10:21:42 +08:00 |
|
chenzhangyue
|
1d0c9c6a31
|
fix set password
|
2023-09-06 09:49:50 +08:00 |
|
648540858
|
fd0ff18a71
|
Merge pull request #1055 from lunasaw/dev-wvp-0905
fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set
|
2023-09-06 09:32:15 +08:00 |
|
chenzhangyue
|
7155680793
|
fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set
|
2023-09-05 17:35:46 +08:00 |
|
chenzhangyue
|
73f6f044a1
|
local dev
|
2023-09-01 17:53:48 +08:00 |