lin
|
d825b986dd
|
推流列表和拉流代理支持根据来源ip返回流地址
|
2025-05-23 09:20:22 +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
|
e080534b15
|
[国标级联] 修复点播未开始的拉流代理通道时推流失败的BUG
|
2025-03-05 16:04:05 +08:00 |
|
lin
|
4a41de6039
|
修复国标级联播放拉流代理空指针异常
|
2025-02-19 14:09:51 +08:00 |
|
lin
|
3b714f8e2c
|
修复国标级联播放拉流代理
|
2025-02-19 11:26: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
|
3fe131eed3
|
修复录制计划以来全局录像配置， 目前去除依赖，目前录制计划开启录像
|
2025-02-11 11:08:52 +08:00 |
|
648540858
|
3bae4ce63e
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
|
2025-01-17 10:53:08 +08:00 |
|
Li Keqing
|
e370cf880d
|
修复网页观看问题
|
2025-01-03 21:40:35 +08:00 |
|
Li Keqing
|
469717523b
|
修复当拉流代理上线很慢时，收到来自上级的 ACK 早于流注册导致推流失败的问题
|
2025-01-03 19:32:49 +08:00 |
|
648540858
|
c629685cd1
|
[RPC 拉流代理] 修复停止是误报信息
|
2024-12-31 11:39:09 +08:00 |
|
648540858
|
5bde5ff5f2
|
临时提交
|
2024-12-31 11:27:56 +08:00 |
|
648540858
|
a324e4c95a
|
[RPC] 添加拉流代理支持
|
2024-12-31 11:19:01 +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
|
8f7016878d
|
[拉流代理] 增加单独的字段管理每次拉流需要的节点
|
2024-12-31 10:17:49 +08:00 |
|
648540858
|
7e89b5f97f
|
临时提交
|
2024-12-31 09:31:58 +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
|
28961f51f7
|
完善数据库结构调用
|
2024-12-23 23:49:54 +08:00 |
|
648540858
|
59e3175f00
|
调整代码对通道类型的调用
|
2024-12-23 18:37:24 +08:00 |
|
648540858
|
19453f7ca9
|
临时提交
|
2024-12-23 07:20:48 +08:00 |
|
648540858
|
825daad355
|
调整数据库结构
|
2024-12-22 08:35:36 +08:00 |
|
648540858
|
5777a8e93c
|
去除动态数据库切换
|
2024-12-06 17:11:22 +08:00 |
|
648540858
|
4e165fe243
|
优化目录查询的WebUI逻辑
|
2024-11-26 11:20:12 +08:00 |
|
648540858
|
8a42f15d34
|
优化zlm接入是拉流代理的逻辑
|
2024-11-18 16:26:14 +08:00 |
|
648540858
|
b38e5508f6
|
修复zlm节点离线拉流代理sql调用错误
|
2024-11-18 15:55:12 +08:00 |
|
648540858
|
6e8a3f6adf
|
修复sql模糊查询中含有特殊符号时查询不准备的BUG
|
2024-11-14 14:08:05 +08:00 |
|
648540858
|
86879aa58d
|
临时提交
|
2024-11-14 09:59:16 +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
|
c4076ed393
|
修复旧版本拉流代理的兼容接口
|
2024-09-18 14:32:40 +08:00 |
|
648540858
|
800d6c926a
|
修复数据库语法兼容以及redis接收推流信息导入
|
2024-09-14 15:19:07 +08:00 |
|
648540858
|
76ef652e7c
|
优化分屏监控
|
2024-09-12 17:49:16 +08:00 |
|
648540858
|
e55cd08b08
|
国标级联通道共享支持按照设备添加共享和移除共享
|
2024-08-29 11:08:42 +08:00 |
|
648540858
|
9247c7e805
|
完善国标级联点播推流，拉流代理，国标
|
2024-08-17 22:31:13 +08:00 |
|
648540858
|
cce1d1de40
|
重构INVITE消息处理中的上级点播请求
|
2024-08-14 17:19:19 +08:00 |
|
648540858
|
3ce973d2ee
|
临时提交
|
2024-07-30 17:58:18 +08:00 |
|
648540858
|
c96c29776d
|
临时提交
|
2024-07-22 14:20:40 +08:00 |
|
648540858
|
2f4d983f9f
|
修复拉流看方式回显
|
2024-07-22 11:07:58 +08:00 |
|
panlinlin
|
0b7d55ed74
|
修复拉流代理相关问题
|
2024-07-20 23:31:38 +08:00 |
|
panlinlin
|
80ac701748
|
临时提交
|
2024-07-20 06:44:53 +08:00 |
|
panlinlin
|
1dc0cb0c83
|
临时提交
|
2024-07-19 20:29:10 +08:00 |
|
648540858
|
9f4e66a38b
|
优化拉流代理
|
2024-07-19 17:54:14 +08:00 |
|
648540858
|
78088ba53f
|
临时提交
|
2024-07-18 18:00:45 +08:00 |
|
648540858
|
e46ad4e66a
|
临时提交
|
2024-07-17 17:56:26 +08:00 |
|
648540858
|
d7abe7fb75
|
适配推流列表信息
|
2024-07-16 17:33:18 +08:00 |
|
648540858
|
6619c5c53d
|
临时提交
|
2024-07-11 18:25:16 +08:00 |
|
648540858
|
bb609b7e09
|
临时提交
|
2024-07-10 10:51:35 +08:00 |
|
648540858
|
4912ce16ec
|
临时提交
|
2024-07-08 17:44:35 +08:00 |
|
648540858
|
1cb1b0bd36
|
临时提交
|
2024-07-04 18:00:41 +08:00 |
|
648540858
|
b98cfd1fed
|
使用Slf4j注解打印日志
|
2024-07-03 17:24:35 +08:00 |
|