648540858
|
205e529660
|
1078-补充终端设置参数
|
2024-04-14 23:03:43 +08:00 |
|
648540858
|
21e7ca0e46
|
1078-临时提交
|
2024-04-12 23:36:02 +08:00 |
|
648540858
|
6729df4992
|
合并主线
|
2024-04-12 22:15:26 +08:00 |
|
648540858
|
3cd3e97cd7
|
合并分支270
|
2024-04-12 16:06:21 +08:00 |
|
648540858
|
78f4e41536
|
Merge branch '2.7.0'
|
2024-04-12 16:05:48 +08:00 |
|
648540858
|
819ec97d66
|
移除全量脚本多余字段
|
2024-04-12 16:05:29 +08:00 |
|
648540858
|
c6bd4ac352
|
添加导包
|
2024-04-12 11:23:57 +08:00 |
|
648540858
|
9f3cab6486
|
Merge branch 'master' into 1078
|
2024-04-12 10:38:45 +08:00 |
|
648540858
|
f34143df6d
|
修改totalReaderCount类型
|
2024-04-12 10:36:18 +08:00 |
|
648540858
|
be787d1a14
|
添加日志
|
2024-04-12 09:55:42 +08:00 |
|
648540858
|
da54cdf3b8
|
解决空指针异常
|
2024-04-12 09:00:39 +08:00 |
|
648540858
|
8716160d96
|
支持推流鉴权
|
2024-04-11 23:36:06 +08:00 |
|
648540858
|
9800fd6e7b
|
Merge branch 'refs/heads/master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2024-04-11 22:47:03 +08:00 |
|
648540858
|
4005a12403
|
Merge remote-tracking branch 'origin/1078' into 1078
|
2024-04-11 22:46:03 +08:00 |
|
648540858
|
59c91bdaf8
|
1078-暂时注释位置附加信息读取
|
2024-04-11 22:45:50 +08:00 |
|
648540858
|
5c0183a422
|
修复无法下载较长时间时间录像的BUG
|
2024-04-11 22:25:57 +08:00 |
|
648540858
|
8750f0f3dd
|
去除多余代码
|
2024-04-11 16:58:56 +08:00 |
|
648540858
|
ab20f76885
|
去除多余代码
|
2024-04-11 16:58:03 +08:00 |
|
648540858
|
e222095636
|
修复流数据写入缓存
|
2024-04-11 16:55:34 +08:00 |
|
648540858
|
71fe60d885
|
更新README
|
2024-04-11 15:34:56 +08:00 |
|
648540858
|
651d4a1b0e
|
优化代码调用
|
2024-04-11 14:28:42 +08:00 |
|
648540858
|
7d08b56267
|
Merge branch 'master' into 1078
|
2024-04-11 09:39:12 +08:00 |
|
648540858
|
05c83cf6ef
|
Merge branch 'master' into 1078
|
2024-04-11 09:39:04 +08:00 |
|
648540858
|
9978d30aa1
|
Merge branch '2.7.0'
|
2024-04-11 09:36:48 +08:00 |
|
648540858
|
fe55920dab
|
更新文档
|
2024-04-10 23:17:27 +08:00 |
|
648540858
|
0f4b5eed7d
|
优化apikey列表样式
|
2024-04-10 23:09:28 +08:00 |
|
648540858
|
b45d71ba6d
|
Merge pull request #1389 from ancienter/develop-add-api-key
[add]新增ApiKey管理功能
|
2024-04-10 22:56:14 +08:00 |
|
648540858
|
31be0a3874
|
更新webrtc调用
|
2024-04-10 22:44:19 +08:00 |
|
648540858
|
f458c9b793
|
优化代码调用
|
2024-04-10 22:38:12 +08:00 |
|
leesam
|
ce950dea4a
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 22:18:40 +08:00 |
|
leesam
|
53199b32f6
|
适配postgres数据库
|
2024-04-10 22:16:56 +08:00 |
|
648540858
|
6c0087db88
|
优化代码调用
|
2024-04-10 20:56:45 +08:00 |
|
leesam
|
16b7e4a7ef
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 20:49:44 +08:00 |
|
648540858
|
0f55872dbb
|
Merge pull request #1412 from ancienter/develop-support-content-path
[bugfix]支持context-path配置
|
2024-04-10 20:01:32 +08:00 |
|
leesam
|
10e2180c72
|
[bugfix]支持context-path配置
|
2024-04-10 19:07:37 +08:00 |
|
648540858
|
9bb5ef6522
|
修复多个wvp执行推流转发失败的BUG
|
2024-04-10 18:22:42 +08:00 |
|
648540858
|
1d36382986
|
修改抓拍存储
|
2024-04-10 16:52:39 +08:00 |
|
648540858
|
bb350e847d
|
修复抓拍存储
|
2024-04-10 16:35:47 +08:00 |
|
648540858
|
d410a3ca18
|
添加抓拍支持
|
2024-04-10 16:26:46 +08:00 |
|
648540858
|
b08f00104e
|
abl添加getMediaInfo接口实现
|
2024-04-10 00:03:45 +08:00 |
|
648540858
|
2dc7eecb47
|
abl添加checkMediaServer实现
|
2024-04-09 23:41:48 +08:00 |
|
648540858
|
48a0e88b95
|
Merge branch 'refs/heads/master' into dev/abl支持
|
2024-04-09 22:52:33 +08:00 |
|
648540858
|
82ca3a778a
|
优化媒体节点redis数据格式
|
2024-04-09 22:52:06 +08:00 |
|
648540858
|
54b878d2e1
|
优化代码，升级版本号为2.7.1
|
2024-04-09 22:43:45 +08:00 |
|
648540858
|
0077df29d4
|
临时提交
|
2024-04-09 21:42:08 +08:00 |
|
648540858
|
cf8320e749
|
Merge pull request #1400 from Anyuei/master
处理可能会出现的空指针异常
|
2024-04-09 20:57:50 +08:00 |
|
648540858
|
5457407601
|
恢复abl实现
|
2024-04-09 20:56:41 +08:00 |
|
648540858
|
7ed84bed7f
|
Merge pull request #1411 from 648540858/dev/zlm
优化zlm接入以及Hook的订阅机制
|
2024-04-09 20:11:10 +08:00 |
|
648540858
|
a1861038e5
|
修复录像下载
|
2024-04-09 19:53:43 +08:00 |
|
648540858
|
7a59acc8e6
|
合并主线
|
2024-04-09 17:30:18 +08:00 |
|