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 |
|
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 |
|
648540858
|
3b7ba3eb46
|
Merge branch 'master' into dev/1078-newUI
# Conflicts:
# src/main/resources/application.yml
|
2025-05-10 08:59:45 +08:00 |
|
lin
|
e2678f39e3
|
临时提交
|
2025-04-25 18:04:51 +08:00 |
|
lin
|
3b4a6018cb
|
修复云端录像seek问题
|
2025-04-16 18:07:04 +08:00 |
|
lin
|
1a9307003a
|
Merge remote-tracking branch 'origin/dev/前端页面修改' into dev/前端页面修改
|
2025-04-15 09:03:24 +08:00 |
|
648540858
|
45b3d9322c
|
增加云端录像手动删除
|
2025-04-14 22:54:30 +08:00 |
|
lin
|
f2e3016a48
|
修复云端录像seek不准确的问题
|
2025-04-14 12:43:05 +08:00 |
|
648540858
|
c8822e2b86
|
优化云端录像播放逻辑
|
2025-04-13 20:14:48 +08:00 |
|
lin
|
eea367d6d7
|
增加录像seek和倍速播放接口
|
2025-04-12 21:24:02 +08:00 |
|
lin
|
e284c3857c
|
Merge branch 'master' into 重构/1078
|
2025-04-09 12:17:22 +08:00 |
|
huangxiao
|
629a4dbea3
|
refactor: 优化zlm hook 推流鉴权事件找不到mediaServer的错误处理
|
2025-03-28 13:51:48 +08:00 |
|
lin
|
20135726eb
|
Merge branch 'master' into 重构/1078
|
2025-03-24 15:19:07 +08:00 |
|
lin
|
a9cf5131e1
|
修复zlm普通版本接入异常
|
2025-03-21 11:30:05 +08:00 |
|
lin
|
06de25bb4d
|
修复转码时拉流代理无人观看无法移除的BUG， 修复根据请求IP返回流地址失败的BUG
|
2025-03-19 15:45:23 +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
|
0868219822
|
修复播放拉流代理时streamKey未写入的BUG
|
2025-03-14 15:49:29 +08:00 |
|
lin
|
90ab396652
|
拉流代理返回的流地址增加流来源信息
|
2025-03-12 16:51:45 +08:00 |
|
lin
|
90d2843255
|
播放按钮添加loading， 修复拉流代理播放后再次点播失败
|
2025-03-12 16:43:47 +08:00 |
|
lin
|
e473ab185d
|
优化播放地址携带流来源信息参数添加算法
|
2025-03-12 16:18:19 +08:00 |
|
lin
|
e5c3f82d54
|
播放地址携带流来源信息
|
2025-03-12 16:09:54 +08:00 |
|
648540858
|
26ee38aebe
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java
|
2024-12-31 10:33:12 +08:00 |
|
648540858
|
f078c6f7a0
|
[拉流代理] 修复 #1718
|
2024-12-31 10:31:03 +08:00 |
|
648540858
|
e05d988755
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
|
2024-12-27 10:57:42 +08:00 |
|
648540858
|
460f73555e
|
[推流设备] 修复推流中重启服务导致无法继续播放
|
2024-12-27 10:42:40 +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
|
8d6a978978
|
[redis下的多wvp] 优化服务间方法调用
|
2024-12-11 18:26:18 +08:00 |
|
648540858
|
70310f918e
|
修复新增zlm节点初始化端口错误
|
2024-12-11 14:04:55 +08:00 |
|
648540858
|
f528735119
|
Merge branch 'master' into 重构/1078
|
2024-12-05 11:05:44 +08:00 |
|
648540858
|
8a06562a88
|
[录制计划] 增加录制计划执行
|
2024-11-28 18:00:52 +08:00 |
|
648540858
|
f625fb6aed
|
修复大华对讲talk模式
|
2024-11-27 10:11:49 +08:00 |
|
648540858
|
0d32608fa9
|
修复空指针异常
|
2024-11-15 17:02:43 +08:00 |
|
648540858
|
2060a2117c
|
优化编码信息的展示
|
2024-11-14 17:05:12 +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
|
5c2b4f386b
|
优化播放页面的预置位控制
|
2024-11-08 17:40:05 +08:00 |
|
648540858
|
396961ea20
|
策略配置文件增加注释与使用Lombok
|
2024-10-30 15:19:17 +08:00 |
|
648540858
|
5304620861
|
重构报警SSE推送
|
2024-10-29 15:57:52 +08:00 |
|
648540858
|
059635c2cc
|
修复国标点播缓存启动未清理的BUG
|
2024-10-25 17:41:50 +08:00 |
|
648540858
|
bf3e181bdb
|
修复节点上线和下线时未清理redis流信息的BUG
|
2024-10-24 16:41:41 +08:00 |
|
648540858
|
0ddc374c34
|
修复多zlm节点上线时的空指针异常+单端口收流未设置到zlm的BUG
|
2024-10-24 15:55:38 +08:00 |
|
648540858
|
2cd21a26d4
|
修复国标级联点播未使用自动自定义SSRC的BUG
|
2024-10-24 10:04:38 +08:00 |
|
Klu5ure
|
22d6350778
|
修正拼写错误：重命名 ZLMMediaServerStatusManger 为 ZLMMediaServerStatusManager，node_manger.md 为 node_manager.md
|
2024-10-21 18:12:16 +08:00 |
|
648540858
|
f62b655602
|
合并主线
|
2024-10-19 19:59:14 +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
|
550b90b157
|
Merge branch 'master' into dev/master-通道结构重构
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
|
2024-09-18 09:10:12 +08:00 |
|
hx
|
f6eeb59371
|
修复端口初始化wssSslPort获取失败
修复字符集空指针异常导致心跳的错误
|
2024-09-14 15:16:47 +08:00 |
|