lin
|
75b1e8deb2
|
Merge branch '2.7.3'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
|
2025-05-23 18:18:32 +08:00 |
|
lin
|
601d2b5d2b
|
修复集群推流BUG
|
2025-05-23 18:06:54 +08:00 |
|
648540858
|
d7ba1cab30
|
强化通道同步异常处理
|
2025-05-10 23:22:59 +08:00 |
|
648540858
|
33abdb1db6
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
# web_src/src/components/DeviceList.vue
|
2025-03-10 21:36:52 +08:00 |
|
lin
|
60d2ed10ec
|
[SIP事务] 修复无法根据流信息移除的事务
|
2025-03-06 16:03:28 +08:00 |
|
lin
|
676e2d7ea9
|
message消息适配新的回调模式
|
2025-02-18 17:04:13 +08:00 |
|
lin
|
b6c3f42a1f
|
Merge branch 'refs/heads/master' into dev/数据库统合2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
# src/main/resources/配置详情.yml
|
2025-02-11 19:30:20 +08:00 |
|
lin
|
ea12e3465f
|
修复语音对讲后停止点播失败的BUG
|
2025-02-11 16:06:18 +08:00 |
|
648540858
|
3e78af64de
|
增加RPC录像列表查询
|
2024-12-13 15:02:06 +08:00 |
|
648540858
|
24c3c45565
|
[录制计划] 修复关联通道
|
2024-11-27 17:59:54 +08:00 |
|
648540858
|
e9a53b766e
|
调整目录查询的结果展示逻辑
|
2024-11-27 11:04:26 +08:00 |
|
648540858
|
4e165fe243
|
优化目录查询的WebUI逻辑
|
2024-11-26 11:20:12 +08:00 |
|
648540858
|
d720275ada
|
优化页面云台逻辑,重新设计预置点/巡航组/自动扫描/雨刷/辅助开关的页面,支持光圈放大缩小,支持焦距放大缩小
|
2024-11-13 17:12:57 +08:00 |
|
648540858
|
dd6beba843
|
优化Catalog接收,提升大量设备同时接入性能
|
2024-10-30 14:21:32 +08:00 |
|
648540858
|
5304620861
|
重构报警SSE推送
|
2024-10-29 15:57:52 +08:00 |
|
648540858
|
16b1bf6819
|
提升Catalog查询回复处理速度
|
2024-10-26 23:28:41 +08:00 |
|
648540858
|
fee8d2f8cd
|
优化Catalog查询内存占用高的问题
|
2024-10-26 23:15:18 +08:00 |
|
648540858
|
6fc8db8bd0
|
优化INVITE事务REDIS缓存存取
|
2024-10-25 18:03:30 +08:00 |
|
648540858
|
2cd21a26d4
|
修复国标级联点播未使用自动自定义SSRC的BUG
|
2024-10-24 10:04:38 +08:00 |
|
648540858
|
d2fc2df77b
|
优化通道刷新的时接收下级消息的效率
|
2024-10-22 17:41:42 +08:00 |
|
648540858
|
3b2a28fd00
|
移除旧的数据库操作类
|
2024-09-24 15:59:47 +08:00 |
|
648540858
|
e078360928
|
修复语音对讲
|
2024-09-11 16:59:52 +08:00 |
|
648540858
|
da441a67f8
|
临时提交
|
2024-09-06 17:56:24 +08:00 |
|
648540858
|
ad5b66eb71
|
临时提交
|
2024-09-04 18:01:54 +08:00 |
|
648540858
|
fa47f619ba
|
临时提交
|
2024-09-03 18:00:35 +08:00 |
|
648540858
|
7f8a15f017
|
优化收到目录时的分组信息处理
|
2024-08-09 11:08:40 +08:00 |
|
panlinlin
|
a1671c3c3e
|
临时提交
|
2024-08-08 23:44:03 +08:00 |
|
648540858
|
6bd0cdd37b
|
临时提交
|
2024-07-23 18:00:47 +08:00 |
|
panlinlin
|
0853d7e842
|
临时提交
|
2024-07-11 23:52:34 +08:00 |
|
648540858
|
046e7802f3
|
临时提交
|
2024-07-09 17:55:51 +08:00 |
|
648540858
|
b98cfd1fed
|
使用Slf4j注解打印日志
|
2024-07-03 17:24:35 +08:00 |
|
648540858
|
799932f614
|
优化日志以及属性设置代码
|
2024-07-03 16:14:18 +08:00 |
|
648540858
|
4548695a0b
|
hook优化
|
2024-03-31 00:28:45 +08:00 |
|
648540858
|
0447b83c3a
|
临时提交
|
2024-03-29 23:41:00 +08:00 |
|
648540858
|
d6df7c8355
|
Merge branch 'master' into dev/abl支持
|
2024-03-28 18:13:36 +08:00 |
|
648540858
|
1de344674a
|
使用冒号分隔redis的key
|
2024-03-28 18:08:33 +08:00 |
|
648540858
|
e2ebe9d6d8
|
优化流变化逻辑
|
2024-03-26 11:42:38 +08:00 |
|
648540858
|
cb5afce55e
|
优化语音对讲定时任务的删除
|
2024-03-12 23:55:00 +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
|
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 |
|
pedoc
|
3d68b56bb5
|
修复未配置sipdomain时出现异常
|
2024-01-29 18:05:17 +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
|
04a1bfa329
|
优化事务释放逻辑
|
2023-12-15 16:25:05 +08:00 |
|
648540858
|
5a75381a00
|
基于新的云端录像结构实现国标录像
|
2023-10-17 15:34:01 +08:00 |
|
648540858
|
4df90d9ba4
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-09-20 09:17:28 +08:00 |
|
648540858
|
2d11f1b3de
|
修复ssrc缓存初始化判断错误，导致初始化失败
|
2023-09-15 14:25:08 +08:00 |
|
648540858
|
88350873ee
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# 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/info/InfoRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
|
2023-09-11 11:21:50 +08:00 |
|
648540858
|
91e49745e4
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:55:50 +08:00 |
|
648540858
|
5a7a7a12bd
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# src/main/resources/all-application.yml
# web_src/config/index.js
# web_src/src/components/dialog/devicePlayer.vue
|
2023-06-27 16:46:26 +08:00 |
|