648540858
|
d41d6b34af
|
Merge branch 'refs/heads/2.7.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.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/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
|
2024-04-23 20:59:20 +08:00 |
|
648540858
|
66a681d679
|
优化notify消息中目录和移动位置的处理
|
2024-04-23 20:45:12 +08:00 |
|
648540858
|
901dee2bf4
|
修复转发国标notify-update时信息错误的问题
|
2024-04-23 10:12:00 +08:00 |
|
648540858
|
8cba63642f
|
优化notify消息处理
|
2024-04-22 20:29:36 +08:00 |
|
648540858
|
b57dbeac13
|
优化通道更新
|
2024-04-20 18:58:53 +08:00 |
|
648540858
|
1aa197510f
|
临时提交
|
2024-04-19 14:39:35 +08:00 |
|
648540858
|
87629b7fc7
|
临时提交
|
2024-04-19 10:32:28 +08:00 |
|
648540858
|
0d0b31f715
|
临时提交
|
2024-04-19 10:27:24 +08:00 |
|
648540858
|
0dab86f0b8
|
临时提交
|
2024-04-19 10:22:34 +08:00 |
|
648540858
|
94436de3e1
|
临时提交
|
2024-04-18 18:31:37 +08:00 |
|
648540858
|
73559cc6b3
|
临时提交
|
2024-04-18 18:19:27 +08:00 |
|
648540858
|
38ce529dd2
|
临时提交
|
2024-04-18 18:14:59 +08:00 |
|
648540858
|
678bb33562
|
临时提交
|
2024-04-18 18:07:47 +08:00 |
|
648540858
|
5d36c2a337
|
临时提交
|
2024-04-18 17:51:56 +08:00 |
|
648540858
|
9adf12ca6a
|
临时提交
|
2024-04-18 17:34:00 +08:00 |
|
648540858
|
3639d2224d
|
临时提交
|
2024-04-18 17:22:25 +08:00 |
|
648540858
|
f536123b11
|
修改toString方法
|
2024-04-18 17:05:03 +08:00 |
|
648540858
|
2a765a93eb
|
添加RedisRpcResponse的toString
|
2024-04-18 17:00:13 +08:00 |
|
648540858
|
6025eb29fd
|
添加注释
|
2024-04-18 16:30:21 +08:00 |
|
648540858
|
55a240bb45
|
临时提交
|
2024-04-18 15:52:34 +08:00 |
|
648540858
|
407a5edebf
|
优化多wvp国标级联推流时推流信息的清理
|
2024-04-17 23:31:48 +08:00 |
|
648540858
|
e85cef4345
|
优化多wvp国标级联推流时缓存的清理
|
2024-04-17 23:23:42 +08:00 |
|
648540858
|
313243195e
|
修复通道位置的展示
|
2024-04-17 17:56:36 +08:00 |
|
648540858
|
bf6e09d231
|
修复多wvp国标级联机制
|
2024-04-17 12:56:22 +08:00 |
|
648540858
|
f357bece62
|
优化回调设置方式
|
2024-04-16 22:22:00 +08:00 |
|
648540858
|
9c6765d44e
|
重构多wvp国标级联机制
|
2024-04-16 22:10:35 +08:00 |
|
648540858
|
b4168c02cb
|
优化多wvp国标级联推流
|
2024-04-16 00:10:38 +08:00 |
|
648540858
|
f9abfca003
|
临时提交
|
2024-04-15 21:33:22 +08:00 |
|
648540858
|
cdeb3acf7c
|
移除多余文件
|
2024-04-15 16:13:56 +08:00 |
|
648540858
|
bd0fafde81
|
修复目录订阅发送订阅未携带经纬度的问题
|
2024-04-15 15:51:10 +08:00 |
|
648540858
|
f34143df6d
|
修改totalReaderCount类型
|
2024-04-12 10:36:18 +08:00 |
|
648540858
|
da54cdf3b8
|
解决空指针异常
|
2024-04-12 09:00:39 +08:00 |
|
648540858
|
5c0183a422
|
修复无法下载较长时间时间录像的BUG
|
2024-04-11 22:25:57 +08:00 |
|
648540858
|
8750f0f3dd
|
去除多余代码
|
2024-04-11 16:58:56 +08:00 |
|
648540858
|
ab20f76885
|
去除多余代码
|
2024-04-11 16:58:03 +08:00 |
|
648540858
|
e222095636
|
修复流数据写入缓存
|
2024-04-11 16:55:34 +08:00 |
|
648540858
|
651d4a1b0e
|
优化代码调用
|
2024-04-11 14:28:42 +08:00 |
|
648540858
|
9978d30aa1
|
Merge branch '2.7.0'
|
2024-04-11 09:36:48 +08:00 |
|
648540858
|
b45d71ba6d
|
Merge pull request #1389 from ancienter/develop-add-api-key
[add]新增ApiKey管理功能
|
2024-04-10 22:56:14 +08:00 |
|
648540858
|
f458c9b793
|
优化代码调用
|
2024-04-10 22:38:12 +08:00 |
leesam
|
ce950dea4a
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 22:18:40 +08:00 |
|
leesam
|
53199b32f6
|
适配postgres数据库
|
2024-04-10 22:16:56 +08:00 |
|
648540858
|
6c0087db88
|
优化代码调用
|
2024-04-10 20:56:45 +08:00 |
|
leesam
|
16b7e4a7ef
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 20:49:44 +08:00 |
|
leesam
|
10e2180c72
|
[bugfix]支持context-path配置
|
2024-04-10 19:07:37 +08:00 |
|
648540858
|
9bb5ef6522
|
修复多个wvp执行推流转发失败的BUG
|
2024-04-10 18:22:42 +08:00 |
|
648540858
|
82ca3a778a
|
优化媒体节点redis数据格式
|
2024-04-09 22:52:06 +08:00 |
|
648540858
|
54b878d2e1
|
优化代码，升级版本号为2.7.1
|
2024-04-09 22:43:45 +08:00 |
|
648540858
|
cf8320e749
|
Merge pull request #1400 from Anyuei/master
处理可能会出现的空指针异常
|
2024-04-09 20:57:50 +08:00 |
|
648540858
|
a1861038e5
|
修复录像下载
|
2024-04-09 19:53:43 +08:00 |
|
648540858
|
7a59acc8e6
|
合并主线
|
2024-04-09 17:30:18 +08:00 |
|
648540858
|
de5d025cee
|
修复单端口收流时音频禁用失败的问题
|
2024-04-09 16:10:02 +08:00 |
|
648540858
|
ab318fcf70
|
修复点播错误时关闭rtpserver
|
2024-04-09 14:53:11 +08:00 |
|
648540858
|
6dd870e74c
|
修复点播端口为空
|
2024-04-09 10:59:59 +08:00 |
|
648540858
|
bbf19c7909
|
合并主线
|
2024-04-09 10:40:16 +08:00 |
|
648540858
|
b1b6fae22c
|
Merge branch 'master' into dev/zlm
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
|
2024-04-09 10:35:11 +08:00 |
|
648540858
|
0b2f635176
|
移除非主线内容
|
2024-04-09 10:30:00 +08:00 |
ancienter
|
25ff2fc4ef
|
Merge branch '648540858:master' into develop-add-api-key
|
2024-04-09 09:52:23 +08:00 |
|
648540858
|
a890b62fa1
|
Merge branch '2.7.0'
|
2024-04-08 18:13:33 +08:00 |
|
648540858
|
48351c875e
|
国标级联支持制定200OK中sdp的IP
|
2024-04-08 18:13:15 +08:00 |
|
648540858
|
7d0aebd311
|
Merge branch '2.7.0'
|
2024-04-07 20:26:01 +08:00 |
|
648540858
|
aeb75c0df1
|
优化推流结束后发送BYE
|
2024-04-07 20:25:44 +08:00 |
|
648540858
|
7d53009987
|
优化推流通知
|
2024-04-07 20:06:48 +08:00 |
|
648540858
|
a1c02605c1
|
abl-实现closeRtpServer
|
2024-04-02 14:41:02 +08:00 |
|
648540858
|
86a35f3612
|
合并开源主线
|
2024-04-02 11:25:19 +08:00 |
|
648540858
|
1bb813758a
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2024-04-02 11:20:51 +08:00 |
|
648540858
|
67688d4a4b
|
优化停止国标收流
|
2024-04-02 11:20:19 +08:00 |
|
648540858
|
969ff86ebe
|
放行abl hook 接口
|
2024-04-02 09:53:47 +08:00 |
|
648540858
|
8b90fade9e
|
支持使用abl接收国标流
|
2024-04-02 00:05:09 +08:00 |
|
648540858
|
b78769f997
|
临时提交
|
2024-04-01 18:35:26 +08:00 |
|
648540858
|
33b75be71a
|
支持abl hook
|
2024-04-01 18:21:38 +08:00 |
|
648540858
|
4d6f881460
|
修复空指针异常
|
2024-04-01 16:20:30 +08:00 |
|
648540858
|
722f1d0ee7
|
国标级联-修复拉流代理播放
|
2024-04-01 16:17:01 +08:00 |
|
648540858
|
426ea72d7f
|
修复拉流代理播放
|
2024-04-01 15:46:36 +08:00 |
|
648540858
|
73733ab13f
|
修复推流播放
|
2024-04-01 15:40:21 +08:00 |
|
648540858
|
fd2ef6effe
|
修复国标点播
|
2024-04-01 15:29:49 +08:00 |
|
648540858
|
ecd1d2a414
|
临时提交
|
2024-04-01 15:22:45 +08:00 |
|
648540858
|
2738750c3e
|
移除失效的服务
|
2024-04-01 09:11:56 +08:00 |
|
648540858
|
5973dcd975
|
修复点播与录像回放
|
2024-03-31 00:34:44 +08:00 |
|
648540858
|
4548695a0b
|
hook优化
|
2024-03-31 00:28:45 +08:00 |
|
648540858
|
0447b83c3a
|
临时提交
|
2024-03-29 23:41:00 +08:00 |
|
648540858
|
0324855190
|
Merge branch 'master' into dev/abl支持
|
2024-03-29 22:55:09 +08:00 |
|
648540858
|
486daf4dfe
|
调整看守位控制接口
|
2024-03-29 19:18:34 +08:00 |
pei
|
728e60ce84
|
处理可能会出现的空指针异常
|
2024-03-29 11:55:44 +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
|
d6df7c8355
|
Merge branch 'master' into dev/abl支持
|
2024-03-28 18:13:36 +08:00 |
|
648540858
|
cf3d98102a
|
Merge branch 'master' into 2.7.0
|
2024-03-28 18:08:57 +08:00 |
|
648540858
|
1de344674a
|
使用冒号分隔redis的key
|
2024-03-28 18:08:33 +08:00 |
|
648540858
|
f3ac974036
|
临时提交
|
2024-03-28 17:12:31 +08:00 |
|
648540858
|
dae67453c4
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
|
2024-03-28 16:50:44 +08:00 |
|
648540858
|
53d4d10e1c
|
Merge branch 'master' into 2.7.0
|
2024-03-28 16:31:08 +08:00 |
|
648540858
|
f1e902af7f
|
支持级联移动位置订阅通知转发
|
2024-03-28 16:28:41 +08:00 |
|
648540858
|
39103e53c7
|
修复点播请求释放的问题
|
2024-03-27 18:23:22 +08:00 |
|
648540858
|
7dda1f6a2e
|
Merge branch 'master' into dev/abl支持
|
2024-03-27 17:18:35 +08:00 |
|
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 |
|
leesam
|
24b4f02a70
|
[bugfix]读取jwk的Bug修复
|
2024-03-20 11:05:57 +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 |
|
leesam
|
76208975bf
|
[add]支持其他平台通过ApiKey调用系统相关接口
|
2024-03-19 16:53:01 +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 |