Commit Graph

703 Commits

Author SHA1 Message Date
lin
ae44feef5b 修复非默认媒体节点状态异常 2026-01-04 15:20:55 +08:00
lin
8edd72fc23 为目录同步增加首个消息等待时长,默认两分钟,兼容下级数据量大,需要长时间后才能返回的情况,修复zlm上线未修改配置的BUG 2025-12-13 20:34:41 +08:00
lin
e996e2c77e 修复截图传参错误 #2038 2025-11-30 16:17:26 +08:00
lin
8674cc6213 去除媒体节点接入时过多的端口配置,端口使用媒体服务返回的端口,不再支持docker内网不一致的情况 2025-11-30 00:11:08 +08:00
lin
51a7ae056e 修复翻页未重置页码的问题 2025-11-18 12:16:20 +08:00
lin
c6a7e07a14 修复通用通道媒体信息获取 2025-11-17 16:14:31 +08:00
lin
469804b8d3 修改位置分发逻辑 2025-11-17 16:04:47 +08:00
lin
826b251544 修复上报的坐标未按照坐标系转换的BUG 2025-11-05 11:34:59 +08:00
lin
6ced304143 修复相关BUG 2025-11-04 11:39:37 +08:00
lin
08206ca824 优化地图信息窗口逻辑,修复拉流代理播放 2025-10-27 19:02:57 +08:00
lin
d117a0d83a Merge remote-tracking branch 'origin/dev/springBoot3' into dev/springBoot3 2025-10-26 20:51:28 +08:00
lin
96dc55352b 隐藏不需要再文档中展示的接口 2025-10-26 20:51:15 +08:00
lin
a02ac63be4 Merge branch 'master' into dev/springBoot3 2025-10-24 17:13:57 +08:00
lin
24c7bfb756 临时提交 2025-10-22 10:55:15 +08:00
lin
dd0a760d8a 临时提交 2025-10-16 18:07:36 +08:00
Kairlec
5bafc3e389 fix: AblUrls.java file removed 2025-10-10 10:57:20 +08:00
Kairlec
99fd07d58d fix: remove conflicting files AblUrls.java on Windows 2025-10-10 10:42:59 +08:00
lin
842647674a 升级spring boot版本。默认jdk版本升级至21 2025-09-24 10:24:42 +08:00
lin
1156880194 Merge branch 'master' into dev/springBoot3
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/MediaController.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java
2025-09-24 08:38:29 +08:00
lin
3a594f7bee 优化abl云端录像播放效果 2025-09-22 14:31:04 +08:00
lin
ff0d54968d zlm适配新的云端录像播放界面 2025-09-19 22:55:44 +08:00
lin
af3a283b3d 适配abl新的端口命名 2025-09-19 20:48:41 +08:00
lin
fd306d8ede 云端录像回放使用单文件播放 2025-09-19 18:02:53 +08:00
lin
a064f27bf8 支持ABL风格地址 2025-09-18 18:53:12 +08:00
lin
fb9ff67701 支持ABL录像回放 2025-09-17 18:19:33 +08:00
lin
403e7648f9 优化ABL结果封装完成 2025-09-16 17:57:59 +08:00
lin
c1672728d3 优化zlm结果封装完成 2025-09-16 10:52:58 +08:00
lin
576feec514 临时提交 2025-09-15 18:01:00 +08:00
lin
5c83bf2a41 临时提交 2025-09-15 17:59:18 +08:00
lin
18be8aff6c abl 支持拉流代理 2025-09-08 16:09:01 +08:00
lin
6f577268ee 适配新版本zlm限流配置 2025-08-15 09:50:45 +08:00
lin
1da487f02a [1078] 优化鉴权码位置,支持1078国标级联 2025-08-06 15:17:44 +08:00
lin
4c97022c78 [1078] 支持语音对讲 中心广播模式 2025-07-28 17:50:03 +08:00
lin
c0ab010475 [1078] 增加音视频属性查询 2025-07-22 20:51:03 +08:00
lin
44ed06bcbe [1078] 支持无人观看自动停流 2025-07-15 18:11:23 +08:00
lin
b7a2b6816b [1078] 完善录像下载 2025-07-10 18:48:25 +08:00
lin
1655e5903b [1078] 完善录像回放 2025-07-09 16:44:54 +08:00
lin
3c6b715ce1 [1078] 临时提交 2025-07-09 16:16:04 +08:00
lin
48eff320fd [1078] 适配abl的播放1078 2025-07-09 12:32:31 +08:00
lin
a424f270e8 [1078] 兼容abl流媒体 2025-07-03 17:30:59 +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
5bcdf5dfb6 [abl] 合并主线 2025-07-03 15:28:47 +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
465e03d15d Merge branch 'master' into 重构/1078
# Conflicts:
#	web/src/router/index.js
#	web/src/views/common/channelPlayer/chooseChannelForJt.vue
#	web/src/views/common/channelPlayer/jtDeviceEdit.vue
#	web/src/views/common/channelPlayer/jtDevicePlayer.vue
#	web_src/src/layout/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js
2025-07-03 09:41:55 +08:00
lin
f8e5e8f057 优化拉流代理播放机制 2025-07-01 17:07:10 +08:00
lin
9e8fbea73b 支持zlm pro截图方式 2025-06-30 17:16:25 +08:00
Jerry Yan
14c85838f4 springboot3 2025-06-11 10:08:03 +08:00
lin
60e9fb3daa 修复推流列表和拉流代理的云端录像跳转错误 2025-06-05 09:40:43 +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
lin
9da6e874fb 修复时间戳发送错误导致seek失败 2025-05-26 09:54:33 +08:00