648540858
|
0447b83c3a
|
临时提交
|
2024-03-29 23:41:00 +08:00 |
|
648540858
|
7a3b9c6f69
|
调整hook订阅通知的位置
|
2024-03-28 19:10:53 +08:00 |
|
648540858
|
cc793d16f5
|
调整hook订阅通知的位置
|
2024-03-28 18:35:28 +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
|
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 |
|
648540858
|
bb94831177
|
修复访问assist配置https访问失败的问题
|
2024-02-29 16:20:46 +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
|
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
|
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
|
55b15f8ba6
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-19 17:45:11 +08:00 |
|
648540858
|
cf8a1261b5
|
支持合并录像使用https
|
2024-01-19 17:44:31 +08:00 |
|
648540858
|
6eed486ff1
|
合并主线
|
2024-01-16 14:18:17 +08:00 |