648540858
|
38980826f9
|
修复平台删除时未移除心跳超时重新注册任务的问题 #1329
|
2024-03-04 14:32:57 +08:00 |
|
648540858
|
e932a9b824
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-03-01 10:55:49 +08:00 |
|
648540858
|
c581974027
|
使用GetMapping替换RequestMapping
|
2024-02-29 18:15:55 +08:00 |
|
648540858
|
f6c48588da
|
支持支持主码流子码流切换
|
2024-02-22 17:22:28 +08:00 |
|
648540858
|
a9ab5c28e9
|
优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273
|
2024-02-20 11:12:42 +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
|
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
|
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
|
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
|
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
|
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
|
92e5ed2e30
|
优化前端云端录像的播放
|
2023-12-06 16:10:32 +08:00 |
|
648540858
|
7e136c9ac7
|
完成下载文件的前后调试
|
2023-12-06 15:11:21 +08:00 |
|
648540858
|
ad36354ef4
|
优化国标录像服务端，使用zlm新接口实现功能
|
2023-12-05 11:29:05 +08:00 |
|
648540858
|
3d5842e9e2
|
查询合并文件列表增加app，stream, callId过滤参数
|
2023-11-28 09:30:49 +08:00 |
|
xiaoQQya
|
f78657473e
|
fix(报警推送): 修复报警推送功能无效的问题
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
|
2023-11-06 20:34:58 +08:00 |
|
648540858
|
5ff2faa5bd
|
添加日志
|
2023-10-25 15:02:15 +08:00 |
|
648540858
|
79f3ca9791
|
优化收藏功能
|
2023-10-25 14:45:45 +08:00 |
|
648540858
|
daac0010b1
|
优化云端录像定时清理
|
2023-10-19 17:52:19 +08:00 |
|
648540858
|
92a25393f3
|
基于新的云端录像实现页面功能
|
2023-10-17 17:55:40 +08:00 |
|
648540858
|
5a75381a00
|
基于新的云端录像结构实现国标录像
|
2023-10-17 15:34:01 +08:00 |
|
648540858
|
7aa8444e67
|
临时提交
|
2023-10-13 18:25:36 +08:00 |
|
648540858
|
e4d37864d1
|
开始重构云端录像继续
|
2023-10-13 15:26:51 +08:00 |
|
648540858
|
130dc5d82d
|
优化拉流代理逻辑，修复ffmpeg拉流代理鉴权
|
2023-09-30 06:09:16 +08:00 |
|
648540858
|
483d5e04a7
|
优化拉流代理
|
2023-09-25 18:51:02 +08:00 |
|
648540858
|
e8411bc797
|
修复截图截图未关闭流 #1087
|
2023-09-25 16:22:36 +08:00 |
|
648540858
|
a34db2ee8b
|
增加根据国标编号添加国标级联通道的接口
|
2023-09-21 21:34:02 +08:00 |
|
Cloud User
|
bc431e4290
|
fix-use-source-ip-as-stream-ip
|
2023-09-15 22:39:08 +08:00 |
|
xubinbin
|
e8b2ca4686
|
将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。
|
2023-08-31 16:39:18 +08:00 |
|
648540858
|
4ae8c5ac3e
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-08-25 09:14:07 +08:00 |
|
648540858
|
3951a95284
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2023-08-25 08:56:47 +08:00 |
|
AlphaWu
|
b5ccb1636f
|
修正Database拼写错误。
|
2023-08-20 15:50:24 +08:00 |
|
648540858
|
b63a89a0a8
|
修复发流参数错误
|
2023-08-18 14:06:39 +08:00 |
|
648540858
|
676a722241
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:56:34 +08:00 |
|
648540858
|
91e49745e4
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:55:50 +08:00 |
|
648540858
|
6106bda151
|
Merge branch '2.6.8' into wvp-28181-2.0
|
2023-08-08 16:06:39 +08:00 |
|
648540858
|
d67f0a1ea4
|
解决使用redis集群时获取发送端口失败的问题
|
2023-08-08 16:06:02 +08:00 |
|
648540858
|
5e34039def
|
支持对接第三方PS流
|
2023-08-08 10:01:51 +08:00 |
|
648540858
|
3e2486d0ab
|
Merge branch '2.6.8' into wvp-28181-2.0
|
2023-08-08 09:50:31 +08:00 |
|
648540858
|
874a57387a
|
支持与第三方对接PS流
|
2023-08-08 09:49:27 +08:00 |
|