648540858
|
a2b1065fe9
|
修复redis推流设备推送bug
|
2024-03-27 16:51:02 +08:00 |
|
648540858
|
0f18d4cbe1
|
修复redis推流设备推送bug
|
2024-03-27 16:20:46 +08:00 |
|
648540858
|
e886aa4833
|
修复PTZType导致声音开关失效的问题
|
2024-03-27 11:15:35 +08:00 |
|
648540858
|
6de0c329ea
|
移除多余的节点启动事件分发
|
2024-03-26 23:38:49 +08:00 |
|
648540858
|
0c2180c07f
|
支持处理流没找到事件
|
2024-03-26 23:36:55 +08:00 |
|
648540858
|
f218d7bbd6
|
支持发送流没找到事件
|
2024-03-26 23:16:08 +08:00 |
|
648540858
|
1ce30e6656
|
临时提交
|
2024-03-26 17:49:56 +08:00 |
|
648540858
|
e2ebe9d6d8
|
优化流变化逻辑
|
2024-03-26 11:42:38 +08:00 |
|
648540858
|
cad5f97c2f
|
优化流变化处理位置
|
2024-03-26 10:28:08 +08:00 |
|
648540858
|
c6dfb63f8f
|
优化hook通知
|
2024-03-25 23:59:50 +08:00 |
|
648540858
|
2b0af3be14
|
支持hook
|
2024-03-25 17:59:09 +08:00 |
|
648540858
|
7ce4f44caa
|
支持设置abl配置中的hook信息
|
2024-03-25 00:12:32 +08:00 |
|
648540858
|
3e02e496f6
|
支持设置abl配置信息
|
2024-03-24 15:51:19 +08:00 |
|
648540858
|
999192fa8a
|
支持读取abl配置信息
|
2024-03-23 23:40:32 +08:00 |
|
648540858
|
c1ac16bf62
|
优化媒体节点服务的代码结构
|
2024-03-23 15:38:54 +08:00 |
|
648540858
|
23f0aba0ed
|
修复媒体节点端口初始化失败
|
2024-03-22 17:48:21 +08:00 |
|
648540858
|
63a35ffaaf
|
调整节点管理代码结构
|
2024-03-22 17:44:42 +08:00 |
|
648540858
|
150e7a3199
|
调整节点管理代码结构
|
2024-03-22 16:45:18 +08:00 |
|
648540858
|
08696a57d3
|
Merge branch 'master' into dev/abl支持
|
2024-03-22 14:28:24 +08:00 |
|
648540858
|
1aa347bd2b
|
zlm hook 优化
|
2024-03-22 14:28:00 +08:00 |
|
648540858
|
b90dc789b4
|
优化媒体节点服务的代码结构
|
2024-03-21 23:39:32 +08:00 |
|
648540858
|
4134c73745
|
优化Track的构建
|
2024-03-21 22:38:56 +08:00 |
|
648540858
|
913099291b
|
临时提交
|
2024-03-21 18:21:30 +08:00 |
|
648540858
|
f96250ef45
|
Merge branch 'master' into dev/abl支持
|
2024-03-21 16:59:14 +08:00 |
|
648540858
|
3291c4b2e6
|
修复多平台推流无人观看redis通知
|
2024-03-21 16:54:44 +08:00 |
|
648540858
|
912c83dfd3
|
添加日志
|
2024-03-21 11:16:31 +08:00 |
|
648540858
|
c7ca9703c1
|
优化媒体节点服务的代码结构
|
2024-03-20 23:50:30 +08:00 |
|
648540858
|
181bf76862
|
优化节点在线状态
|
2024-03-20 18:54:39 +08:00 |
|
648540858
|
8ae17764fd
|
临时提交
|
2024-03-20 11:07:08 +08:00 |
|
648540858
|
19e10d0d6a
|
临时提交
|
2024-03-20 10:33:43 +08:00 |
|
648540858
|
5e3073005d
|
优化zlm状态管理
|
2024-03-20 00:26:04 +08:00 |
|
648540858
|
4a0e9945b4
|
调整节点管理代码结构
|
2024-03-19 18:47:55 +08:00 |
|
648540858
|
ad32da0dfd
|
调整节点管理代码结构
|
2024-03-19 18:29:58 +08:00 |
|
648540858
|
1e0b73b939
|
调整节点管理代码结构
|
2024-03-19 17:52:11 +08:00 |
|
648540858
|
620a4803da
|
实现部分优化后的接口
|
2024-03-18 23:56:27 +08:00 |
|
648540858
|
1768565ce0
|
优化媒体节点服务的代码结构
|
2024-03-18 23:42:18 +08:00 |
|
648540858
|
97dc926b28
|
调整ptzType字段名称
|
2024-03-18 17:41:49 +08:00 |
|
648540858
|
bfafe45b26
|
Merge pull request #1371 from ancienter/develop
[bugfix]修复云端录像查询时间转换错误的问题
|
2024-03-18 15:39:32 +08:00 |
|
648540858
|
f4e41659d8
|
修复国标级联注册和心跳重复发送的问题
|
2024-03-18 10:36:15 +08:00 |
|
648540858
|
c6adfd24d9
|
修复redis开始推流的通知
|
2024-03-18 10:13:03 +08:00 |
|
648540858
|
267085e945
|
修复插入国标设备时字段错误
|
2024-03-17 22:21:01 +08:00 |
|
648540858
|
4677042b12
|
Merge remote-tracking branch 'origin/master'
|
2024-03-16 21:38:28 +08:00 |
|
648540858
|
00fb00a4c3
|
修复dev配置文件中的logback-spring配置
|
2024-03-16 21:37:44 +08:00 |
|
648540858
|
045f2334d0
|
修复级联查看国标录像
|
2024-03-15 15:15:20 +08:00 |
leesam
|
00bb8d914a
|
[bugfix]修复云端录像查询时间转换错误的问题
|
2024-03-15 09:42:25 +08:00 |
|
648540858
|
debfac58b0
|
时间解析兼容iso861带毫秒
|
2024-03-14 16:22:24 +08:00 |
|
648540858
|
d4f6ec39b7
|
优化CivilCode缓存
|
2024-03-14 14:54:20 +08:00 |
|
648540858
|
e1c8183adf
|
调整语音对讲超时任务位置
|
2024-03-14 11:03:52 +08:00 |
|
648540858
|
d1624e2d06
|
修复取消移动位置订阅失败的问题
|
2024-03-13 16:13:05 +08:00 |
|
648540858
|
f7e5fff446
|
Merge remote-tracking branch 'origin/master'
|
2024-03-13 15:40:47 +08:00 |
|
648540858
|
dc8869be49
|
优化收到redis推动的推流设备信息更新内容重复的问题
|
2024-03-13 15:40:30 +08:00 |
|
648540858
|
e1d476a54a
|
处理收到redis推动的推流设备信息内容重复的问题
|
2024-03-13 15:24:09 +08:00 |
|
648540858
|
cb5afce55e
|
优化语音对讲定时任务的删除
|
2024-03-12 23:55:00 +08:00 |
|
648540858
|
1fcdf5a8f3
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2024-03-08 09:30:48 +08:00 |
|
648540858
|
d8b24fc795
|
XmlUtil添加直接获取Double和Integer的方法
|
2024-03-07 14:49:46 +08:00 |
|
648540858
|
5bf87ca330
|
Merge pull request #1270 from hexq/playback
Playback
|
2024-03-05 10:41:22 +08:00 |
|
648540858
|
bd4598e676
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2024-03-04 14:33:15 +08:00 |
|
648540858
|
38980826f9
|
修复平台删除时未移除心跳超时重新注册任务的问题 #1329
|
2024-03-04 14:32:57 +08:00 |
|
648540858
|
5a6044ef4e
|
Merge pull request #1336 from wendy512/bugfix
bugfix：修复紫光华智录像查询返回日期为2024-02-21T11:10:36+08:00解析报错，兼容多种不同日期格式
|
2024-03-01 14:51:51 +08:00 |
|
648540858
|
a90098b90b
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2024-03-01 14:46:33 +08:00 |
|
648540858
|
e932a9b824
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-03-01 10:55:49 +08:00 |
wendy512
|
268869c6a1
|
bugfix：修复紫光华智录像查询返回StartTime、EndTime为2024-02-21T11:10:36+08:00，兼容多种不同日期格式
|
2024-02-29 21:10:56 +08:00 |
|
648540858
|
c581974027
|
使用GetMapping替换RequestMapping
|
2024-02-29 18:15:55 +08:00 |
|
648540858
|
bb94831177
|
修复访问assist配置https访问失败的问题
|
2024-02-29 16:20:46 +08:00 |
|
648540858
|
db6f722d20
|
优化国标级联语音喊话TCP主动模式
|
2024-02-27 18:02:12 +08:00 |
|
648540858
|
66210ec51a
|
支持国标级联语音喊话TCP主动模式
|
2024-02-27 17:41:14 +08:00 |
|
648540858
|
c8b0e66e0e
|
合并主线
|
2024-02-27 10:25:42 +08:00 |
|
648540858
|
509d9b3cbb
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
|
2024-02-27 10:22:13 +08:00 |
|
648540858
|
5f09692198
|
添加统一回调管理
|
2024-02-23 18:48:01 +08:00 |
|
648540858
|
f6c48588da
|
支持支持主码流子码流切换
|
2024-02-22 17:22:28 +08:00 |
|
648540858
|
18898e982f
|
支持读取warning header作为错误消息的内容 #1030
|
2024-02-20 15:08:06 +08:00 |
|
648540858
|
a9ab5c28e9
|
优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273
|
2024-02-20 11:12:42 +08:00 |
|
648540858
|
e5856a9f91
|
修复ack超时事件异常执行的bug
|
2024-02-07 21:18:36 +08:00 |
|
648540858
|
f2f70fce98
|
修复合并错误
|
2024-02-07 20:53:13 +08:00 |
|
648540858
|
562dbb0857
|
Merge remote-tracking branch 'origin/main-dev' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2024-02-07 20:37:23 +08:00 |
|
648540858
|
2e7c9a7341
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/media/zlm/AssistRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# src/main/resources/all-application.yml
# src/main/resources/application-dev.yml
|
2024-02-07 20:30:37 +08:00 |
|
648540858
|
b079039f81
|
修复国标级联上级主动结束时ssrc未释放的问题
|
2024-02-02 09:20:13 +08:00 |
|
648540858
|
bf0efc2739
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-31 18:50:15 +08:00 |
|
648540858
|
105ad25580
|
默认设备状态变化发送通知
|
2024-01-31 18:48:27 +08:00 |
|
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 |
|
648540858
|
68fbc8fef1
|
优化跨域配置，默认允许全部跨域
|
2024-01-31 17:23:47 +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
|
695f9b7f4d
|
修复来自其他wvp的推流时平台名称未赋值的问题
|
2024-01-29 19:31:07 +08:00 |
pedoc
|
3d68b56bb5
|
修复未配置sipdomain时出现异常
|
2024-01-29 18:05:17 +08:00 |
|
648540858
|
241d223b8a
|
添加日志
|
2024-01-25 17:46:38 +08:00 |
|
648540858
|
b3d21c7452
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-22 16:35:17 +08:00 |
|
648540858
|
a9264a8bc0
|
修复assist使用https时无法请求的bug
|
2024-01-22 16:34:58 +08:00 |
|
648540858
|
e8770eec36
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-22 16:02:28 +08:00 |
|
648540858
|
d68aebd409
|
指定service使用的数据源
|
2024-01-22 15:56:24 +08:00 |
|
648540858
|
5a3b1c04d6
|
补充日志
|
2024-01-22 12:09:04 +08:00 |
|
648540858
|
97a87542a6
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-22 10:37:13 +08:00 |
|
648540858
|
0e94aeaf5f
|
优化录像合并下载,支持不过滤zlm节点ID
|
2024-01-22 10:16:16 +08:00 |
|
648540858
|
07729fbe49
|
优化录像合并下载
|
2024-01-22 09:46:03 +08:00 |
|
648540858
|
9a89cf81b8
|
添加多数据源配置实例
|
2024-01-22 00:33:04 +08:00 |
|
648540858
|
79c8447298
|
支持使用多数据源
|
2024-01-22 00:29:09 +08:00 |
|
648540858
|
46af350868
|
优化多节点国标级联国标录像查询
|
2024-01-21 22:38:50 +08:00 |
|
648540858
|
31df0fb3ff
|
修复级联点播时tcp模式信令回复的错误
|
2024-01-21 16:56:13 +08:00 |
hexq
|
7055c53192
|
BUGFIX：回放时，优先从SDP中提取channelId，兼容从Subject无法提取到channelId的问题
|
2024-01-20 10:26:49 +08:00 |
|
hexq
|
dd4e0d0d9c
|
BUGFIX：向下级目录关联通道时，出现“未查询到目录xxx的信息"
|
2024-01-20 10:22:34 +08:00 |