648540858
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
96efff51bc
|
临时提交
|
2024-01-15 23:35:19 +08:00 |
|
648540858
|
9b62fbe467
|
优化设备编辑页面
|
2024-01-15 18:36:31 +08:00 |
|
648540858
|
13e2a96dae
|
添加删除通道时通知的日志
|
2024-01-15 15:39:28 +08:00 |
|
648540858
|
0371f5a96e
|
修复国标级联全部添加与全部删除
|
2024-01-15 15:31:20 +08:00 |
|
648540858
|
2ac51548f4
|
优化通用通道接口
|
2024-01-15 00:15:02 +08:00 |
|
648540858
|
e2fd8ddf8b
|
优化通用通道接口
|
2024-01-14 16:01:32 +08:00 |
|
648540858
|
25a46d1833
|
注释优化
|
2024-01-14 11:15:46 +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
|
07401b8621
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-12 15:03:53 +08:00 |
|
648540858
|
674ab18c02
|
修复rtp暂停检查调用失败
|
2024-01-12 15:03:11 +08:00 |
|
648540858
|
9c114823af
|
临时提交
|
2024-01-12 14:52:57 +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
|
18b5c73365
|
获取InviteInfo添加异常日志
|
2024-01-12 10:35:26 +08:00 |
|
648540858
|
41c7137e3a
|
Merge pull request #1242 from criver31/wvp-28181-2.0
1、修复zlm重连不在线 2、单端口下历史回放暂停和恢复发送的流ID与zlm不一致
|
2024-01-12 09:06:10 +08:00 |
|
648540858
|
4e60d7ed55
|
优化拉流代理逻辑
|
2024-01-11 18:10:28 +08:00 |
|
648540858
|
2b2efb59a6
|
修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息
|
2024-01-11 14:56:11 +08:00 |
|
648540858
|
db075b5255
|
临时提交
|
2024-01-10 23:11:38 +08:00 |
|
648540858
|
fb39e4ff0e
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
|
2024-01-10 19:19:28 +08:00 |
|
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
|
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
|
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
|
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
|
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 |
|
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 |
xiaoQQya
|
3ab4ce0a83
|
perf: 分屏监控设备列表优先使用自定义通道名称
|
2023-12-26 08:50:41 +08:00 |
|
648540858
|
b38c7eef70
|
补充字段
|
2023-12-25 23:45:00 +08:00 |
|
648540858
|
746cd2543d
|
优化设备列表查询，支持搜索。支持获取流信息
|
2023-12-25 17:50:37 +08:00 |
|
648540858
|
8b9bac5cb3
|
添加摄像机控制接口
|
2023-12-23 00:49:28 +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 |
|
xiaoQQya
|
9ae520a58a
|
feat(channel): 新增通道支持自定义名称、位置及云台类型
|
2023-12-19 15:22:09 +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
|
41fdb9d13f
|
Merge branch 'wvp-28181-record' into feature/record
|
2023-12-18 15:41:39 +08:00 |
|
648540858
|
a380246e49
|
修复每次注册都会发送状态变化的BUG
|
2023-12-18 15:27:51 +08:00 |
|
648540858
|
964d55431f
|
修复推流无声音的问题
|
2023-12-18 14:43:04 +08:00 |
|
648540858
|
c0b79878f4
|
合并主线
|
2023-12-18 14:40:54 +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
|
76d09bcadb
|
修复sql注入 #1112
|
2023-12-18 11:14:59 +08:00 |
|
648540858
|
18a9f86a0a
|
Merge pull request #1209 from DavidSche/fix-1208
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误
|
2023-12-18 09:59:06 +08:00 |
|
648540858
|
7430c98309
|
增加日志提示
|
2023-12-17 23:41:21 +08:00 |
|
648540858
|
d8011e9ee7
|
去除只有udp收流支持ssrc校验的判断
|
2023-12-17 23:33:18 +08:00 |
|
648540858
|
cb1f1417b6
|
兼容回复的invite 200OK消息中缺少ssrc(y字段)的情况
|
2023-12-15 22:44:41 +08:00 |
|
648540858
|
01ecb07a2f
|
Merge branch 'wvp-28181-record' into feature/record
|
2023-12-15 17:54:56 +08:00 |
|
648540858
|
0a245c4cfe
|
修复非鉴权接口的跨域失败问题
|
2023-12-15 17:54:34 +08:00 |
|
648540858
|
df3f5795e7
|
修复非鉴权接口的跨域失败问题
|
2023-12-15 17:45:47 +08:00 |
|
648540858
|
3a1fc63d7a
|
优化ssrc释放逻辑
|
2023-12-15 17:28:55 +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
|
eac72fd06e
|
优化日志打印样式
|
2023-12-13 14:37:08 +08:00 |
|
648540858
|
94edd95824
|
Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0
修改输出的日志格式
|
2023-12-13 14:31:06 +08:00 |
davidche
|
572c8850dc
|
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误
|
2023-12-13 13:48:04 +08:00 |
|
648540858
|
b4b9ad2873
|
修复写入事务信息callid错误
|
2023-12-13 09:40:30 +08:00 |
|
648540858
|
dc841a9dcf
|
临时提交
|
2023-12-12 17:57:19 +08:00 |
xubinbin
|
42a2772d1a
|
bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
|
2023-12-12 17:09:04 +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 |
|
xubinbin
|
5a9621840c
|
修改控制台输出日志格式，增加显示线程名称，调用类的全类路径以及日子输出行的行号。
|
2023-12-12 16:37:06 +08:00 |
|
648540858
|
e0686dd426
|
临时提交
|
2023-12-11 23:09:58 +08:00 |
|
648540858
|
31dcde7cc1
|
临时提交
|
2023-12-11 22:49:48 +08:00 |
|
648540858
|
92669f192f
|
临时提交
|
2023-12-11 21:18:53 +08:00 |
|
648540858
|
b7af59b2ce
|
修复拉流代理
|
2023-12-11 14:52:52 +08:00 |
|
648540858
|
e73d00060e
|
Merge pull request #1137 from xiaoQQya/develop
bugfix: 修复推流鉴权、报警推送等问题
|
2023-12-11 10:22:26 +08:00 |
|
648540858
|
7a52db4e89
|
Merge pull request #1138 from shuxiaoyuan/fix-subscribe-catalog
bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加
|
2023-12-11 10:11:36 +08:00 |
|
648540858
|
083523d204
|
Merge pull request #1188 from lunasaw/wvp-28181-2.0-fix
fix find stream
|
2023-12-11 10:06:35 +08:00 |
|
648540858
|
9f7dc295cf
|
Merge pull request #1140 from shuxiaoyuan/fix-update-time
bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错
|
2023-12-11 10:05:57 +08:00 |
|
648540858
|
33506a0046
|
Merge pull request #1146 from leibnewton/fix_on_stream_changed
修复OnStreamChangedHook媒体轨道信息解析错误
|
2023-12-11 10:05:36 +08:00 |
|
648540858
|
6678ac8605
|
临时提交
|
2023-12-08 18:05:14 +08:00 |
|
648540858
|
dc4385da74
|
临时提交
|
2023-12-07 18:04:53 +08:00 |
|
648540858
|
bdd1846eb4
|
优化自动点播判断逻辑
|
2023-12-06 22:31:26 +08:00 |
|
648540858
|
4897d9a501
|
临时提交
|
2023-12-06 18:18:24 +08:00 |
|
648540858
|
92e5ed2e30
|
优化前端云端录像的播放
|
2023-12-06 16:10:32 +08:00 |
|
648540858
|
7e136c9ac7
|
完成下载文件的前后调试
|
2023-12-06 15:11:21 +08:00 |
|
648540858
|
0d3845af59
|
添加移除共享到上级平台的通道
|
2023-12-05 23:23:48 +08:00 |
|
648540858
|
ad36354ef4
|
优化国标录像服务端，使用zlm新接口实现功能
|
2023-12-05 11:29:05 +08:00 |
|
648540858
|
c4aeef62ef
|
调整数据库结构
|
2023-12-04 21:56:21 +08:00 |
|
648540858
|
fc77b3f819
|
支持重新接入zlm的时候检查拉流代理数据是否异常，异常数据自动移除
|
2023-12-01 15:49:18 +08:00 |
chenzhangyue
|
0542700225
|
fix find stream
|
2023-12-01 10:34:16 +08:00 |
|
648540858
|
67e4060053
|
添加推流信息专属redis数据
|
2023-11-30 18:09:43 +08:00 |
|
648540858
|
e44be505d9
|
优化通用通道同步，待完成
|
2023-11-28 18:56:39 +08:00 |
|
648540858
|
3d5842e9e2
|
查询合并文件列表增加app，stream, callId过滤参数
|
2023-11-28 09:30:49 +08:00 |
|
648540858
|
5a5108c827
|
优化通用通道同步，待完成
|
2023-11-27 18:40:00 +08:00 |
|
648540858
|
dbf92b96b0
|
添加TODO 后续实现删除空了的过期日期文件夹
|
2023-11-27 14:21:40 +08:00 |
|
648540858
|
d88c635d8a
|
优化通用通道同步，待完成
|
2023-11-27 11:04:43 +08:00 |
|
648540858
|
a9e5883492
|
优化通用通道同步，待完成
|
2023-11-24 18:04:57 +08:00 |
|
648540858
|
ffc8a530f3
|
修复定时录像删除
|
2023-11-24 10:47:33 +08:00 |
|
648540858
|
d72f57c772
|
支持通用通道国标类型的播放
|
2023-11-24 10:12:36 +08:00 |
|
648540858
|
29ef68038d
|
优化拉流代理中关于ffmpeg.cmd的判断
|
2023-11-21 14:50:16 +08:00 |
|
648540858
|
db24f49275
|
定时删除过期录像的时间设置
|
2023-11-21 14:32:35 +08:00 |
|
648540858
|
c98ef23b98
|
修复定时删除过期录像文件时，收藏文件被删除的问题
|
2023-11-21 14:30:33 +08:00 |
|
648540858
|
cbc0ca91b1
|
优化区域树
|
2023-11-17 17:59:14 +08:00 |
|
648540858
|
b96c9317e8
|
优化区域树
|
2023-11-16 14:24:50 +08:00 |
|
648540858
|
7d064b0830
|
优化区域树
|
2023-11-15 18:04:59 +08:00 |
|
648540858
|
fd71a96580
|
优化分组树
|
2023-11-15 11:24:56 +08:00 |
|
648540858
|
bcd5ce25ca
|
优化分组树
|
2023-11-14 18:36:40 +08:00 |
|
648540858
|
4ab0200c90
|
修复BUG
|
2023-11-10 17:58:40 +08:00 |
|
648540858
|
abbb5643c5
|
优化分组树的添加
|
2023-11-10 17:41:20 +08:00 |