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
|
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
|
b45d71ba6d
|
Merge pull request #1389 from ancienter/develop-add-api-key
[add]新增ApiKey管理功能
|
2024-04-10 22:56:14 +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 |
|
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
|
a1861038e5
|
修复录像下载
|
2024-04-09 19:53:43 +08:00 |
|
648540858
|
7a59acc8e6
|
合并主线
|
2024-04-09 17:30:18 +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 |
|
648540858
|
bbf19c7909
|
合并主线
|
2024-04-09 10:40:16 +08:00 |
|
648540858
|
b1b6fae22c
|
Merge branch 'master' into dev/zlm
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
|
2024-04-09 10:35:11 +08:00 |
|
648540858
|
0b2f635176
|
移除非主线内容
|
2024-04-09 10:30:00 +08:00 |
|
ancienter
|
25ff2fc4ef
|
Merge branch '648540858:master' into develop-add-api-key
|
2024-04-09 09:52:23 +08:00 |
|
648540858
|
ae239c8848
|
Merge branch 'master' into 1078
|
2024-04-08 18:15:06 +08:00 |
|
648540858
|
9badf1c7fe
|
1078-添加位置附加信息定义
|
2024-04-08 18:15:02 +08:00 |
|
648540858
|
a890b62fa1
|
Merge branch '2.7.0'
|
2024-04-08 18:13:33 +08:00 |
|
648540858
|
48351c875e
|
国标级联支持制定200OK中sdp的IP
|
2024-04-08 18:13:15 +08:00 |
|
648540858
|
d54787f323
|
1078-添加读取位置信息汇报附加信息读取
|
2024-04-07 23:50:58 +08:00 |
|
648540858
|
8a2dc6031e
|
1078-实现云台控制接口
|
2024-04-07 22:06:41 +08:00 |
|
648540858
|
9255ea802f
|
1078-添加云台控制接口
|
2024-04-07 20:59:21 +08:00 |
|
648540858
|
349b0442d6
|
Merge remote-tracking branch 'origin/1078' into 1078
|
2024-04-07 20:42:32 +08:00 |
|
648540858
|
403eb4499d
|
Merge branch 'master' into 1078
|
2024-04-07 20:42:10 +08:00 |
|
648540858
|
7d0aebd311
|
Merge branch '2.7.0'
|
2024-04-07 20:26:01 +08:00 |
|
648540858
|
aeb75c0df1
|
优化推流结束后发送BYE
|
2024-04-07 20:25:44 +08:00 |
|