lin
|
667a85c2a1
|
重构SSRC获取逻辑，支持根据MediaServer动态获取SSRC
|
2026-05-21 14:07:20 +08:00 |
|
lin
|
324f75ce76
|
增加多端口模式支持随机SSRC配置
|
2026-05-21 12:50:35 +08:00 |
|
panlinlin
|
ead059fd01
|
重构SSRC管理逻辑
|
2026-05-21 00:05:48 +08:00 |
|
lin
|
9909aa9655
|
优化移动位置相关逻辑
|
2026-04-18 23:31:47 +08:00 |
|
lin
|
3e162ea358
|
优化错误处理，回滚播放器版本，重构RTP服务器接口以区分不同的接口功能，优化参数数量
|
2026-04-14 18:11:14 +08:00 |
|
648540858
|
2e149dc2a2
|
Merge pull request #2110 from q792602257/fix/ssrc_recycle
修复ssrc回收逻辑
|
2026-04-13 10:58:24 +08:00 |
|
Jerry Yan
|
6273c89b9d
|
修复SSRC无法正确回收的逻辑
|
2026-04-07 17:19:11 +08:00 |
|
lin
|
2d1608ca7a
|
优化报警信息构建和数据库批量操作逻辑
|
2026-04-04 00:12:52 +08:00 |
|
lin
|
e51d000588
|
移除默认私钥文件，异步处理报警消息
|
2026-04-03 17:50:06 +08:00 |
|
lin
|
99d19d0623
|
修改报警信息解析规则
|
2026-04-02 18:03:34 +08:00 |
|
lin
|
c2835db8d4
|
移除旧的报警信息表，增加报警管理页面
|
2026-04-02 16:33:50 +08:00 |
|
lin
|
c76414f156
|
修复GPS消息时间设置
|
2026-03-02 09:42:19 +08:00 |
|
648540858
|
803c47a430
|
优化RTP服务器相关代码，统一使用MediaApp枚举，简化参数传递，调整配置以提高兼容性
|
2026-02-20 22:33:26 +08:00 |
|
lin
|
0ab50eb1c0
|
临时提交
|
2025-11-05 17:07:25 +08:00 |
|
lin
|
fb9ff67701
|
支持ABL录像回放
|
2025-09-17 18:19:33 +08:00 |
|
lin
|
6f577268ee
|
适配新版本zlm限流配置
|
2025-08-15 09:50:45 +08:00 |
|
lin
|
1bfb51c90e
|
Merge branch 'dev/abl支持' into 重构/1078
# Conflicts:
# src/main/resources/application.yml
|
2025-07-03 15:29:13 +08:00 |
|
lin
|
bab5534134
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/resources/application.yml
|
2025-07-03 14:58:24 +08:00 |
|
lin
|
1420fcfcd0
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
# src/main/resources/application.yml
|
2025-05-29 17:10:32 +08:00 |
|
648540858
|
a40446e42b
|
临时提交
|
2025-05-27 23:19:10 +08:00 |
|
648540858
|
3b7ba3eb46
|
Merge branch 'master' into dev/1078-newUI
# Conflicts:
# src/main/resources/application.yml
|
2025-05-10 08:59:45 +08:00 |
|
lin
|
f2e3016a48
|
修复云端录像seek不准确的问题
|
2025-04-14 12:43:05 +08:00 |
|
lin
|
20135726eb
|
Merge branch 'master' into 重构/1078
|
2025-03-24 15:19:07 +08:00 |
|
lin
|
ec74488b4a
|
修复国标级联注册失败
|
2025-03-20 09:21:01 +08:00 |
|
lin
|
0329c8f5d1
|
Merge remote-tracking branch 'origin/master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# 数据库/2.7.3/初始化-mysql-2.7.3.sql
# 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
|
2025-03-18 15:30:35 +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
|
08a75d38a8
|
[RPC 云端录像] 增加云端录像播放
|
2024-12-31 14:54:11 +08:00 |
|
648540858
|
51f126e571
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# 数据库/2.7.3/初始化-mysql-2.7.3.sql
# 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
|
2024-12-19 23:19:09 +08:00 |
|
648540858
|
cc56ed3355
|
临时提交
|
2024-11-27 22:44:22 +08:00 |
|
648540858
|
0cacdb5928
|
增加数据库结构以及接口
|
2024-11-20 22:33:21 +08:00 |
|
648540858
|
d2f9102ff0
|
增加录制计划类
|
2024-11-18 18:00:21 +08:00 |
|
648540858
|
e5fd66ef96
|
Merge branch 'master' into 重构/1078
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2024-11-10 15:29:53 +08:00 |
|
648540858
|
f106675dc6
|
支持历史日志的查看，过滤以及下载
|
2024-11-03 14:37:30 +08:00 |
|
648540858
|
a6993b35fd
|
实现日志文件检索和日志文件下载接口
|
2024-11-03 00:32:39 +08:00 |
|
648540858
|
277f2db137
|
Merge branch 'master' into 重构/1078
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
# src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
# src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
# src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
# src/main/resources/application.yml
# web_src/src/layout/UiHeader.vue
# web_src/src/router/index.js
|
2024-10-18 13:55:23 +08:00 |
|
648540858
|
59a52705cf
|
临时提交
|
2024-09-25 14:32:09 +08:00 |
|
648540858
|
80912d8a2c
|
临时提交
|
2024-09-14 17:50:05 +08:00 |
|
648540858
|
7cc4c9d14a
|
临时提交
|
2024-09-09 17:56:46 +08:00 |
|
648540858
|
da441a67f8
|
临时提交
|
2024-09-06 17:56:24 +08:00 |
|
648540858
|
568abbcd9d
|
临时提交
|
2024-09-04 23:06:27 +08:00 |
|
648540858
|
ad5b66eb71
|
临时提交
|
2024-09-04 18:01:54 +08:00 |
|
648540858
|
fa47f619ba
|
临时提交
|
2024-09-03 18:00:35 +08:00 |
|
648540858
|
6619c5c53d
|
临时提交
|
2024-07-11 18:25:16 +08:00 |
|
648540858
|
37b79633f0
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-28 18:40:44 +08:00 |
|
648540858
|
98c62b93f7
|
支持abl录像下载中
|
2024-05-28 17:39:14 +08:00 |
|
648540858
|
aeeb61d141
|
合并271分支
|
2024-05-23 17:47:43 +08:00 |
|
648540858
|
2c89fae49a
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
|
2024-05-23 17:32:15 +08:00 |
|
648540858
|
2daa59d78c
|
支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题
|
2024-05-23 17:10:45 +08:00 |
|
648540858
|
db4ba4035f
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-12 06:53:53 +08:00 |
|