648540858
|
81a32fdb47
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-10 19:12:06 +08:00 |
|
648540858
|
29f7a6b6eb
|
修复多wvp模式推流时信息存储错误
|
2024-01-10 18:55:14 +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
|
28e060fd6f
|
修复空指针异常
|
2024-01-10 14:42:30 +08:00 |
|
648540858
|
0c10c77a56
|
优化录像路径的设置
|
2024-01-10 11:14:49 +08:00 |
|
648540858
|
48d4871ea4
|
添加编辑拉流代理接口
|
2024-01-09 17:43:16 +08:00 |
fine
|
db493e2625
|
修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致
|
2024-01-09 11:50:26 +08:00 |
|
fine
|
8874c90db2
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2024-01-09 11:45:30 +08:00 |
|
648540858
|
7c7b35ca80
|
添加拉流代理相关接口-获取FFMPEG命令模板
|
2024-01-08 23:50:41 +08:00 |
|
648540858
|
8d9916f94e
|
添加新的删除拉流代理接口
|
2024-01-08 18:40:46 +08:00 |
|
648540858
|
1af6324a09
|
优化jessibuca播放器
|
2024-01-08 17:30:48 +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
|
fc2f9d8cca
|
优化方法
|
2024-01-08 14:16:56 +08:00 |
|
648540858
|
8db0192a27
|
添加拉流代理接口-新增拉流代理
|
2024-01-07 23:57:33 +08:00 |
|
648540858
|
c186ce94c1
|
优化推流列表接口
|
2024-01-07 01:50:02 +08:00 |
|
648540858
|
f3acf33fbf
|
添加日志
|
2024-01-05 17:53:20 +08:00 |
|
648540858
|
7fd03a50a0
|
临时提交
|
2024-01-05 16:58:31 +08:00 |
|
fine
|
b6df13af24
|
修复zlm重连不在线
|
2024-01-05 14:14:19 +08:00 |
|
648540858
|
6bfc75286b
|
修复云端录像查询的时间设置问题
|
2024-01-04 20:47:33 +08:00 |
|
648540858
|
3fd7b0c025
|
优化视频流化调用
|
2024-01-04 19:02:38 +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
|
ed67afb7a2
|
添加云端录像获取视频播放地址的接口
|
2024-01-04 18:29:34 +08:00 |
|
648540858
|
6120e6bd7b
|
添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送
|
2024-01-04 17:26:47 +08:00 |
|
648540858
|
3912d0b18a
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
|
2024-01-04 11:33:52 +08:00 |
|
648540858
|
64b6a35603
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-04 11:33:29 +08:00 |
|
648540858
|
d91583b833
|
修复从redis同步推流列表更新失败
|
2024-01-04 11:33:08 +08:00 |
|
648540858
|
5f4d148353
|
修复云端录像查询时间错误
|
2024-01-04 11:09:34 +08:00 |
|
648540858
|
aa3c678839
|
修改注释
|
2024-01-03 18:12:20 +08:00 |
|
648540858
|
e7e407eb57
|
增加版本号
|
2024-01-03 16:00:03 +08:00 |
|
648540858
|
2d5aa1e549
|
优化数据库
|
2024-01-03 15:58:01 +08:00 |
|
648540858
|
07503d6111
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-03 15:51:22 +08:00 |
|
648540858
|
9d61a93077
|
优化数据库sql文件组织方式
|
2024-01-03 15:50:47 +08:00 |
|
648540858
|
975993f8b0
|
合并主线
|
2024-01-03 15:39:52 +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
|
37fcc77c26
|
优化日志
|
2024-01-03 15:12:04 +08:00 |
|
648540858
|
96a16e94e0
|
添加readme引用
|
2024-01-02 18:18:18 +08:00 |
|
648540858
|
416dae00bf
|
优化接口
|
2023-12-28 00:15:18 +08:00 |
|
648540858
|
5ce562aea1
|
优化云台控制相关接口定义
|
2023-12-27 18:36:14 +08:00 |
|
648540858
|
76e8480cb1
|
去除多余方法
|
2023-12-27 16:18:22 +08:00 |
|
648540858
|
456ef2c5e4
|
临时提交
|
2023-12-27 15:32:43 +08:00 |
|
648540858
|
66f32d799d
|
临时提交
|
2023-12-27 14:28:58 +08:00 |
|
648540858
|
aa11d02dbf
|
优化手动添加设备后设备的登录
|
2023-12-27 09:41:48 +08:00 |
|
648540858
|
a7f1bd95df
|
临时提交
|
2023-12-26 23:46:24 +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 |