aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-24 05:57:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,177 Commits 27 Branches 1 Tag 209 MiB
731a7e32c2
Commit Graph

649 Commits

Author SHA1 Message Date
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
67507e64b2 优化预置位设置 2023-12-22 18:09:17 +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
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
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
b4b9ad2873 修复写入事务信息callid错误 2023-12-13 09:40:30 +08:00
648540858
dc841a9dcf 临时提交 2023-12-12 17:57:19 +08:00
648540858
e0686dd426 临时提交 2023-12-11 23:09:58 +08:00
648540858
92669f192f 临时提交 2023-12-11 21:18:53 +08:00
648540858
b7af59b2ce 修复拉流代理 2023-12-11 14:52:52 +08:00
648540858
6678ac8605 临时提交 2023-12-08 18:05:14 +08:00
648540858
e44be505d9 优化通用通道同步，待完成 2023-11-28 18:56:39 +08:00
648540858
a9e5883492 优化通用通道同步，待完成 2023-11-24 18:04:57 +08:00
648540858
d72f57c772 支持通用通道国标类型的播放 2023-11-24 10:12:36 +08:00
lishuyuan
5cd2e2c41b bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加 2023-11-01 15:17:28 +08:00
648540858
829ff200b8 Merge branch 'wvp-28181-2.0' into wvp-28181-record 
# Conflicts:
#	sql/2.6.9更新.sql
 2023-10-27 16:01:07 +08:00
lishuyuan
26ca854db5 bugfix：去掉目录订阅通知处理重复逻辑代码 2023-10-27 11:09:42 +08:00
648540858
5a75381a00 基于新的云端录像结构实现国标录像 2023-10-17 15:34:01 +08:00
648540858
7aa8444e67 临时提交 2023-10-13 18:25:36 +08:00
648540858
cb41fc9f84 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-10-08 15:42:08 +08:00
648540858
205f1f1f60 优化国标级联心跳失败再次注册的逻辑 2023-10-08 15:41:24 +08:00
648540858
9fa4bf6f77 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-10-08 11:04:30 +08:00
648540858
c084d6c98a 优化国标级联心跳失败判断逻辑 2023-10-07 18:00:08 +08:00
648540858
4c28f380aa 优化byte数组转换 2023-10-07 14:52:46 +08:00
648540858
6255e6f89f 支持自动同步国标通道到通用通道，分组信息以及行政区划自动同步 2023-10-04 00:59:16 +08:00