648540858
|
29f7a6b6eb
|
修复多wvp模式推流时信息存储错误
|
2024-01-10 18:55:14 +08:00 |
|
648540858
|
64be28ed77
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-10 16:17:53 +08:00 |
|
648540858
|
c25a99d60b
|
修复空指针异常
|
2024-01-10 16:17:29 +08:00 |
|
648540858
|
28e060fd6f
|
修复空指针异常
|
2024-01-10 14:42:30 +08:00 |
|
648540858
|
0c10c77a56
|
优化录像路径的设置
|
2024-01-10 11:14:49 +08:00 |
fine
|
db493e2625
|
修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致
|
2024-01-09 11:50:26 +08:00 |
|
fine
|
8874c90db2
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2024-01-09 11:45:30 +08:00 |
|
648540858
|
1af6324a09
|
优化jessibuca播放器
|
2024-01-08 17:30:48 +08:00 |
|
648540858
|
b15e559eae
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-08 16:18:28 +08:00 |
|
648540858
|
a74fb6ecd6
|
优化目录订阅处理，保证存储异常时不影响后续操作
|
2024-01-08 15:03:07 +08:00 |
|
648540858
|
f3acf33fbf
|
添加日志
|
2024-01-05 17:53:20 +08:00 |
|
fine
|
b6df13af24
|
修复zlm重连不在线
|
2024-01-05 14:14:19 +08:00 |
|
648540858
|
a2cac5ca12
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-04 18:34:46 +08:00 |
|
648540858
|
6120e6bd7b
|
添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送
|
2024-01-04 17:26:47 +08:00 |
|
648540858
|
64b6a35603
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-04 11:33:29 +08:00 |
|
648540858
|
d91583b833
|
修复从redis同步推流列表更新失败
|
2024-01-04 11:33:08 +08:00 |
|
648540858
|
e7e407eb57
|
增加版本号
|
2024-01-03 16:00:03 +08:00 |
|
648540858
|
9d61a93077
|
优化数据库sql文件组织方式
|
2024-01-03 15:50:47 +08:00 |
|
648540858
|
76e8480cb1
|
去除多余方法
|
2023-12-27 16:18:22 +08:00 |
|
648540858
|
b3eb319e05
|
合并主线
|
2023-12-26 15:39:04 +08:00 |
|
648540858
|
07b182da98
|
Merge branch 'wvp-28181-2.0' into feature/record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
|
2023-12-26 15:38:40 +08:00 |
|
648540858
|
f8d2b933b1
|
为每个接口添加调试接口需要的描述
|
2023-12-26 15:30:24 +08:00 |
|
648540858
|
7c07ae9421
|
修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口
|
2023-12-26 15:03:00 +08:00 |
|
648540858
|
33fba05a38
|
Merge pull request #1219 from xiaoQQya/develop
Feature: 新增通道编辑功能
|
2023-12-26 09:52:03 +08:00 |
xiaoQQya
|
3ab4ce0a83
|
perf: 分屏监控设备列表优先使用自定义通道名称
|
2023-12-26 08:50:41 +08:00 |
|
xiaoQQya
|
9ae520a58a
|
feat(channel): 新增通道支持自定义名称、位置及云台类型
|
2023-12-19 15:22:09 +08:00 |
|
xiaoQQya
|
ef58f29cfc
|
perf(catlog): 优化同步通道时通道名称的处理
通道名称为空时，默认使用通道编码作为通道名称，避免级联时因通道名称为空导致上级接收通道失败
|
2023-12-19 10:07:48 +08:00 |
|
648540858
|
41fdb9d13f
|
Merge branch 'wvp-28181-record' into feature/record
|
2023-12-18 15:41:39 +08:00 |
|
648540858
|
a380246e49
|
修复每次注册都会发送状态变化的BUG
|
2023-12-18 15:27:51 +08:00 |
|
648540858
|
964d55431f
|
修复推流无声音的问题
|
2023-12-18 14:43:04 +08:00 |
|
648540858
|
c0b79878f4
|
合并主线
|
2023-12-18 14:40:54 +08:00 |
|
648540858
|
67d1ff0d26
|
Merge branch 'wvp-28181-2.0' into feature/record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-12-18 14:23:48 +08:00 |
|
648540858
|
76d09bcadb
|
修复sql注入 #1112
|
2023-12-18 11:14:59 +08:00 |
|
648540858
|
18a9f86a0a
|
Merge pull request #1209 from DavidSche/fix-1208
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误
|
2023-12-18 09:59:06 +08:00 |
|
648540858
|
7430c98309
|
增加日志提示
|
2023-12-17 23:41:21 +08:00 |
|
648540858
|
d8011e9ee7
|
去除只有udp收流支持ssrc校验的判断
|
2023-12-17 23:33:18 +08:00 |
|
648540858
|
cb1f1417b6
|
兼容回复的invite 200OK消息中缺少ssrc(y字段)的情况
|
2023-12-15 22:44:41 +08:00 |
|
648540858
|
01ecb07a2f
|
Merge branch 'wvp-28181-record' into feature/record
|
2023-12-15 17:54:56 +08:00 |
|
648540858
|
0a245c4cfe
|
修复非鉴权接口的跨域失败问题
|
2023-12-15 17:54:34 +08:00 |
|
648540858
|
df3f5795e7
|
修复非鉴权接口的跨域失败问题
|
2023-12-15 17:45:47 +08:00 |
|
648540858
|
3a1fc63d7a
|
优化ssrc释放逻辑
|
2023-12-15 17:28:55 +08:00 |
|
648540858
|
2397344973
|
优化ssrc释放逻辑
|
2023-12-15 16:44:46 +08:00 |
|
648540858
|
04a1bfa329
|
优化事务释放逻辑
|
2023-12-15 16:25:05 +08:00 |
|
648540858
|
60dffa5813
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-12-14 09:30:21 +08:00 |
|
648540858
|
b699158e43
|
修复点播流地址修改
|
2023-12-13 14:43:42 +08:00 |
|
648540858
|
eac72fd06e
|
优化日志打印样式
|
2023-12-13 14:37:08 +08:00 |
|
648540858
|
94edd95824
|
Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0
修改输出的日志格式
|
2023-12-13 14:31:06 +08:00 |
davidche
|
572c8850dc
|
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误
|
2023-12-13 13:48:04 +08:00 |
|
648540858
|
b4b9ad2873
|
修复写入事务信息callid错误
|
2023-12-13 09:40:30 +08:00 |
xubinbin
|
42a2772d1a
|
bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
|
2023-12-12 17:09:04 +08:00 |