648540858
|
3e1bf69181
|
添加通用通道云台控制接口
|
2024-01-30 23:11:21 +08:00 |
|
648540858
|
5d973ef246
|
支持国标级联通道查询
|
2024-01-24 19:11:50 +08:00 |
|
648540858
|
407828e880
|
优化国标级联接口
|
2024-01-23 16:20:36 +08:00 |
|
648540858
|
be8d66423f
|
优化国标级联
|
2024-01-23 00:07:17 +08:00 |
|
648540858
|
a8ba1630d2
|
合并主线
|
2024-01-22 17:55:27 +08:00 |
|
648540858
|
16548e4f3c
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-22 17:03:32 +08:00 |
|
648540858
|
b3d21c7452
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-22 16:35:17 +08:00 |
|
648540858
|
a9264a8bc0
|
修复assist使用https时无法请求的bug
|
2024-01-22 16:34:58 +08:00 |
|
648540858
|
6258e05574
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# 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/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
|
2024-01-22 16:03:27 +08:00 |
|
648540858
|
e8770eec36
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-22 16:02:28 +08:00 |
|
648540858
|
d68aebd409
|
指定service使用的数据源
|
2024-01-22 15:56:24 +08:00 |
|
648540858
|
b4358a6dbe
|
临时提交
|
2024-01-22 15:01:56 +08:00 |
|
648540858
|
e9fce889ba
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
# src/main/resources/all-application.yml
# src/main/resources/application-dev.yml
# src/main/resources/application-docker.yml
|
2024-01-22 12:12:36 +08:00 |
|
648540858
|
97a87542a6
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-22 10:37:13 +08:00 |
|
648540858
|
0e94aeaf5f
|
优化录像合并下载,支持不过滤zlm节点ID
|
2024-01-22 10:16:16 +08:00 |
|
648540858
|
07729fbe49
|
优化录像合并下载
|
2024-01-22 09:46:03 +08:00 |
|
648540858
|
55b15f8ba6
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-19 17:45:11 +08:00 |
|
648540858
|
cf8a1261b5
|
支持合并录像使用https
|
2024-01-19 17:44:31 +08:00 |
|
648540858
|
6290e94733
|
临时提交
|
2024-01-19 14:33:34 +08:00 |
|
648540858
|
f38d561e60
|
支持通用通道播放
|
2024-01-17 18:05:39 +08:00 |
|
648540858
|
20be213faf
|
优化日志管理接口
|
2024-01-17 00:08:27 +08:00 |
|
648540858
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
0371f5a96e
|
修复国标级联全部添加与全部删除
|
2024-01-15 15:31:20 +08:00 |
|
648540858
|
e2fd8ddf8b
|
优化通用通道接口
|
2024-01-14 16:01:32 +08:00 |
|
648540858
|
be011a7c85
|
支持拉流代理检索，播放
|
2024-01-14 00:01:34 +08:00 |
|
648540858
|
8805966f89
|
优化拉流代理启停
|
2024-01-13 00:40:41 +08:00 |
|
648540858
|
1d28869fd3
|
优化拉流代理接口哦i
|
2024-01-12 18:26:14 +08:00 |
|
648540858
|
9c114823af
|
临时提交
|
2024-01-12 14:52:57 +08:00 |
|
648540858
|
48d4871ea4
|
添加编辑拉流代理接口
|
2024-01-09 17:43:16 +08:00 |
|
648540858
|
7c7b35ca80
|
添加拉流代理相关接口-获取FFMPEG命令模板
|
2024-01-08 23:50:41 +08:00 |
|
648540858
|
8d9916f94e
|
添加新的删除拉流代理接口
|
2024-01-08 18:40:46 +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
|
ed67afb7a2
|
添加云端录像获取视频播放地址的接口
|
2024-01-04 18:29:34 +08:00 |
|
648540858
|
5f4d148353
|
修复云端录像查询时间错误
|
2024-01-04 11:09:34 +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
|
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
|
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 |
|
648540858
|
b3eb319e05
|
合并主线
|
2023-12-26 15:39:04 +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
|
f8d2b933b1
|
为每个接口添加调试接口需要的描述
|
2023-12-26 15:30:24 +08:00 |
|
648540858
|
7c07ae9421
|
修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口
|
2023-12-26 15:03:00 +08:00 |
|
648540858
|
746cd2543d
|
优化设备列表查询，支持搜索。支持获取流信息
|
2023-12-25 17:50:37 +08:00 |
|