648540858
|
f38d561e60
|
支持通用通道播放
|
2024-01-17 18:05:39 +08:00 |
|
648540858
|
9c3eb1493d
|
合并主线
|
2024-01-16 14:56:22 +08:00 |
|
648540858
|
2a4a0d36f2
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
|
2024-01-16 14:53:26 +08:00 |
|
648540858
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
13e2a96dae
|
添加删除通道时通知的日志
|
2024-01-15 15:39:28 +08:00 |
|
648540858
|
0371f5a96e
|
修复国标级联全部添加与全部删除
|
2024-01-15 15:31:20 +08:00 |
|
648540858
|
1d28869fd3
|
优化拉流代理接口哦i
|
2024-01-12 18:26:14 +08:00 |
|
648540858
|
d287ff7763
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2024-01-12 14:20:01 +08:00 |
|
648540858
|
e5a9dd24ef
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-12 14:17:01 +08:00 |
|
648540858
|
2b2efb59a6
|
修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息
|
2024-01-11 14:56:11 +08:00 |
|
648540858
|
731a7e32c2
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-10 16:18:15 +08:00 |
|
648540858
|
64be28ed77
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-10 16:17:53 +08:00 |
|
648540858
|
c25a99d60b
|
修复空指针异常
|
2024-01-10 16:17:29 +08:00 |
|
648540858
|
0c10c77a56
|
优化录像路径的设置
|
2024-01-10 11:14:49 +08:00 |
|
648540858
|
9b1c6c46a8
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
|
2024-01-08 16:21:39 +08:00 |
|
648540858
|
b15e559eae
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-08 16:18:28 +08:00 |
|
648540858
|
a74fb6ecd6
|
优化目录订阅处理，保证存储异常时不影响后续操作
|
2024-01-08 15:03:07 +08:00 |
|
648540858
|
d2e7f247a6
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
|
2024-01-04 18:35:32 +08:00 |
|
648540858
|
a2cac5ca12
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-04 18:34:46 +08:00 |
|
648540858
|
6120e6bd7b
|
添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送
|
2024-01-04 17:26:47 +08:00 |
|
648540858
|
b4fb076246
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# sql/2.6.9更新.sql
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.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/vmanager/cloudRecord/CloudRecordController.java
# 数据库/old/common.sql
|
2024-01-03 15:35:21 +08:00 |
|
648540858
|
416dae00bf
|
优化接口
|
2023-12-28 00:15:18 +08:00 |
|
648540858
|
5ce562aea1
|
优化云台控制相关接口定义
|
2023-12-27 18:36:14 +08:00 |
|
648540858
|
456ef2c5e4
|
临时提交
|
2023-12-27 15:32:43 +08:00 |
|
648540858
|
66f32d799d
|
临时提交
|
2023-12-27 14:28:58 +08:00 |
|
648540858
|
14fe1936d0
|
合并主线
|
2023-12-26 18:34:41 +08:00 |
|
648540858
|
da8a7d67e4
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
|
2023-12-26 15:42:34 +08:00 |
|
648540858
|
07b182da98
|
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/vmanager/cloudRecord/CloudRecordController.java
|
2023-12-26 15:38:40 +08:00 |
|
648540858
|
b38c7eef70
|
补充字段
|
2023-12-25 23:45:00 +08:00 |
|
648540858
|
67507e64b2
|
优化预置位设置
|
2023-12-22 18:09:17 +08:00 |
|
648540858
|
974e822f84
|
优化预置位查询
|
2023-12-21 15:31:28 +08:00 |
|
648540858
|
35fd5eee63
|
优化预置位查询
|
2023-12-21 13:16:03 +08:00 |
|
648540858
|
52c56bfdf2
|
优化点播超时的日志以及代码
|
2023-12-20 23:55:03 +08:00 |
|
648540858
|
8a605ad722
|
临时提交
|
2023-12-20 18:02:47 +08:00 |
|
648540858
|
913d4bdc8f
|
修复拉流代理
|
2023-12-19 23:17:58 +08:00 |
|
648540858
|
9ae08fd6c3
|
修复推流的添加
|
2023-12-19 18:49:49 +08:00 |
|
648540858
|
6d0361edf8
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
|
2023-12-19 17:27:50 +08:00 |
|
648540858
|
36c641c467
|
实现目录订阅的相关接口
|
2023-12-19 16:50:47 +08:00 |
|
648540858
|
31ab6eb174
|
临时提交
|
2023-12-19 14:39:16 +08:00 |
|
xiaoQQya
|
ef58f29cfc
|
perf(catlog): 优化同步通道时通道名称的处理
通道名称为空时，默认使用通道编码作为通道名称，避免级联时因通道名称为空导致上级接收通道失败
|
2023-12-19 10:07:48 +08:00 |
|
648540858
|
74ce2be55b
|
临时提交
|
2023-12-18 23:44:37 +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
|
d8011e9ee7
|
去除只有udp收流支持ssrc校验的判断
|
2023-12-17 23:33:18 +08:00 |
|
648540858
|
2397344973
|
优化ssrc释放逻辑
|
2023-12-15 16:44:46 +08:00 |
|
648540858
|
04a1bfa329
|
优化事务释放逻辑
|
2023-12-15 16:25:05 +08:00 |
|
648540858
|
b699158e43
|
修复点播流地址修改
|
2023-12-13 14:43:42 +08:00 |
|
648540858
|
94edd95824
|
Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0
修改输出的日志格式
|
2023-12-13 14:31:06 +08:00 |
|
648540858
|
b4b9ad2873
|
修复写入事务信息callid错误
|
2023-12-13 09:40:30 +08:00 |
|
648540858
|
dc841a9dcf
|
临时提交
|
2023-12-12 17:57:19 +08:00 |
|
xubinbin
|
360fe689b1
|
增加日志记录时的完全限定类名，用于定位日志位置。
ps：2023-12-12 16:30:58.779 [Thread-10] INFO --- gov.nist.javax.sip.stack.UDPMessageChannel : 81 Done processing MESSAGE sip:44010200492000000003@4401020049 SIP/2.0
日志中的“gov.nist.javax.sip.stack.UDPMessageChannel”内容
|
2023-12-12 16:41:15 +08:00 |
|