648540858
|
fc74ce9de4
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/resources/application-dev.yml
|
2024-01-31 17:25:32 +08:00 |
|
PengOu
|
1245ae7874
|
Fix 推流列表-> 添加通道 报错： 错误: 字段 "gbStreamId" 不存在 ,改为：gb_stream_id 自测试通过
|
2024-01-30 10:59:25 +08:00 |
|
648540858
|
ab34cb37f3
|
修复空指针异常
|
2024-01-29 21:20:03 +08:00 |
|
648540858
|
654599b659
|
修复通道重命名后无法被检索到
|
2024-01-19 16:07:30 +08:00 |
|
648540858
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
0371f5a96e
|
修复国标级联全部添加与全部删除
|
2024-01-15 15:31:20 +08:00 |
|
648540858
|
81a32fdb47
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-10 19:12:06 +08:00 |
|
648540858
|
29f7a6b6eb
|
修复多wvp模式推流时信息存储错误
|
2024-01-10 18:55:14 +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
|
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 |
|
xiaoQQya
|
3ab4ce0a83
|
perf: 分屏监控设备列表优先使用自定义通道名称
|
2023-12-26 08:50:41 +08:00 |
|
xiaoQQya
|
9ae520a58a
|
feat(channel): 新增通道支持自定义名称、位置及云台类型
|
2023-12-19 15:22:09 +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
|
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
|
92e5ed2e30
|
优化前端云端录像的播放
|
2023-12-06 16:10:32 +08:00 |
|
648540858
|
ad36354ef4
|
优化国标录像服务端，使用zlm新接口实现功能
|
2023-12-05 11:29:05 +08:00 |
|
648540858
|
67e4060053
|
添加推流信息专属redis数据
|
2023-11-30 18:09:43 +08:00 |
|
648540858
|
ffc8a530f3
|
修复定时录像删除
|
2023-11-24 10:47:33 +08:00 |
|
648540858
|
c98ef23b98
|
修复定时删除过期录像文件时，收藏文件被删除的问题
|
2023-11-21 14:30:33 +08:00 |
|
648540858
|
5d3f307b44
|
将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用
|
2023-11-01 14:07:32 +08:00 |
|
648540858
|
75fccfaf17
|
使用zlm原生接口删除录像文件
|
2023-11-01 10:45:36 +08:00 |
|
648540858
|
79f3ca9791
|
优化收藏功能
|
2023-10-25 14:45:45 +08:00 |
|
648540858
|
daac0010b1
|
优化云端录像定时清理
|
2023-10-19 17:52:19 +08:00 |
|
648540858
|
92a25393f3
|
基于新的云端录像实现页面功能
|
2023-10-17 17:55:40 +08:00 |
|
648540858
|
5a75381a00
|
基于新的云端录像结构实现国标录像
|
2023-10-17 15:34:01 +08:00 |
|
648540858
|
4d62f77025
|
Merge branch 'wvp-28181-2.0' into wvp-28181-record
|
2023-10-13 15:45:23 +08:00 |
|
648540858
|
12c4128e81
|
修复目录更新时已删除数据的整理功能
|
2023-10-13 15:44:49 +08:00 |
|
648540858
|
e4d37864d1
|
开始重构云端录像继续
|
2023-10-13 15:26:51 +08:00 |
|
648540858
|
78f628dd6f
|
修复同步目录时批量提交的错误
|
2023-10-12 17:01:25 +08:00 |
|
648540858
|
7d6aaf3bb0
|
修复国标接连选择通道相关的问题
|
2023-10-12 16:36:07 +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
|
b9a33f03d6
|
国标级联支持添加通道后主动推动到上级
|
2023-09-22 17:46:31 +08:00 |
|
648540858
|
e073b60cb1
|
Merge pull request #1071 from lunasaw/dev-wvp-0911
generate @param
|
2023-09-15 14:29:01 +08:00 |
|
648540858
|
2d423d9668
|
Merge branch 'xinchuang' into wvp-28181-2.0
|
2023-09-15 09:35:14 +08:00 |
|
chenzhangyue
|
54038486f4
|
generate @param
|
2023-09-12 20:23:14 +08:00 |
|
648540858
|
d05bce8f7f
|
修复对接金仓数据库中的问题
|
2023-09-12 15:32:17 +08:00 |
|
648540858
|
91e49745e4
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:55:50 +08:00 |
|
chenzhangyue
|
dd2ae65786
|
修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted
|
2023-08-10 20:00:43 +08:00 |
|
648540858
|
9cd63f0105
|
修复国标级联时添加目录不同平台无法使用同一个目录的问题
|
2023-07-19 15:33:21 +08:00 |
|
648540858
|
43ef195543
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-03 16:54:09 +08:00 |
|
648540858
|
b64f320805
|
优化发流逻辑
|
2023-07-01 18:10:33 +08:00 |
|
648540858
|
0592fd676f
|
修复使用推流状态作为推流通道状态为false仍然发送通知
|
2023-06-29 11:22:32 +08:00 |
|
648540858
|
f62bf7b2c6
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
# 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/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
|
2023-06-29 09:52:05 +08:00 |
|