Commit Graph

2502 Commits

Author SHA1 Message Date
648540858
34b6b516ab 1078-解析104... 2024-04-21 00:16:07 +08:00
648540858
f9c22fcb3d 1078-解析104中... 2024-04-20 18:59:23 +08:00
648540858
c5ac7e218a 1078-解析104中... 2024-04-20 14:23:05 +08:00
648540858
975e94eee1 1078-支持分包消息 2024-04-20 13:03:39 +08:00
648540858
50e2565643 1078-处理分包发送 2024-04-20 00:07:37 +08:00
648540858
dd5ab573f2 1078-解析104... 2024-04-19 07:19:40 +08:00
648540858
a6236a2c13 1078-解析104... 2024-04-19 00:01:20 +08:00
648540858
16143a3fff 1078-解析104中 2024-04-18 20:11:13 +08:00
648540858
fce96def9f 1078-添加查询终端参数 2024-04-15 00:40:36 +08:00
648540858
570307669e 1078-添加查询指定终端参数 2024-04-15 00:31:11 +08:00
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
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
da54cdf3b8 解决空指针异常 2024-04-12 09:00:39 +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
82ca3a778a 优化媒体节点redis数据格式 2024-04-09 22:52:06 +08:00
648540858
54b878d2e1 优化代码,升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
648540858
cf8320e749 Merge pull request #1400 from Anyuei/master
处理可能会出现的空指针异常
2024-04-09 20:57:50 +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
648540858
9abc1974a5 Merge branch 'master' into dev/zlm
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
2024-04-09 17:28:52 +08:00
648540858
0fa9a1506c Merge branch '2.7.0' 2024-04-09 17:26:25 +08:00
648540858
de5d025cee 修复单端口收流时音频禁用失败的问题 2024-04-09 16:10:02 +08:00
648540858
ab318fcf70 修复点播错误时关闭rtpserver 2024-04-09 14:53:11 +08:00
648540858
6dd870e74c 修复点播端口为空 2024-04-09 10:59:59 +08:00